[146919] De-brand the Directory Server as "brandx"

74 files changed, 892 insertions, 889 deletions

diff --git a/Makefile b/Makefile
index 5d9d27a4..d0cebf91 100644
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,7 @@ $(OBJDIR):
 	if test ! -d $(OBJDIR); then mkdir -p $(OBJDIR); fi;
 
 $(RELTOOLSPATH)/brandver.pl:
-	cd $(ABS_ROOT) ; cvs co RelToolsLite
+	cd $(ABS_ROOT)/.. ; cvs co RelToolsLite
 
 $(SDKVER_H):
 	if test ! -d $(DIRVERDIR); then mkdir -p $(DIRVERDIR); fi;
diff --git a/include/nt/regparms.h b/include/nt/regparms.h
index 418e60b0..e7bf75b3 100644
--- a/include/nt/regparms.h
+++ b/include/nt/regparms.h
@@ -45,19 +45,19 @@
 /* Admin IDs */
 #define ADM_ID_PRODUCT         "admin"
 #define ADM_NAME_SHORT         "Administration"
-#define ADM_VERSION            "6.0"
-#define ADM_NAME_VERSION       "Administration 6.0"
+#define ADM_VERSION            "6.2"
+#define ADM_NAME_VERSION       "Administration 6.2"
 #define ADM_NAME_SERVER        "Administration Server"
 #define ADM_NAME_FULL          "Netscape Administration Server"
-#define ADM_NAME_FULL_VERSION  "Netscape Administration Server 6.0"
-#define ADM_NAME_SERVICE       "Netscape Administration 6.0"
+#define ADM_NAME_FULL_VERSION  "Brandx Administration Server 6.2"
+#define ADM_NAME_SERVICE       "Brandx Administration 6.2"
 #define ADM_EXE                "ns-admin.exe"
 #define ADM_EXE_START          "admin.exe"
-#define ADM_ID_SERVICE         "admin60"
-#define ADM_KEY_ROOT           "Administration\\6.0"
+#define ADM_ID_SERVICE         "admin62"
+#define ADM_KEY_ROOT           "Administration\\6.2"
 #define ADM_SERVER_LST_NAME    "adm:Netscape Enterprise Server"
 #define ADM_DIR_ROOT           "admin"
-#define ADM_NAME_UNINSTALL     "Uninstall Administration Server 6.0"
+#define ADM_NAME_UNINSTALL     "Uninstall Administration Server 6.2"
 
 #if defined( NS_DS )
 #define ADMIN_SERVICE_NAME      "Admin Server" 
@@ -217,10 +217,10 @@
 
 /* Synchronization Service IDs */
 #define DSS_SHORT_NAME           "Directory Synchronization Service"
-#define DSS_SERVER_NAME          "Netscape Directory Synchronization Service"
+#define DSS_SERVER_NAME          "Brandx Directory Synchronization Service"
 #define DSS_SERVER_VERSION       "7"
-#define DSS_SETUP_SHORT_NAME     "Netscape Synchronization Service"
-#define DSS_SETUP_NAME           "Netscape Directory Synchronization Service 7"
+#define DSS_SETUP_SHORT_NAME     "Brandx Synchronization Service"
+#define DSS_SETUP_NAME           "Brandx Directory Synchronization Service 7"
 #define DSS_REGISTRY_ROOT_KEY    "Directory Synchronization Service"
 #define DSS_EXE                  "dssynch.exe"
 #define DSS_DIR_ROOT             "dssynch"
@@ -228,7 +228,7 @@
 #define DSS_CONFIG_TOOL          "synchcfg.exe"
 #define DSS_UNINSTALL_KEY        "SynchronizationV7"
 #define DSS_SERVER_LST_NAME      "dssynch:Netscape Directory Synchronization Service"
-#define DSS_SERVICE_PREFIX       "Netscape Directory Synchronization Service "
+#define DSS_SERVICE_PREFIX       "Brandx Directory Synchronization Service "
 #define DSS_README_ICON_NAME     "Directory Synchronization Service README"
 #define DSS_CONFIG_ICON_NAME     "Directory Synchronization Service Config"
 #define DSS_UNINSTALL_ICON_NAME  "Uninstall Directory Synch Service"
@@ -346,14 +346,14 @@
    the SuiteSpot servers and should be the final form.
 */
 #define DS_SHORT_NAME           "Directory Server"
-#define DS_SERVER_NAME          "Netscape Directory Server"
+#define DS_SERVER_NAME          "Brandx Directory Server"
 #define DS_SERVER_VERSION       "7"
 #define DS_SETUP_SHORT_NAME     "Directory Server"
-#define DS_SETUP_NAME           "Netscape Directory Server 7"
+#define DS_SETUP_NAME           "Brandx Directory Server 7"
 #define DS_REGISTRY_ROOT_KEY    "Directory Server"
 #define DS_APP_PATH_KEY         "ns-slapd.exe"
 #define DS_UNINSTALL_KEY        "DirectoryV7"
-#define DS_SERVICE_PREFIX       "Netscape Directory Server "
+#define DS_SERVICE_PREFIX       "Brandx Directory Server "
 #define DS_README_ICON_NAME     "Directory Server 7 README"
 #define DS_UNINSTALL_ICON_NAME  "Uninstall Directory Server 7"
 #define DS_PRODUCT_NAME         "slapd"
@@ -365,15 +365,15 @@
 #define DS_VERSION              "7"
 #define DS_NAME_VERSION         "Directory 7"
 #define DS_NAME_SERVER          "Directory Server"
-#define DS_NAME_FULL            "Netscape Directory Server"
-#define DS_NAME_FULL_VERSION    "Netscape Directory Server 7"
-#define DS_NAME_SERVICE         "Netscape Directory 7"
+#define DS_NAME_FULL            "Brandx Directory Server"
+#define DS_NAME_FULL_VERSION    "Brandx Directory Server 7"
+#define DS_NAME_SERVICE         "Brandx Directory 7"
 #define DS_EXE                  "ns-slapd.exe"
 #define DS_EXE_START            "slapd.exe"
 #define DS_ID_SERVICE           "slapd"
 #define DS_KEY_ROOT             "Directory\\7"
 #define DS_KEY_ROOT_OLD         "Directory\\3.0"
-#define DS_SERVER_LST_NAME      "slapd:Netscape Directory Server"
+#define DS_SERVER_LST_NAME      "slapd:Brandx Directory Server"
 #define DS_DIR_ROOT             "slapd"
 #define DS_NAME_UNINSTALL       "Uninstall Directory Server 7"
 #define DS_SNMP_PATH            "bin\\slapd\\server\\ns-ldapagt.dll"
diff --git a/include/version.h b/include/version.h
index a1116466..a42e3ed9 100644
--- a/include/version.h
+++ b/include/version.h
@@ -12,15 +12,15 @@
    exist, the PRODUCT_VERSION define has _DEF appended.
  */
 
-#define DIRECTORY_VERSION_DEF "7.0"
+#define DIRECTORY_VERSION_DEF "7.1"
 #define DIRECTORY_COMPATIBLE "3.0"
-#define DIRECTORY_VERSION_STRING "Netscape-DirServer/7.0"
+#define DIRECTORY_VERSION_STRING "Brandx-DirServer/7.1"
 
 #define DS_VERSION_DEF DIRECTORY_VERSION_DEF
 #define DS_VERSION_STRING DIRECTORY_VERSION_STRING
 
 #define DSS_VERSION_DEF DIRECTORY_VERSION_DEF
-#define DSS_VERSION_STRING "Netscape-DirSynchService/7.0"
+#define DSS_VERSION_STRING "Brandx-DirSynchService/7.1"
 
 #define PROXY_VERSION_DEF "2.0"
 #define PROXY_VERSION_STRING "Netscape-Proxy/2.0"
diff --git a/ldap/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp
index db356e7f..f66c8015 100644
--- a/ldap/admin/src/configure_instance.cpp
+++ b/ldap/admin/src/configure_instance.cpp
@@ -100,7 +100,7 @@ extern "C" {
 // name of script file to generate relative to slapd instance directory
 #define SCRIPT_FILE_NAME "start-console"
 
-#define DS_JAR_FILE_NAME "ds70.jar"
+#define DS_JAR_FILE_NAME "ds71.jar"
 #define DS_CONSOLE_CLASS_NAME "com.netscape.admin.dirserv.DSAdmin"
 
 #ifdef XP_WIN32
diff --git a/ldap/admin/src/updatedsgw b/ldap/admin/src/updatedsgw
index e09c59ac..d3f65db5 100755
--- a/ldap/admin/src/updatedsgw
+++ b/ldap/admin/src/updatedsgw
@@ -18,7 +18,7 @@ if (!$nshome ) {
     if (!getopts('h:i:d:e:s:t:n:') || !$opt_n || !$opt_h ) {
 	print "usage: " . $0 . " -n nshome -h current_slapd_host:current_slapd_port [options]\n";
 	print "\nrequired:\n";
-	print "    -n directory\tthe directory where 7.0 is installed (NS-HOME)\n";
+	print "    -n directory\tthe directory where 7.1 is installed (NS-HOME)\n";
 	print "    -h host[:port]\tthe current host and port of the directory server\n";
 	print "                  \tto which the gateway connects.\n";
 	print "\noptions:\n";
@@ -27,7 +27,7 @@ if (!$nshome ) {
 	print "    -t suffix\t\tthe new ESCAPED suffix of the directory server\n";
 	print "    -d dirmgrdn\t\tthe old manager dn of the directory server\n";
 	print "    -e dirmgrdn\t\tthe new manager dn of the directory server\n";
-	print "\nexample:\n " . $0 . "  -n /home/servers/ds70/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Dmcom.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n";
+	print "\nexample:\n " . $0 . "  -n /home/servers/ds71/ -h gargoyle:1974 -i brooklyn -s \"dc=example,dc=com\" -t \"o%3Dbrandx.com\" -d \"cn=directory manager\" -e \"cn=directory guru\"\n";
 	
 	exit;
     }
diff --git a/ldap/clients/dsgw/html/greeting.html b/ldap/clients/dsgw/html/greeting.html
index d57bdb11..3f7d0ff5 100644
--- a/ldap/clients/dsgw/html/greeting.html
+++ b/ldap/clients/dsgw/html/greeting.html
@@ -23,7 +23,7 @@ function gotoURL(h) {
 
 <TR> <TD COLSPAN=2>
 You are using the Directory Server Gateway.  This interface can be
-used to search for, modify, and create entries that are stored in the directory.
+used to search for, modify, and create entries that are stored in the Brandx Directory Server.
 <P>
 You are currently viewing the Standard Search screen, which provides an
 easy and convenient way to search the directory.  Standard Search
diff --git a/ldap/clients/orgchart/botframe.html b/ldap/clients/orgchart/botframe.html
index 2af83848..68c5e6fc 100644
--- a/ldap/clients/orgchart/botframe.html
+++ b/ldap/clients/orgchart/botframe.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-	<title>Netscape Directory Server Org Chart</title>
+	<title>Brandx Directory Server Org Chart</title>
 	<LINK REL=stylesheet TYPE="text/css" HREF="styles.css">
 </head>
 <body bgcolor="#FFFFFF">
@@ -16,7 +16,7 @@ To find a person in your corporate organization chart, enter their<br>
 name in the search box above, then click "Go"<br><br>
 Below is a sample of an organization chart, with a description of the<br>
 types of actions you can take<BR><BR>
-Thank you for using Netscape Directory Server Org Chart! 
+Thank you for using Brandx Directory Server Org Chart!
 </td>
 </tr>
 </table>
diff --git a/ldap/clients/orgchart/index.html b/ldap/clients/orgchart/index.html
index 7e0e573f..a6578339 100644
--- a/ldap/clients/orgchart/index.html
+++ b/ldap/clients/orgchart/index.html
@@ -2,7 +2,7 @@
 <HEAD>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
 <META HTTP-EQUIV="Expires" CONTENT="Thu, 01 Feb 1996 00:00:00 GMT">
-        <TITLE>Netscape Directory Server Org Chart</TITLE>
+        <TITLE>Brandx Directory Server Org Chart</TITLE>
 
 
 <SCRIPT LANGUAGE="javascript">
diff --git a/ldap/clients/orgchart/myorg.pl b/ldap/clients/orgchart/myorg.pl
index 0e61b819..d3e9e78e 100755
--- a/ldap/clients/orgchart/myorg.pl
+++ b/ldap/clients/orgchart/myorg.pl
@@ -16,7 +16,7 @@ print "
 <!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">
 <html>
 <head>
-<title>Customize: Netscape Directory Server Org Chart</title>
+<title>Customize: Brandx Directory Server Org Chart</title>
 <LINK REL=stylesheet TYPE=\"text/css\" HREF=\"../html/styles.css\">
 ";
 #-------------------------------------
diff --git a/ldap/clients/orgchart/org.pl b/ldap/clients/orgchart/org.pl
index e8aadb57..abbf4276 100755
--- a/ldap/clients/orgchart/org.pl
+++ b/ldap/clients/orgchart/org.pl
@@ -1983,7 +1983,7 @@ sub output_html_header()
 	print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n";
 	print "<HTML>\n";
 	print "<HEAD>\n";
-	print "     <title>Netscape Directory Server Org Chart</title>\n";
+	print "     <title>Brandx Directory Server Org Chart</title>\n";
 
 	if ( $js_output ne "with-javascript" )
 	{
diff --git a/ldap/clients/orgchart/topframe.html b/ldap/clients/orgchart/topframe.html
index 25452788..4f5e17f9 100644
--- a/ldap/clients/orgchart/topframe.html
+++ b/ldap/clients/orgchart/topframe.html
@@ -54,7 +54,7 @@ function doSearch(searchstring)
 <TABLE BORDER="0" width="100%" cellpadding=0 cellspacing=0>
 
 <TR>
-<TD ALIGN=LEFT VALIGN=CENTER class="appName" nowrap>&nbsp;Netscape Directory Server Org Chart</TD>
+<TD ALIGN=LEFT VALIGN=CENTER class="appName" nowrap>&nbsp;Brandx Directory Server Org Chart</TD>
 <TD ALIGN=LEFT VALIGN=CENTER width="75%">
 		<TABLE BORDER=0>
 		<TR><TD nowrap VALIGN=CENTER ALIGN=CENTER>
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 878f7825..f91f1392 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -75,9 +75,9 @@ endif
 endif
 
 ifdef USE_64
-VERSION=-ver 7.0-64bit
+VERSION=-ver 7.1-64bit
 else
-VERSION=-ver 7.0
+VERSION=-ver 7.1
 endif
 
 ifeq ($(ARCH), HPUX)
@@ -203,8 +203,8 @@ NSDIST = $(BUILD_ROOT)/../dist
 
 DS_JAR_SRC_PATH = $(NSDIST)/$(BUILD_DEBUG)
 DS_JAR_DEST_PATH = java/jars
-DS_JAR_FILE = ds70.jar
-DS_JAR_LANG_FILE = ds70_en.jar
+DS_JAR_FILE = ds71.jar
+DS_JAR_LANG_FILE = ds71_en.jar
 XMLTOOLS_JAR_FILE = xmltools.jar
 
 UNZIP=unzip -o
diff --git a/ldap/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl
index a973af31..7f1da7d7 100644
--- a/ldap/cm/fixSetupInf.pl
+++ b/ldap/cm/fixSetupInf.pl
@@ -11,9 +11,9 @@
 $isNT = -d '\\';
 
 if ($isNT) {
-  $ServerDir = "/Netscape/Servers";
+  $ServerDir = "/Brandx/Servers";
 } else {
-  $ServerDir = "/usr/netscape/servers";
+  $ServerDir = "/usr/brandx/servers";
 }
 $ServerDirKey = "DefaultInstallDirectory";
 
diff --git a/ldap/cm/newinst/ns-keygen b/ldap/cm/newinst/ns-keygen
index 599c8e2f..2c7c3d0d 100755
--- a/ldap/cm/newinst/ns-keygen
+++ b/ldap/cm/newinst/ns-keygen
@@ -9,7 +9,7 @@
 #
 # Usage  ns-keygen password_file fully_qualified_hostname
 # Example:
-#	./ns-keygen  ../password.txt myhost.netscape.com
+#	./ns-keygen  ../password.txt myhost.brandx.com
 #
 # Assumes that NSHOME is Set
 # if NSHOME is not set, it will be derived from the path of this script, which is
diff --git a/ldap/cm/newinst/slapd.inf b/ldap/cm/newinst/slapd.inf
index 50ccb706..a481b6c8 100644
--- a/ldap/cm/newinst/slapd.inf
+++ b/ldap/cm/newinst/slapd.inf
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 [General]
-Name=Netscape Directory Suite
+Name=Brandx Directory Suite
 Components=slapd, slapd-client
 
 [slapd]
@@ -18,7 +18,7 @@ Compatible= 4.0
 BuildNumber= %%%SERVER_BUILD_NUM%%%
 Expires= %%%PUMPKIN_HOUR%%%
 Security= %%%SECURITY%%%
-Vendor= Netscape Communications Corp.
+Vendor= Brandx, Inc.
 Description= %%%SERVER_NAME%%%
 Dependencies= base/4.5, svrcore/4.5, nsperl561/1.13, perldap14/1.01
 ProductName=Directory Server
@@ -36,7 +36,7 @@ IsLdap=True
 NSPerlPostInstall=lib/nsPerl5.6.1/install
 
 [slapd-client]
-Name= Netscape Directory Server Console
+Name= Brandx Directory Server Console
 NickName= slapd-client
 Version= %%%SERVER_VERSION%%%
 Compatible= 4.0
diff --git a/ldap/cm/newinst/ux-config.cc b/ldap/cm/newinst/ux-config.cc
index 64f936f2..531b479b 100644
--- a/ldap/cm/newinst/ux-config.cc
+++ b/ldap/cm/newinst/ux-config.cc
@@ -9,7 +9,7 @@
 **   ux-config.cc
 **
 ** DESCRIPTION:
-**   Netscape Directory Server Pre-installation Program
+**   Brandx Directory Server Pre-installation Program
 **
 ** NOTES:
 **   This program is intended for UNIX only and is NOT thread-safe.
diff --git a/ldap/cm/newinst/ux-config.h b/ldap/cm/newinst/ux-config.h
index dbce264a..ecba9d48 100644
--- a/ldap/cm/newinst/ux-config.h
+++ b/ldap/cm/newinst/ux-config.h
@@ -10,14 +10,17 @@
 **   ux-config.h
 **
 ** DESCRIPTION:
-**   Netscape Directory Server Pre-installation Program
+**   Brandx Directory Server Pre-installation Program
 **
 ** NOTES:
 **
 ** HISTORY:
 ** $Log: ux-config.h,v $
-** Revision 1.1  2005/01/21 00:40:49  cvsadm
-** Initial revision
+** Revision 1.2  2005/02/02 19:35:43  nhosoi
+** [146919] De-brand the Directory Server as "brandx"
+**
+** Revision 1.1.1.1  2005/01/21 00:40:49  cvsadm
+** Moving NSCP Directory Server from DirectoryBranch to TRUNK, initial drop. (foxworth)
 **
 ** Revision 1.1.2.6.8.9  2005/01/14 01:22:10  nhosoi
 ** For the open-source project.
diff --git a/ldap/cm/newinst/ux-dialog.cc b/ldap/cm/newinst/ux-dialog.cc
index 30ca68c8..0dc53b54 100644
--- a/ldap/cm/newinst/ux-dialog.cc
+++ b/ldap/cm/newinst/ux-dialog.cc
@@ -613,11 +613,11 @@ askSlapdServerIDNext(Dialog *me)
 }
 
 DialogInput askMCAdminID(
-"Please enter the administrator ID for the Netscape configuration\n"
+"Please enter the administrator ID for the Brandx configuration\n"
 "directory server.  This is the ID typically used to log in to the\n"
 "console.  You will also be prompted for the password.\n",
 
-"Netscape configuration directory server\nadministrator ID",
+"Brandx configuration directory server\nadministrator ID",
 
 "admin",
 
@@ -3150,21 +3150,21 @@ askSIRTimesNext(Dialog *me)
 }
 
 DialogYesNo askUseExistingMC(
-"Netscape server information is stored in the Netscape configuration\n"
+"Brandx server information is stored in the Brandx configuration\n"
 "directory server, which you may have already set up.  If so, you\n"
 "should configure this server to be managed by the configuration\n"
 "server.  To do so, the following information about the configuration\n"
 "server is required: the fully qualified host name of the form\n"
 "<hostname>.<domainname>(e.g. hostname.domain.com), the port number,\n"
 "the suffix, and the DN and password of a user having permission to\n"
-"write the configuration information, usually the Netscape\n"
+"write the configuration information, usually the Brandx\n"
 "configuration directory administrator.\n\n"
 "If you want to install this software as a standalone server, or if you\n"
-"want this instance to serve as your Netscape configuration directory\n"
+"want this instance to serve as your Brandx configuration directory\n"
 "server, press Enter.\n",
 
 "Do you want to register this software with an existing\n"
-"Netscape configuration directory server?",
+"Brandx configuration directory server?",
 
 "No",
 
@@ -3247,11 +3247,11 @@ askUseExistingMCNext(Dialog *me)
 }
 
 DialogInput askMCHost(
-"Enter the fully qualified domain name of the Netscape configuration\n"
+"Enter the fully qualified domain name of the Brandx configuration\n"
 "directory server host in the form <hostname>.<domainname>\n"
 "(e.g. hostname.domain.com).\n",
 
-"Netscape configuration directory server\nhost name",
+"Brandx configuration directory server\nhost name",
 
 0,
 
@@ -3312,10 +3312,10 @@ askMCHostNext(Dialog *me)
 }
 
 DialogInput askMCPort(
-"Please specify the port number on which the Netscape configuration\n"
+"Please specify the port number on which the Brandx configuration\n"
 "directory server listens.\n",
 
-"Netscape configuration directory server\nport number",
+"Brandx configuration directory server\nport number",
 
 "389",
 
@@ -3383,13 +3383,13 @@ askMCPortNext(Dialog *me)
 }
 
 DialogInput askMCDN(
-"To write configuration information into the Netscape configuration\n"
+"To write configuration information into the Brandx configuration\n"
 "directory, you must bind to the server as an entity with the\n"
-"appropriate permissions.  Usually, the Netscape configuration\n"
+"appropriate permissions.  Usually, the Brandx configuration\n"
 "directory administrator is used for this purpose, although you can\n"
 "give other directory accounts the proper access.\n",
 
-"Netscape configuration directory server\nadministrator ID",
+"Brandx configuration directory server\nadministrator ID",
 
 0,
 
@@ -3556,7 +3556,7 @@ DialogYesNo askDisableSchemaChecking(
 "installation, and you think you may have problems with your old\n"
 "schema, you may want to turn off schema checking until after the\n"
 "import.  If you choose to do this, schema checking will remain off\n"
-"until you manually turn it back on.  Netscape recommends that you turn\n"
+"until you manually turn it back on.  Brandx recommends that you turn\n"
 "it back on as soon as possible.\n",
 
 "Do you want to disable schema checking?",
@@ -3601,7 +3601,7 @@ askDisableSchemaCheckingNext(Dialog *me)
 
 DialogInput askMCAdminDomain(
 "The Administration Domain is a part of the configuration directory\n"
-"server used to store information about Netscape software.  If you are\n"
+"server used to store information about Brandx software.  If you are\n"
 "managing multiple software releases at the same time, or managing\n"
 "information about multiple domains, you may use the Administration\n"
 "Domain to keep them separate.\n\n"
@@ -3723,7 +3723,7 @@ askMCAdminDomainNext(Dialog *me)
 
 DialogInput askAdminDomain(
 "The Administration Domain is a part of the configuration directory\n"
-"server used to store information about Netscape software.  If you are\n"
+"server used to store information about Brandx software.  If you are\n"
 "managing multiple software releases at the same time, or managing\n"
 "information about multiple domains, you may use the Administration\n"
 "Domain to keep them separate.\n\n"
@@ -4220,7 +4220,7 @@ askUGSuffixNext(Dialog *me)
 
 DialogInput askReconfigMCAdminPwd(
 (const char*)0,
-"Netscape configuration directory server\nadministrator ID",
+"Brandx configuration directory server\nadministrator ID",
 
 (const char*)0,
 
diff --git a/ldap/cm/newinstnt/consolinst.c b/ldap/cm/newinstnt/consolinst.c
index aced950a..9fc5a6f5 100644
--- a/ldap/cm/newinstnt/consolinst.c
+++ b/ldap/cm/newinstnt/consolinst.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 //////////////////////////////////////////////////////////////////////////////
-// CONSOLINST.c - Netscape Directory Server Installation Plug-In 
+// CONSOLINST.c - Brandx Directory Server Installation Plug-In 
 //
 //
 #include <windows.h>
diff --git a/ldap/cm/newinstnt/dsinst.c b/ldap/cm/newinstnt/dsinst.c
index 17749f81..2e61a51e 100644
--- a/ldap/cm/newinstnt/dsinst.c
+++ b/ldap/cm/newinstnt/dsinst.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 ///////////////////////////////////////////////////////////////////////////////
-// dsinst.c - Netscape Directory Server Installation Plug-In 
+// dsinst.c - Brandx Directory Server Installation Plug-In 
 //
 #include <windows.h>
 #include <commctrl.h>
diff --git a/ldap/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc
index a70c64a0..5a6ba278 100644
--- a/ldap/cm/newinstnt/dsinst.rc
+++ b/ldap/cm/newinstnt/dsinst.rc
@@ -1,710 +1,710 @@
-//Microsoft Developer Studio generated resource script.

-//

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifndef _MAC

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,0,0,1

- PRODUCTVERSION 1,0,0,1

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904b0"

-        BEGIN

-            VALUE "CompanyName", "Netscape\0"

-            VALUE "FileDescription", "Directory Server 7.0\0"

-            VALUE "FileVersion", "1, 0, 0, 1\0"

-            VALUE "InternalName", "Directory Server 7.0\0"

-            VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc.  Portions copyright 1999, 2002 Netscape Communications Corporation.  All rights reserved.\0"

-            VALUE "OriginalFilename", "\0"

-            VALUE "ProductName", "Netscape Server Products\0"

-            VALUE "ProductVersion", "7, 0, 0, 0\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

-

-#endif    // !_MAC

-

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_MCC_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0"

-FONT 8, "MS Sans Serif"

-BEGIN

-    EDITTEXT        IDC_EDIT_HOST,158,68,103,13,ES_AUTOHSCROLL | WS_DISABLED

-    EDITTEXT        IDC_EDIT_PORT,158,86,29,13,ES_AUTOHSCROLL | WS_DISABLED

-    EDITTEXT        IDC_EDIT_SUFFIX,158,140,103,13,ES_AUTOHSCROLL | 

-                    WS_DISABLED

-    EDITTEXT        IDC_EDIT_BIND_AS,158,104,103,13,ES_AUTOHSCROLL | 

-                    WS_DISABLED

-    EDITTEXT        IDC_EDIT_PW,158,122,103,13,ES_PASSWORD | ES_AUTOHSCROLL | 

-                    WS_DISABLED

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "Host:",IDC_STATIC_MCC_HOST,136,70,17,8

-    LTEXT           "Port:",IDC_STATIC_MCC_PORT,137,88,16,8

-    LTEXT           "Suffix:",IDC_STATIC_MCC_SUFFIX,130,142,23,8

-    LTEXT           "Bind As:",IDC_STATIC_MCC_BIND_AS,126,106,27,8

-    LTEXT           "Password:",IDC_STATIC_MCC_PW,117,124,36,8

-    GROUPBOX        "Configuration Directory Server",IDC_STATIC_SETTINGS,91,

-                    37,191,121

-    CONTROL         "This instance will be the configuration directory server",

-                    IDC_RADIO_USE_THIS_SERVER,"Button",BS_AUTORADIOBUTTON,97,

-                    47,184,10

-    CONTROL         "Use existing configuration directory server",

-                    IDC_RADIO_USE_EXISTING_SERVER,"Button",

-                    BS_AUTORADIOBUTTON,97,57,165,10

-    LTEXT           "Netscape server information is stored in the Netscape configuration directory server, which you may have already set up.  If so, you should configure this server to be managed by the configuration server.",

-                    IDC_STATIC_DESC,92,3,172,33

-END

-

-IDD_ROOTDN DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Directory Manager Settings"

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    EDITTEXT        IDC_EDIT_UNRESTRICTED_USER,168,74,112,14,ES_AUTOHSCROLL

-    LTEXT           "Directory Manager DN:",IDC_STATIC_UNRESTRICTED_USER,88,

-                    74,73,8

-    LTEXT           "Password:",IDC_STATIC_PASSWORD,88,96,34,8

-    EDITTEXT        IDC_EDIT_PASSWORD,168,96,112,14,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,88,119,57,

-                    8

-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,168,119,111,14,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    GROUPBOX        "Directory Manager Settings",

-                    IDC_STATIC_UNRESTRICTED_USER_GROUPBOX,84,58,203,84

-    LTEXT           "Certain directory server operations require an administrative user.  This user is referred to as the Directory Manager and typically has a bind Distinguished Name (DN) of cn=Directory Manager.",

-                    IDC_STATIC_DM_DESC,84,11,202,26

-    LTEXT           "The password for the Directory Manager must be at least 8 characters long.",

-                    IDC_STATIC,84,39,202,18

-END

-

-IDD_SUITESPOTID DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION 

-"Directory Server 7.0 Netscape configuration directory server administrator "

-

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    EDITTEXT        IDC_EDIT_SUITESPOT_USER,173,51,114,14,ES_AUTOHSCROLL

-    LTEXT           "Configuration Directory Administrator ID:",

-                    IDC_STATIC_SUITESPOT_USER,94,51,73,17

-    LTEXT           "Password:",IDC_STATIC_PASSWORD,94,74,34,8

-    EDITTEXT        IDC_EDIT_PASSWORD,173,74,114,14,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,94,97,57,8

-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,173,97,114,14,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    GROUPBOX        "Configuration Directory Server Administrator ",

-                    IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,91

-    LTEXT           "The Netscape configuration directory administrator is the ID typically used to log in to the console.",

-                    IDC_STATIC_MCA_DESC,88,10,196,18

-END

-

-IDD_SERVER_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Server Settings"

-FONT 8, "MS Sans Serif"

-BEGIN

-    GROUPBOX        "General Settings",IDC_STATIC_GENERAL_SETTINGS,97,33,194,

-                    68

-    EDITTEXT        IDC_EDIT_SERVER_IDENTIFIER,175,46,105,12,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_SERVER_PORT,175,62,35,12,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_SUFFIX,175,78,105,12,ES_AUTOHSCROLL

-    CONTROL         "Spin1",IDC_SPIN_SERVER_PORT,"msctls_updown32",

-                    UDS_SETBUDDYINT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,209,62,

-                    10,12

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "Server Identifier:",IDC_STATIC_SERVER_IDENTIFIER,116,46,

-                    52,8

-    LTEXT           "Server Port: ",IDC_STATIC_SERVER_PORT,129,62,39,8

-    LTEXT           "Suffix: ",IDC_STATIC_SUFFIX,146,78,22,8

-    LTEXT           "Settings this directory server will use for basic operation.",

-                    IDC_STATIC_SERV_SETTINGS_DESC,103,20,180,10

-END

-

-IDD_SAMPLE_ENTRIES_ORG DIALOG DISCARDABLE  0, 0, 377, 179

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Populate Database"

-FONT 8, "MS Sans Serif"

-BEGIN

-    GROUPBOX        "Sample Organizational Structure",

-                    IDC_STATIC_DEFAULT_ORG_GROUP,89,5,285,50

-    CONTROL         "Install Sample Organizational Structure",

-                    IDC_CHECK_POPULATE_ORG_ENTRIES,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,104,41,146,10

-    GROUPBOX        "Populate Database",IDC_STATIC_SAMPLE_GROUP,89,64,285,95

-    CONTROL         "Don't Populate",IDC_RADIO_DONT_POPULATE,"Button",

-                    BS_AUTORADIOBUTTON | WS_GROUP,96,93,63,10

-    CONTROL         "Populate with sample database",

-                    IDC_RADIO_POPULATE_SAMPLE,"Button",BS_AUTORADIOBUTTON,96,

-                    102,114,11

-    CONTROL         "Populate with custom database",

-                    IDC_RADIO_POPULATE_CUSTOM,"Button",BS_AUTORADIOBUTTON,96,

-                    112,115,10

-    PUSHBUTTON      "Browse",IDC_BUTTON_CHOOSE_LDIF_FILE,96,130,51,14,

-                    WS_GROUP

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,176

-    LTEXT           "Populate the new directory server instance with some commonly used organizational entries, to provide some default structure to the directory.",

-                    IDC_STATIC_ORG_ENTRIES,96,15,180,26

-    LTEXT           "(must have base )",IDC_STATIC_MUST_HAVE_BASE,106,121,

-                    154,8

-    LTEXT           "File:",IDC_STATIC_FILE_NAME_COLON,96,146,15,10

-    LTEXT           "",IDC_STATIC_LDIF_FILE_NAME,96,146,188,9

-    LTEXT           "You may choose at this time to populate the database with an LDIF file or create a sample database.",

-                    IDC_STATIC,96,75,186,17

-END

-

-IDD_CONSUMER_REPLICATION_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Consumer Replication Settings"

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "In order to allow remote servers to replicate new entries to this server, the remote server must have the ability to bind to this server as some entity with permission to do so.  ",

-                    IDC_STATIC_CIR_DESCRIPTION,93,7,186,24

-    LTEXT           "Supplier Bind DN:",IDC_STATIC_SUPPLIER_DN,97,80,71,8

-    LTEXT           "Supplier Password:",IDC_STATIC_SUPPLIER_PW,97,96,61,8

-    LTEXT           "Supplier Password (again):",IDC_STATIC_SUPPLIER_PW2,97,

-                    112,86,11

-    EDITTEXT        IDC_EDIT_SUPPLIER_DN,188,80,95,12,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_PASSWORD,188,96,95,12,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,188,112,95,12,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    GROUPBOX        "Consumer Server Replication Settings",IDC_CONSUMER,90,

-                    62,201,66

-    LTEXT           "The Supplier DN is the DN of the entity the remote server will use to connect to this server to supply updates.",

-                    IDC_STATIC_CIR_DESCRIPTION2,93,36,186,16

-END

-

-IDD_SUPPLIER_REPLICATION_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Supplier Replication Settings"

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "Settings which configure this server to send replication updates to other servers.",

-                    IDC_STATIC_SIR_DESCRIPTION,91,13,186,17

-    LTEXT           "Changelog DB Directory:",IDC_STATIC_CHANGELOG_DB_DIR,91,

-                    55,79,8

-    LTEXT           "Changelog Suffix:",IDC_STATIC_CHANGELOG_SUFFIX,91,74,56,

-                    8

-    EDITTEXT        IDC_EDIT_CHANGELOG_DB_DIR,182,55,95,12,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_CHANGELOG_DB_SUFFIX,182,73,95,12,ES_AUTOHSCROLL

-    GROUPBOX        "Supplier Server Replication Settings",

-                    IDC_SIR_DESCRIPTION,83,40,201,55

-END

-

-IDD_CONSUMER_DN DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Consumer DN Settings "

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    EDITTEXT        IDC_EDIT_CONSUMER_DN,163,77,111,14,ES_AUTOHSCROLL

-    LTEXT           "Consumer Bind DN:",IDC_STATIC_CONSUMER_DN,90,77,67,8

-    LTEXT           "Password:",IDC_STATIC_CONSUMER_PW,90,100,36,8

-    EDITTEXT        IDC_EDIT_PASSWORD,163,100,111,14,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,90,123,57,

-                    8

-    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,163,123,112,14,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    GROUPBOX        "Supplier CIR Replication Settings",

-                    IDC_STATIC_SUPPLIER_CIR,84,59,208,89

-    LTEXT           "Do you wish to create an entry which can be used by CIR Consumers to bind to this Supplier? \nNote: This user will have acess to the entire database as well as the changelog.",

-                    IDC_STATIC,84,5,206,32

-    CONTROL         "Yes",IDC_RADIO_CONFIG_CONSUMER_DN_YES,"Button",

-                    BS_AUTORADIOBUTTON,149,45,28,10

-    CONTROL         "No",IDC_RADIO_CONFIG_CONSUMER_DN_NO,"Button",

-                    BS_AUTORADIOBUTTON,181,45,25,10

-END

-

-IDD_REPLICATION_AGREEMENT DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Configure Replication Agreement"

-FONT 8, "MS Sans Serif"

-BEGIN

-    EDITTEXT        IDC_EDIT_HOST,159,13,80,13,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_PORT,159,30,24,13,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_SUFFIX,159,48,80,13,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_BIND_AS,159,65,80,13,ES_AUTOHSCROLL

-    EDITTEXT        IDC_EDIT_PW,159,82,80,13,ES_PASSWORD | ES_AUTOHSCROLL

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "Host:",IDC_STATIC_REPLICATION_HOST,137,13,18,8

-    LTEXT           "Port:",IDC_STATIC_REPLICATION_PORT,139,30,16,8

-    LTEXT           "Root of Replication:",IDC_STATIC_REPLICATION_ROOT,91,48,

-                    64,8

-    LTEXT           "Bind As:",IDC_STATIC_REPLICATION_BIND_AS,128,65,27,8

-    LTEXT           "Password:",IDC_STATIC_REPLICATION_PW,119,82,34,8

-    GROUPBOX        "Replication Agreement",IDC_STATIC_REPLICATION_AGREEMENT,

-                    84,2,207,155

-    GROUPBOX        "Replication Days",IDC_STATIC_REPL_DAYS,90,93,197,22

-    CONTROL         "Sun",IDC_CHECK_SUN,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,92,102,25,10

-    CONTROL         "Mon",IDC_CHECK_MON,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,119,102,28,10

-    CONTROL         "Tue",IDC_CHECK_TUE,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,147,102,25,10

-    CONTROL         "Wed",IDC_CHECK_WED,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,173,102,27,10

-    CONTROL         "Thur",IDC_CHECK_THUR,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,201,102,27,10

-    CONTROL         "Fri",IDC_CHECK_FRI,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,229,102,25,10

-    CONTROL         "Sat",IDC_CHECK_SAT,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,254,102,25,10

-    GROUPBOX        "Replication Times",IDC_STATIC,89,117,83,37

-    LTEXT           "Start:",IDC_STATIC_REPL_START_TIME,95,126,16,8

-    EDITTEXT        IDC_EDIT_REPL_START_TIME_HH,113,126,15,12,ES_AUTOHSCROLL

-    LTEXT           "End:",IDC_STATIC_REPL_END_TIME,95,140,16,8

-    EDITTEXT        IDC_EDIT_REPL_END_TIME_HH,113,140,15,12,ES_AUTOHSCROLL

-    CONTROL         "Spin1",IDC_SPIN_REPL_START_TIME_MM,"msctls_updown32",

-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,155,126,10,12

-    EDITTEXT        IDC_EDIT_REPL_SYNC_INTERVAL,238,126,25,12,ES_AUTOHSCROLL

-    LTEXT           "Replication Sync Interval(minutes)",

-                    IDC_STATIC_REPL_SYNC,182,126,55,17

-    CONTROL         "Spin1",IDC_SPIN_REPL_SYNC_INTERVAL,"msctls_updown32",

-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,262,126,11,11

-    EDITTEXT        IDC_EDIT_REPL_START_TIME_MM,141,126,15,12,ES_AUTOHSCROLL

-    CONTROL         "Spin1",IDC_SPIN_REPL_START_TIME_HH,"msctls_updown32",

-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,128,126,11,12

-    CONTROL         "Spin1",IDC_SPIN_REPL_END_TIME_HH,"msctls_updown32",

-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,128,140,11,12

-    EDITTEXT        IDC_EDIT_REPL_END_TIME_MM,141,140,15,12,ES_AUTOHSCROLL

-    CONTROL         "Spin1",IDC_SPIN_REPL_END_TIME_MM,"msctls_updown32",

-                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,155,140,11,12

-END

-

-IDD_CHOOSE_REPLICATION_SETUP DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Configure Server for Replication"

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         "A Consumer that will pull updates",

-                    IDC_RADIO_CONSUMER_CIR,"Button",BS_AUTORADIOBUTTON | 

-                    WS_GROUP,119,117,125,9

-    CONTROL         "A Consumer that will have updates",

-                    IDC_RADIO_CONSUMER_SIR,"Button",BS_AUTORADIOBUTTON,119,

-                    95,127,10

-    CONTROL         "Do not configure as a Consumer",

-                    IDC_RADIO_NO_CONSUMER_REPLICATION,"Button",

-                    BS_AUTORADIOBUTTON,119,138,113,10

-    CONTROL         "A Supplier that will have updates",

-                    IDC_RADIO_SUPPLIER_CIR,"Button",BS_AUTORADIOBUTTON | 

-                    WS_GROUP,118,42,122,10

-    CONTROL         "A Supplier that will push updates",

-                    IDC_RADIO_SUPPLIER_SIR,"Button",BS_AUTORADIOBUTTON,118,

-                    20,121,10

-    CONTROL         "Do not configure as as Supplier",

-                    IDC_RADIO_NO_SUPPLIER_REPLICATION,"Button",

-                    BS_AUTORADIOBUTTON,118,65,113,10

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "from another server (CIR)",

-                    IDC_STATIC_CONSUMER_CIR_EXTRA,132,126,80,8

-    LTEXT           "pushed to it from another server (SIR)",

-                    IDC_STATIC_CONSUMER_SIR_EXTRA,132,105,118,8

-    LTEXT           "pulled from it by another server (CIR)",

-                    IDC_STATIC_SUPPLIER_CIR_EXTRA,131,53,115,8

-    LTEXT           "to another server (SIR)",IDC_STATIC_SUPPLIER_SIR_EXTRA,

-                    131,31,72,8

-    GROUPBOX        "Consumer Replications Settings",

-                    IDC_STATIC_CONSUMER_REPL,113,84,144,68

-    GROUPBOX        "Supplier Replication Settings",

-                    IDC_STATIC_SUPPLIER_REPLICATION,112,9,145,71

-END

-

-IDD_DISABLE_SCHEMA_CHECKING DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Disable Schema Checking"

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "If you are going to import an old database immediately after or during installation, and you think you may have problems with your old schema, you may wish to turn off schema checking until after the import.",

-                    IDC_STATIC_DISABLE_SCHEMA_TXT,95,37,188,34

-    LTEXT           "If you choose to do this, schema checking will remain off until you manually turn it back on.  It is recommended that you turn it back on as soon as possible.",

-                    IDC_STATIC_DISABLE_SCHEMA_TEXT_CONT,95,76,187,28

-    GROUPBOX        "Disable Schema Checking",

-                    IDC_STATIC_DISABLE_SCHEMA_CHECKING_GROUP,90,27,198,102

-    CONTROL         "Disable Schema Checking",

-                    IDC_CHECK_DISABLE_SCHEMA_CHECKING,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,95,111,99,10

-END

-

-IDD_ADMIN_DOMAIN DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Administration Domain"

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "The Administration Domain is a part of the configuration directory server used to store information about Netscape software.",

-                    IDC_STATIC_ADMIN_DOMAIN_DESC,90,8,203,16

-    EDITTEXT        IDC_EDIT_ADMIN_DOMAIN,157,113,118,14,ES_AUTOHSCROLL

-    LTEXT           "Administration Domain:",IDC_STATIC_ADMIN_DOMAIN,104,113,

-                    51,16

-    GROUPBOX        "Administration Domain Settings",

-                    IDC_STATIC_ADMIN_DOMAIN_GB,90,99,187,40

-    LTEXT           "If you are managing multiple software releases at the same time, or managing information about multiple domains, you may use the the Administration Domain to keep them separate.",

-                    IDC_STATIC_ADMIN_DOMAIN_DESC2,90,29,197,25

-    LTEXT           "If you are not using administrative domains, select the default.  Otherwise, enter a descriptive, unique name for the administration domain, such as the name of the organization responsible for managing the domain.",

-                    IDC_STATIC_ADMIN_DOMAIN_DESC3,90,58,197,33

-END

-

-IDD_REINSTALL_CONFIG DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Directory Server 7.0 Reinstall Settings"

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    LTEXT           "Setup has detected that you are reinstalling into an existing server root. ",

-                    IDC_STATIC_ADMIN_REINSTALL_DESC,90,8,203,16

-    LTEXT           "config url is displayed here",IDC_CONFIG_URL_VAL,96,52,

-                    184,8

-    LTEXT           "Bind As:",IDC_STATIC_BIND_AS,96,67,27,8

-    EDITTEXT        IDC_EDIT_BIND_AS,145,65,132,14,ES_AUTOHSCROLL

-    LTEXT           "Password:",IDC_STATIC_PW,96,88,34,8

-    EDITTEXT        IDC_EDIT_PW,145,87,132,14,ES_PASSWORD | ES_AUTOHSCROLL

-    GROUPBOX        "Configuration Directory",IDC_STATIC_CONFIG_DIR_SETTING,

-                    87,36,206,89

-END

-

-IDD_UNINSTALL_STATUS DIALOG DISCARDABLE  0, 0, 291, 72

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION

-FONT 8, "MS Sans Serif"

-BEGIN

-    CTEXT           "",IDC_STOPPING_SERVER_MESSAGE,10,29,270,13,

-                    SS_CENTERIMAGE

-END

-

-IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE  0, 0, 297, 163

-STYLE WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION 

-"Directory Server 7.0 Netscape configuration directory server administrator "

-

-FONT 8, "MS Sans Serif"

-BEGIN

-    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160

-    EDITTEXT        IDC_EDIT_SUITESPOT_USER,173,51,114,14,ES_AUTOHSCROLL

-    LTEXT           "Configuration Directory Administrator ID:",

-                    IDC_STATIC_SUITESPOT_USER,94,51,73,17

-    LTEXT           "Password:",IDC_STATIC_PASSWORD,94,74,34,8

-    EDITTEXT        IDC_EDIT_PASSWORD,173,74,114,14,ES_PASSWORD | 

-                    ES_AUTOHSCROLL

-    GROUPBOX        "Configuration Directory Server Administrator ",

-                    IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,61

-    LTEXT           "The Netscape configuration directory administrator is the ID typically used to log in to the console.",

-                    IDC_STATIC_MCA_DESC,88,10,196,18

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE 

-BEGIN

-    IDD_SAMPLE_ENTRIES_ORG, DIALOG

-    BEGIN

-        BOTTOMMARGIN, 176

-    END

-

-    IDD_REPLICATION_AGREEMENT, DIALOG

-    BEGIN

-        BOTTOMMARGIN, 160

-    END

-

-    IDD_CHOOSE_REPLICATION_SETUP, DIALOG

-    BEGIN

-        BOTTOMMARGIN, 160

-    END

-

-    IDD_UNINSTALL_STATUS, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 284

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 65

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Bitmap

-//

-

-IDB_WIZARD              BITMAP  DISCARDABLE     "wizard.bmp"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    ERR_NO_WINSOCK          "Cant find usable winsock DLL > 2.0"

-    ERR_NO_WINSOCK_VER      "Cant find usable winsock DLL > 2.0"

-    ERR_NO_HOST             "You must enter a Host."

-    ERR_NO_PORT             "You must enter a Port."

-    ERR_NO_SUFFIX           "You must enter a suffix."

-    ERR_NO_BIND_DN          "You must enter a Bind DN."

-    ERR_NO_PW               "You must enter a password."

-    ERR_INIT_DIALOG         "Fatal Error Initializing Dialog"

-    ERR_NO_SERVER_ID        "You must enter a Server Identifier."

-    ERR_SERVER_ID_EXISTS    "A server already exists with the identifier %s. Choose a unique identifier."

-    ERR_INVALID_PORT        "The server port %d is invalid.  Please choose another one."

-    ERR_PW_TOO_SHORT        "You must enter a password of at least %d characters."

-    ERR_NO_PW_AGAIN         "You must enter password again to confirm."

-    ERR_PW_DIFFER           "Passwords differ, try again."

-    ERR_NO_ROOT_DN          "You must enter an unrestricted user."

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    ERR_NO_SS_ADMIN         "You must enter a Configuration Administrator."

-    ERR_NO_SUPPLIER_DN      "You must enter a Supplier DN."

-    ERR_NO_CHANGELOG_DB     "You must enter a Changelog DB."

-    ERR_NO_CHANGELOG_SUFFIX "You must enter a Changelog Suffix."

-    ERR_NO_CONSUMER_DN      "You must enter a consumer bind dn."

-    ERR_READ_GLOBAL_CACHE   "Error Reading Global Cache: Invalid %s"

-    ERR_READ_LOCAL_CACHE    "Error Reading Local Cache: Invalid %s"

-    ERR_NO_FIND_INST_PROG   "Could not find program %s: %s"

-    ERR_EXEC_INST_PROG      "Error executing program %s: %s\nPlease refer to the log file %s for more information."

-    ERR_NO_STAT_TMP_FILE    "Could not stat the temp file %s: %s"

-    ERR_NO_CREATE_FILE      "Could not create file %s"

-    ERR_CREATE_MCC_BAT      "Fatal Error Creating Directory Server Mcc"

-    ERR_CREATE_DS_INSTANCE  "Fatal Error Creating Directory Server Instance"

-    ERR_REMOVE_EVLOG_KEY    "Error Removing Directory Server EventLog Key"

-    ERR_REMOVE_INSTANCE     "Error: unable to remove server instance: %s."

-    ERR_REM_INST_REG_KEYS   "Error: unable to remove registry keys for server %s."

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    ERR_SERV_RUN_ON_PORT    "You have another server running on port %d. Turn off that server before continuing with installation."

-    ERR_INVALID_HOST        "The hostname %s could not be verified.  Please enter another hostname."

-    ERR_CANT_FIND_DS        "Could not connect to ldap://%s:%d/ for bind DN %s\nPlease check your settings.  Otherwise, the remote server may be down at this time.\nThe installation cannot proceed."

-    ERR_SNMP_IS_RUNNING     "The SNMP Service is running. It will be turned off automatically and restarted when this operation is complete if you choose to continue."

-    ERR_SNMP_BAD_SHUTDOWN   "Error stopping the SNMP Service. Setup can not continue"

-    ERR_SNMP_BAD_STARTUP    "Error starting the SNMP Service"

-    ERR_SLAPD_SHUTDOWN      "Unable to shutdown the Directory Server (%s).\nWarning, all files and registry keys may not be removed.\nWould you like to continue uninstalling?"

-    ERR_UNK_INST_CREATE     "An unknown error occured while executing program %s.\nPlease refer to the log file %s for more information."

-    IDS_UG_DESC             "You may already have a directory server you want to use to store your data, such as user and group information."

-    IDS_UG_GB_DESC          "Directory to store data"

-    IDS_UG_RADIO_EXIST      "Store data in an existing directory server"

-    IDS_UG_RADIO_CREATE     "Store data in this directory server"

-    IDS_UG_DLG_CAPTION      " "

-    ERR_NO_ADMIN_DOMAIN     "You must enter an Admin Domain."

-    ERR_8BIT_PW             "Passwords must contain 7 bit characters only."

-    ERR_8BIT_SERVID         "Server identifiers must contain 7 bit characters only."

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    ERR_8BIT_PATH           "Paths must contain 7 bit characters only."

-    SUM_DS_SET_TITLE        "Directory Server Settings"

-    SUM_SERVER_IDENTIFIER   "Server Identifier"

-    SUM_SUFFIX              "Suffix"

-    SUM_PORT                "Port"

-    SUM_CONFIG_DS_TITLE     "Configuration Directory Server Settings"

-    SUM_HOST                "Host"

-    SUM_BIND_AS             "Bind As"

-    SUM_DATA_DS_TITLE       "Data Directory Server Settings"

-    SUM_CFG_ADM_ID          "Configuration Directory Administrator ID"

-    SUM_ADMIN_DOMAIN        "Administration Domain"

-    SUM_DIRECTORY_MANAGER   "Directory Manager DN"

-    SUM_SUPPLIER_REPL_TITLE "Supplier Replication Settings"

-    SUM_CHANGELOG_DB_DIR    "Changelog DB Directory"

-    SUM_CHANGELOG_SUFFIX    "Changelog Suffix"

-    SUM_REPL_AGR_TITLE      "Replication Agreement"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    SUM_REPL_ROOT           "Root of Replication"

-    SUM_REPL_DAYS           "Replication Days"

-    SUM_REPL_TIMES          "Replication Times"

-    SUM_CONSUMER_BIND_DN    "Consumer Bind DN"

-    SUM_CONSUMER_REPL_TITLE "Consumer Replication Settings"

-    SUM_SUPPLIER_DN         "Supplier Bind DN"

-    SUM_REPL_SYNC_INTERVAL  "Replication Sync Interval"

-    SUM_POP_ORG_STRUCT      "Install Sample Organizational Structure"

-    SUM_POP_DB_FILE         "Populate Database with"

-    SUM_DISABLE_SCHEMA_CHECKING "Disable Schema Checking"

-    ERR_INVALID_DN          "%s is not a valid DN."

-    SUM_REINSTALL           "Files will be updated, no configuration changes."

-    ERR_CANT_FIND_DS_REPL   "Could not connect to ldap://%s:%d/ for bind DN %s Please check your settings.  Otherwise, the remote server may be down at this time. You may need to manually start replication after installation. Would you like to continue using these settings?"

-    IDS_STARTING_SERVICE    "Starting Netscape Directory Server (%s)"

-    IDS_STOPPING_SERVICE    "Stopping Netscape Directory Server (%s)"

-    IDS_WAIT_SERVICE_START  "Waiting for Netscape Directory Server (%s) to start"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_WAIT_SERVICE_STOP   "Waiting for Netscape Directory Server (%s) to stop"

-    ERR_ADMIN_DOMAIN_DN     "A DN [%s] is not allowed here.  Please enter a valid string."

-    ERR_CANT_FIND_ADMIN_DOMAIN 

-                            "Could not find the Admin Domain %s in ldap://%s:%d/ for bind DN %s\nPlease check your settings.  You may need to install using Custom mode in order to specify the Admin domain.\nThe installation cannot proceed."

-    WARN_USING_LDAPV2_QUOTES 

-                            "The given value [%s] is quoted in the deprecated LDAPv2 style\nquoting format.  It will be automatically converted to use the\nLDAPv3 style escaped format [%s]."

-    ERR_8BIT_UID            "The UID value must contain 7 bit characters only."

-    ERR_SERVER_ID_EXISTS_TITLE "Directory Server (%s) Already Exists"

-    ERR_NO_CONFIG_URL       "The Config Directory URL could not be found."

-    WARN_USING_LDAPV2_QUOTES_TITLE "Warning: Deprecated Quoting Style [%s]"

-    ERR_INVALID_DN_TITLE    "Invalid DN: %s"

-    ERR_NO_WINSOCK_TITLE    "Could Not Find Winsock"

-    ERR_NO_WINSOCK_VER_TITLE "Invalid Winsock Version"

-    ERR_8BIT_SERVID_TITLE   "Invalid Server ID"

-    ERR_SERV_RUN_ON_PORT_TITLE "Port Is In Use"

-    ERR_INIT_DIALOG_TITLE   "Could Not Initialize Dialog"

-    ERR_NO_HOST_TITLE       "Host Required"

-    ERR_NO_PORT_TITLE       "Port Required"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    ERR_NO_SUFFIX_TITLE     "Suffix Required"

-    ERR_NO_BIND_DN_TITLE    "Bind DN Required"

-    ERR_NO_PW_TITLE         "Password Required"

-    ERR_NO_SERVER_ID_TITLE  "Server ID Required"

-    ERR_INVALID_PORT_TITLE  "Port Is Invalid"

-    ERR_PW_TOO_SHORT_TITLE  "Password Length Too Short"

-    ERR_NO_PW_AGAIN_TITLE   "Enter Password Again"

-    ERR_PW_DIFFER_TITLE     "Passwords Are Different"

-    ERR_NO_ROOT_DN_TITLE    "Root DN Required"

-    ERR_NO_SS_ADMIN_TITLE   "Configuration Administrator Required"

-    ERR_NO_SUPPLIER_DN_TITLE "Supplier DN Required"

-    ERR_NO_CHANGELOG_DB_TITLE "Changelog DB Required"

-    ERR_NO_CHANGELOG_SUFFIX_TITLE "Changelog Suffix Required"

-    ERR_NO_CONSUMER_DN_TITLE "Consumer DN Required"

-    ERR_NO_FIND_INST_PROG_TITLE "Program Not Found"

-    ERR_EXEC_INST_PROG_TITLE "Could Not Execute Program"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    ERR_NO_STAT_TMP_FILE_TITLE "File Not Found"

-    ERR_NO_CREATE_FILE_TITLE "Could Not Create File"

-    ERR_CREATE_MCC_BAT_TITLE "Could Not Create Script File"

-    ERR_CREATE_DS_INSTANCE_TITLE "Could Not Create Directory Server Instance"

-    ERR_REMOVE_EVLOG_KEY_TITLE "Could Not Remove EVLOG Key"

-    ERR_REMOVE_INSTANCE_TITLE "Could Not Remove Directory Server Instance"

-    ERR_REM_INST_REG_KEYS_TITLE "Could Not Remove Registry Keys"

-    ERR_INVALID_HOST_TITLE  "Invalid Host: %s"

-    ERR_CANT_FIND_DS_TITLE  "Could Not Contact Directory Server"

-    ERR_SNMP_IS_RUNNING_TITLE "SNMP Is Running"

-    ERR_SNMP_BAD_SHUTDOWN_TITLE "Error Shutting Down SNMP"

-    ERR_SNMP_BAD_STARTUP_TITLE "Could Not Start SNMP"

-    ERR_SLAPD_SHUTDOWN_TITLE "Error Shutting Down Directory Server (%s)"

-    ERR_NO_ADMIN_DOMAIN_TITLE "Admin Domain Required"

-    ERR_8BIT_PW_TITLE       "Invalid Password"

-    ERR_8BIT_PATH_TITLE     "Invalid Path"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    ERR_CANT_FIND_DS_REPL_TITLE "Could Not Connect To Replication Server"

-    ERR_ADMIN_DOMAIN_DN_TITLE "Invalid Admin Domain %s"

-    ERR_CANT_FIND_ADMIN_DOMAIN_TITLE "Admin Domain %s Not Found"

-    ERR_8BIT_UID_TITLE      "Invalid User ID Value"

-    ERR_NO_CONFIG_URL_TITLE "Configuration Directory Information Not Found"

-    ERR_NO_USER_URL         "The information about the User Directory could not be found."

-    ERR_NO_USER_URL_TITLE   "Could Nof Find User Directory Information"

-    ERR_UNINSTALL_DS        "Could not uninstall Directory Server.  Please check the log file\n%s for problems,\ncorrect them, and uninstall again.  Exiting."

-    ERR_UNINSTALL_DS_TITLE  "Could not uninstall Directory Server"

-    ERR_REG_DEL_KEY_TITLE   "Could Not Delete Registry Key"

-    ERR_REG_DEL_KEY         "Could not delete the registry key %s - error %d (%s)."

-    ERR_REG_CREATE_KEY_TITLE "Could not Create Registry Key"

-    ERR_REG_CREATE_KEY      "Could not create the registry key %s - error %d (%s)."

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Brandx\0"
+            VALUE "FileDescription", "Directory Server 7.1\0"
+            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "InternalName", "Directory Server 7.1\0"
+            VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc.  Portions copyright 1999, 2002 Netscape Communications Corporation.  All rights reserved.\0"
+            VALUE "OriginalFilename", "\0"
+            VALUE "ProductName", "Brandx Server Products\0"
+            VALUE "ProductVersion", "7, 1, 0, 0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_MCC_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1"
+FONT 8, "MS Sans Serif"
+BEGIN
+    EDITTEXT        IDC_EDIT_HOST,158,68,103,13,ES_AUTOHSCROLL | WS_DISABLED
+    EDITTEXT        IDC_EDIT_PORT,158,86,29,13,ES_AUTOHSCROLL | WS_DISABLED
+    EDITTEXT        IDC_EDIT_SUFFIX,158,140,103,13,ES_AUTOHSCROLL | 
+                    WS_DISABLED
+    EDITTEXT        IDC_EDIT_BIND_AS,158,104,103,13,ES_AUTOHSCROLL | 
+                    WS_DISABLED
+    EDITTEXT        IDC_EDIT_PW,158,122,103,13,ES_PASSWORD | ES_AUTOHSCROLL | 
+                    WS_DISABLED
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "Host:",IDC_STATIC_MCC_HOST,136,70,17,8
+    LTEXT           "Port:",IDC_STATIC_MCC_PORT,137,88,16,8
+    LTEXT           "Suffix:",IDC_STATIC_MCC_SUFFIX,130,142,23,8
+    LTEXT           "Bind As:",IDC_STATIC_MCC_BIND_AS,126,106,27,8
+    LTEXT           "Password:",IDC_STATIC_MCC_PW,117,124,36,8
+    GROUPBOX        "Configuration Directory Server",IDC_STATIC_SETTINGS,91,
+                    37,191,121
+    CONTROL         "This instance will be the configuration directory server",
+                    IDC_RADIO_USE_THIS_SERVER,"Button",BS_AUTORADIOBUTTON,97,
+                    47,184,10
+    CONTROL         "Use existing configuration directory server",
+                    IDC_RADIO_USE_EXISTING_SERVER,"Button",
+                    BS_AUTORADIOBUTTON,97,57,165,10
+    LTEXT           "Brandx server information is stored in the Brandx configuration directory server, which you may have already set up.  If so, you should configure this server to be managed by the configuration server.",
+                    IDC_STATIC_DESC,92,3,172,33
+END
+
+IDD_ROOTDN DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Directory Manager Settings"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    EDITTEXT        IDC_EDIT_UNRESTRICTED_USER,168,74,112,14,ES_AUTOHSCROLL
+    LTEXT           "Directory Manager DN:",IDC_STATIC_UNRESTRICTED_USER,88,
+                    74,73,8
+    LTEXT           "Password:",IDC_STATIC_PASSWORD,88,96,34,8
+    EDITTEXT        IDC_EDIT_PASSWORD,168,96,112,14,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,88,119,57,
+                    8
+    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,168,119,111,14,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    GROUPBOX        "Directory Manager Settings",
+                    IDC_STATIC_UNRESTRICTED_USER_GROUPBOX,84,58,203,84
+    LTEXT           "Certain directory server operations require an administrative user.  This user is referred to as the Directory Manager and typically has a bind Distinguished Name (DN) of cn=Directory Manager.",
+                    IDC_STATIC_DM_DESC,84,11,202,26
+    LTEXT           "The password for the Directory Manager must be at least 8 characters long.",
+                    IDC_STATIC,84,39,202,18
+END
+
+IDD_SUITESPOTID DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION 
+"Directory Server 7.0 Brandx configuration directory server administrator "
+
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    EDITTEXT        IDC_EDIT_SUITESPOT_USER,173,51,114,14,ES_AUTOHSCROLL
+    LTEXT           "Configuration Directory Administrator ID:",
+                    IDC_STATIC_SUITESPOT_USER,94,51,73,17
+    LTEXT           "Password:",IDC_STATIC_PASSWORD,94,74,34,8
+    EDITTEXT        IDC_EDIT_PASSWORD,173,74,114,14,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,94,97,57,8
+    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,173,97,114,14,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    GROUPBOX        "Configuration Directory Server Administrator ",
+                    IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,91
+    LTEXT           "The Brandx configuration directory administrator is the ID typically used to log in to the console.",
+                    IDC_STATIC_MCA_DESC,88,10,196,18
+END
+
+IDD_SERVER_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Server Settings"
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "General Settings",IDC_STATIC_GENERAL_SETTINGS,97,33,194,
+                    68
+    EDITTEXT        IDC_EDIT_SERVER_IDENTIFIER,175,46,105,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_SERVER_PORT,175,62,35,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_SUFFIX,175,78,105,12,ES_AUTOHSCROLL
+    CONTROL         "Spin1",IDC_SPIN_SERVER_PORT,"msctls_updown32",
+                    UDS_SETBUDDYINT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,209,62,
+                    10,12
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "Server Identifier:",IDC_STATIC_SERVER_IDENTIFIER,116,46,
+                    52,8
+    LTEXT           "Server Port: ",IDC_STATIC_SERVER_PORT,129,62,39,8
+    LTEXT           "Suffix: ",IDC_STATIC_SUFFIX,146,78,22,8
+    LTEXT           "Settings this directory server will use for basic operation.",
+                    IDC_STATIC_SERV_SETTINGS_DESC,103,20,180,10
+END
+
+IDD_SAMPLE_ENTRIES_ORG DIALOG DISCARDABLE  0, 0, 377, 179
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Populate Database"
+FONT 8, "MS Sans Serif"
+BEGIN
+    GROUPBOX        "Sample Organizational Structure",
+                    IDC_STATIC_DEFAULT_ORG_GROUP,89,5,285,50
+    CONTROL         "Install Sample Organizational Structure",
+                    IDC_CHECK_POPULATE_ORG_ENTRIES,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,104,41,146,10
+    GROUPBOX        "Populate Database",IDC_STATIC_SAMPLE_GROUP,89,64,285,95
+    CONTROL         "Don't Populate",IDC_RADIO_DONT_POPULATE,"Button",
+                    BS_AUTORADIOBUTTON | WS_GROUP,96,93,63,10
+    CONTROL         "Populate with sample database",
+                    IDC_RADIO_POPULATE_SAMPLE,"Button",BS_AUTORADIOBUTTON,96,
+                    102,114,11
+    CONTROL         "Populate with custom database",
+                    IDC_RADIO_POPULATE_CUSTOM,"Button",BS_AUTORADIOBUTTON,96,
+                    112,115,10
+    PUSHBUTTON      "Browse",IDC_BUTTON_CHOOSE_LDIF_FILE,96,130,51,14,
+                    WS_GROUP
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,176
+    LTEXT           "Populate the new directory server instance with some commonly used organizational entries, to provide some default structure to the directory.",
+                    IDC_STATIC_ORG_ENTRIES,96,15,180,26
+    LTEXT           "(must have base )",IDC_STATIC_MUST_HAVE_BASE,106,121,
+                    154,8
+    LTEXT           "File:",IDC_STATIC_FILE_NAME_COLON,96,146,15,10
+    LTEXT           "",IDC_STATIC_LDIF_FILE_NAME,96,146,188,9
+    LTEXT           "You may choose at this time to populate the database with an LDIF file or create a sample database.",
+                    IDC_STATIC,96,75,186,17
+END
+
+IDD_CONSUMER_REPLICATION_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Consumer Replication Settings"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "In order to allow remote servers to replicate new entries to this server, the remote server must have the ability to bind to this server as some entity with permission to do so.  ",
+                    IDC_STATIC_CIR_DESCRIPTION,93,7,186,24
+    LTEXT           "Supplier Bind DN:",IDC_STATIC_SUPPLIER_DN,97,80,71,8
+    LTEXT           "Supplier Password:",IDC_STATIC_SUPPLIER_PW,97,96,61,8
+    LTEXT           "Supplier Password (again):",IDC_STATIC_SUPPLIER_PW2,97,
+                    112,86,11
+    EDITTEXT        IDC_EDIT_SUPPLIER_DN,188,80,95,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PASSWORD,188,96,95,12,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,188,112,95,12,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    GROUPBOX        "Consumer Server Replication Settings",IDC_CONSUMER,90,
+                    62,201,66
+    LTEXT           "The Supplier DN is the DN of the entity the remote server will use to connect to this server to supply updates.",
+                    IDC_STATIC_CIR_DESCRIPTION2,93,36,186,16
+END
+
+IDD_SUPPLIER_REPLICATION_SETTINGS DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Supplier Replication Settings"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "Settings which configure this server to send replication updates to other servers.",
+                    IDC_STATIC_SIR_DESCRIPTION,91,13,186,17
+    LTEXT           "Changelog DB Directory:",IDC_STATIC_CHANGELOG_DB_DIR,91,
+                    55,79,8
+    LTEXT           "Changelog Suffix:",IDC_STATIC_CHANGELOG_SUFFIX,91,74,56,
+                    8
+    EDITTEXT        IDC_EDIT_CHANGELOG_DB_DIR,182,55,95,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_CHANGELOG_DB_SUFFIX,182,73,95,12,ES_AUTOHSCROLL
+    GROUPBOX        "Supplier Server Replication Settings",
+                    IDC_SIR_DESCRIPTION,83,40,201,55
+END
+
+IDD_CONSUMER_DN DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Consumer DN Settings "
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    EDITTEXT        IDC_EDIT_CONSUMER_DN,163,77,111,14,ES_AUTOHSCROLL
+    LTEXT           "Consumer Bind DN:",IDC_STATIC_CONSUMER_DN,90,77,67,8
+    LTEXT           "Password:",IDC_STATIC_CONSUMER_PW,90,100,36,8
+    EDITTEXT        IDC_EDIT_PASSWORD,163,100,111,14,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    LTEXT           "Password (again):",IDC_STATIC_PASSWORD_AGAIN,90,123,57,
+                    8
+    EDITTEXT        IDC_EDIT_PASSWORD_AGAIN,163,123,112,14,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    GROUPBOX        "Supplier CIR Replication Settings",
+                    IDC_STATIC_SUPPLIER_CIR,84,59,208,89
+    LTEXT           "Do you wish to create an entry which can be used by CIR Consumers to bind to this Supplier? \nNote: This user will have acess to the entire database as well as the changelog.",
+                    IDC_STATIC,84,5,206,32
+    CONTROL         "Yes",IDC_RADIO_CONFIG_CONSUMER_DN_YES,"Button",
+                    BS_AUTORADIOBUTTON,149,45,28,10
+    CONTROL         "No",IDC_RADIO_CONFIG_CONSUMER_DN_NO,"Button",
+                    BS_AUTORADIOBUTTON,181,45,25,10
+END
+
+IDD_REPLICATION_AGREEMENT DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Configure Replication Agreement"
+FONT 8, "MS Sans Serif"
+BEGIN
+    EDITTEXT        IDC_EDIT_HOST,159,13,80,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PORT,159,30,24,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_SUFFIX,159,48,80,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_BIND_AS,159,65,80,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PW,159,82,80,13,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "Host:",IDC_STATIC_REPLICATION_HOST,137,13,18,8
+    LTEXT           "Port:",IDC_STATIC_REPLICATION_PORT,139,30,16,8
+    LTEXT           "Root of Replication:",IDC_STATIC_REPLICATION_ROOT,91,48,
+                    64,8
+    LTEXT           "Bind As:",IDC_STATIC_REPLICATION_BIND_AS,128,65,27,8
+    LTEXT           "Password:",IDC_STATIC_REPLICATION_PW,119,82,34,8
+    GROUPBOX        "Replication Agreement",IDC_STATIC_REPLICATION_AGREEMENT,
+                    84,2,207,155
+    GROUPBOX        "Replication Days",IDC_STATIC_REPL_DAYS,90,93,197,22
+    CONTROL         "Sun",IDC_CHECK_SUN,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,92,102,25,10
+    CONTROL         "Mon",IDC_CHECK_MON,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,119,102,28,10
+    CONTROL         "Tue",IDC_CHECK_TUE,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,147,102,25,10
+    CONTROL         "Wed",IDC_CHECK_WED,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,173,102,27,10
+    CONTROL         "Thur",IDC_CHECK_THUR,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,201,102,27,10
+    CONTROL         "Fri",IDC_CHECK_FRI,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,229,102,25,10
+    CONTROL         "Sat",IDC_CHECK_SAT,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,254,102,25,10
+    GROUPBOX        "Replication Times",IDC_STATIC,89,117,83,37
+    LTEXT           "Start:",IDC_STATIC_REPL_START_TIME,95,126,16,8
+    EDITTEXT        IDC_EDIT_REPL_START_TIME_HH,113,126,15,12,ES_AUTOHSCROLL
+    LTEXT           "End:",IDC_STATIC_REPL_END_TIME,95,140,16,8
+    EDITTEXT        IDC_EDIT_REPL_END_TIME_HH,113,140,15,12,ES_AUTOHSCROLL
+    CONTROL         "Spin1",IDC_SPIN_REPL_START_TIME_MM,"msctls_updown32",
+                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,155,126,10,12
+    EDITTEXT        IDC_EDIT_REPL_SYNC_INTERVAL,238,126,25,12,ES_AUTOHSCROLL
+    LTEXT           "Replication Sync Interval(minutes)",
+                    IDC_STATIC_REPL_SYNC,182,126,55,17
+    CONTROL         "Spin1",IDC_SPIN_REPL_SYNC_INTERVAL,"msctls_updown32",
+                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,262,126,11,11
+    EDITTEXT        IDC_EDIT_REPL_START_TIME_MM,141,126,15,12,ES_AUTOHSCROLL
+    CONTROL         "Spin1",IDC_SPIN_REPL_START_TIME_HH,"msctls_updown32",
+                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,128,126,11,12
+    CONTROL         "Spin1",IDC_SPIN_REPL_END_TIME_HH,"msctls_updown32",
+                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,128,140,11,12
+    EDITTEXT        IDC_EDIT_REPL_END_TIME_MM,141,140,15,12,ES_AUTOHSCROLL
+    CONTROL         "Spin1",IDC_SPIN_REPL_END_TIME_MM,"msctls_updown32",
+                    UDS_WRAP | UDS_SETBUDDYINT | UDS_ARROWKEYS,155,140,11,12
+END
+
+IDD_CHOOSE_REPLICATION_SETUP DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Configure Server for Replication"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "A Consumer that will pull updates",
+                    IDC_RADIO_CONSUMER_CIR,"Button",BS_AUTORADIOBUTTON | 
+                    WS_GROUP,119,117,125,9
+    CONTROL         "A Consumer that will have updates",
+                    IDC_RADIO_CONSUMER_SIR,"Button",BS_AUTORADIOBUTTON,119,
+                    95,127,10
+    CONTROL         "Do not configure as a Consumer",
+                    IDC_RADIO_NO_CONSUMER_REPLICATION,"Button",
+                    BS_AUTORADIOBUTTON,119,138,113,10
+    CONTROL         "A Supplier that will have updates",
+                    IDC_RADIO_SUPPLIER_CIR,"Button",BS_AUTORADIOBUTTON | 
+                    WS_GROUP,118,42,122,10
+    CONTROL         "A Supplier that will push updates",
+                    IDC_RADIO_SUPPLIER_SIR,"Button",BS_AUTORADIOBUTTON,118,
+                    20,121,10
+    CONTROL         "Do not configure as as Supplier",
+                    IDC_RADIO_NO_SUPPLIER_REPLICATION,"Button",
+                    BS_AUTORADIOBUTTON,118,65,113,10
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "from another server (CIR)",
+                    IDC_STATIC_CONSUMER_CIR_EXTRA,132,126,80,8
+    LTEXT           "pushed to it from another server (SIR)",
+                    IDC_STATIC_CONSUMER_SIR_EXTRA,132,105,118,8
+    LTEXT           "pulled from it by another server (CIR)",
+                    IDC_STATIC_SUPPLIER_CIR_EXTRA,131,53,115,8
+    LTEXT           "to another server (SIR)",IDC_STATIC_SUPPLIER_SIR_EXTRA,
+                    131,31,72,8
+    GROUPBOX        "Consumer Replications Settings",
+                    IDC_STATIC_CONSUMER_REPL,113,84,144,68
+    GROUPBOX        "Supplier Replication Settings",
+                    IDC_STATIC_SUPPLIER_REPLICATION,112,9,145,71
+END
+
+IDD_DISABLE_SCHEMA_CHECKING DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Disable Schema Checking"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "If you are going to import an old database immediately after or during installation, and you think you may have problems with your old schema, you may wish to turn off schema checking until after the import.",
+                    IDC_STATIC_DISABLE_SCHEMA_TXT,95,37,188,34
+    LTEXT           "If you choose to do this, schema checking will remain off until you manually turn it back on.  It is recommended that you turn it back on as soon as possible.",
+                    IDC_STATIC_DISABLE_SCHEMA_TEXT_CONT,95,76,187,28
+    GROUPBOX        "Disable Schema Checking",
+                    IDC_STATIC_DISABLE_SCHEMA_CHECKING_GROUP,90,27,198,102
+    CONTROL         "Disable Schema Checking",
+                    IDC_CHECK_DISABLE_SCHEMA_CHECKING,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,95,111,99,10
+END
+
+IDD_ADMIN_DOMAIN DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Administration Domain"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "The Administration Domain is a part of the configuration directory server used to store information about Brandx software.",
+                    IDC_STATIC_ADMIN_DOMAIN_DESC,90,8,203,16
+    EDITTEXT        IDC_EDIT_ADMIN_DOMAIN,157,113,118,14,ES_AUTOHSCROLL
+    LTEXT           "Administration Domain:",IDC_STATIC_ADMIN_DOMAIN,104,113,
+                    51,16
+    GROUPBOX        "Administration Domain Settings",
+                    IDC_STATIC_ADMIN_DOMAIN_GB,90,99,187,40
+    LTEXT           "If you are managing multiple software releases at the same time, or managing information about multiple domains, you may use the the Administration Domain to keep them separate.",
+                    IDC_STATIC_ADMIN_DOMAIN_DESC2,90,29,197,25
+    LTEXT           "If you are not using administrative domains, select the default.  Otherwise, enter a descriptive, unique name for the administration domain, such as the name of the organization responsible for managing the domain.",
+                    IDC_STATIC_ADMIN_DOMAIN_DESC3,90,58,197,33
+END
+
+IDD_REINSTALL_CONFIG DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Directory Server 7.1 Reinstall Settings"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    LTEXT           "Setup has detected that you are reinstalling into an existing server root. ",
+                    IDC_STATIC_ADMIN_REINSTALL_DESC,90,8,203,16
+    LTEXT           "config url is displayed here",IDC_CONFIG_URL_VAL,96,52,
+                    184,8
+    LTEXT           "Bind As:",IDC_STATIC_BIND_AS,96,67,27,8
+    EDITTEXT        IDC_EDIT_BIND_AS,145,65,132,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC_PW,96,88,34,8
+    EDITTEXT        IDC_EDIT_PW,145,87,132,14,ES_PASSWORD | ES_AUTOHSCROLL
+    GROUPBOX        "Configuration Directory",IDC_STATIC_CONFIG_DIR_SETTING,
+                    87,36,206,89
+END
+
+IDD_UNINSTALL_STATUS DIALOG DISCARDABLE  0, 0, 291, 72
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+FONT 8, "MS Sans Serif"
+BEGIN
+    CTEXT           "",IDC_STOPPING_SERVER_MESSAGE,10,29,270,13,
+                    SS_CENTERIMAGE
+END
+
+IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE  0, 0, 297, 163
+STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION 
+"Directory Server 7.0 Brandx configuration directory server administrator "
+
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         102,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,0,0,85,160
+    EDITTEXT        IDC_EDIT_SUITESPOT_USER,173,51,114,14,ES_AUTOHSCROLL
+    LTEXT           "Configuration Directory Administrator ID:",
+                    IDC_STATIC_SUITESPOT_USER,94,51,73,17
+    LTEXT           "Password:",IDC_STATIC_PASSWORD,94,74,34,8
+    EDITTEXT        IDC_EDIT_PASSWORD,173,74,114,14,ES_PASSWORD | 
+                    ES_AUTOHSCROLL
+    GROUPBOX        "Configuration Directory Server Administrator ",
+                    IDC_STATIC_SUITESPOT_ADMIN_GROUPBOX,88,35,204,61
+    LTEXT           "The Brandx configuration directory administrator is the ID typically used to log in to the console.",
+                    IDC_STATIC_MCA_DESC,88,10,196,18
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_SAMPLE_ENTRIES_ORG, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 176
+    END
+
+    IDD_REPLICATION_AGREEMENT, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 160
+    END
+
+    IDD_CHOOSE_REPLICATION_SETUP, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 160
+    END
+
+    IDD_UNINSTALL_STATUS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 284
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 65
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_WIZARD              BITMAP  DISCARDABLE     "wizard.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ERR_NO_WINSOCK          "Cant find usable winsock DLL > 2.0"
+    ERR_NO_WINSOCK_VER      "Cant find usable winsock DLL > 2.0"
+    ERR_NO_HOST             "You must enter a Host."
+    ERR_NO_PORT             "You must enter a Port."
+    ERR_NO_SUFFIX           "You must enter a suffix."
+    ERR_NO_BIND_DN          "You must enter a Bind DN."
+    ERR_NO_PW               "You must enter a password."
+    ERR_INIT_DIALOG         "Fatal Error Initializing Dialog"
+    ERR_NO_SERVER_ID        "You must enter a Server Identifier."
+    ERR_SERVER_ID_EXISTS    "A server already exists with the identifier %s. Choose a unique identifier."
+    ERR_INVALID_PORT        "The server port %d is invalid.  Please choose another one."
+    ERR_PW_TOO_SHORT        "You must enter a password of at least %d characters."
+    ERR_NO_PW_AGAIN         "You must enter password again to confirm."
+    ERR_PW_DIFFER           "Passwords differ, try again."
+    ERR_NO_ROOT_DN          "You must enter an unrestricted user."
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ERR_NO_SS_ADMIN         "You must enter a Configuration Administrator."
+    ERR_NO_SUPPLIER_DN      "You must enter a Supplier DN."
+    ERR_NO_CHANGELOG_DB     "You must enter a Changelog DB."
+    ERR_NO_CHANGELOG_SUFFIX "You must enter a Changelog Suffix."
+    ERR_NO_CONSUMER_DN      "You must enter a consumer bind dn."
+    ERR_READ_GLOBAL_CACHE   "Error Reading Global Cache: Invalid %s"
+    ERR_READ_LOCAL_CACHE    "Error Reading Local Cache: Invalid %s"
+    ERR_NO_FIND_INST_PROG   "Could not find program %s: %s"
+    ERR_EXEC_INST_PROG      "Error executing program %s: %s\nPlease refer to the log file %s for more information."
+    ERR_NO_STAT_TMP_FILE    "Could not stat the temp file %s: %s"
+    ERR_NO_CREATE_FILE      "Could not create file %s"
+    ERR_CREATE_MCC_BAT      "Fatal Error Creating Directory Server Mcc"
+    ERR_CREATE_DS_INSTANCE  "Fatal Error Creating Directory Server Instance"
+    ERR_REMOVE_EVLOG_KEY    "Error Removing Directory Server EventLog Key"
+    ERR_REMOVE_INSTANCE     "Error: unable to remove server instance: %s."
+    ERR_REM_INST_REG_KEYS   "Error: unable to remove registry keys for server %s."
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ERR_SERV_RUN_ON_PORT    "You have another server running on port %d. Turn off that server before continuing with installation."
+    ERR_INVALID_HOST        "The hostname %s could not be verified.  Please enter another hostname."
+    ERR_CANT_FIND_DS        "Could not connect to ldap://%s:%d/ for bind DN %s\nPlease check your settings.  Otherwise, the remote server may be down at this time.\nThe installation cannot proceed."
+    ERR_SNMP_IS_RUNNING     "The SNMP Service is running. It will be turned off automatically and restarted when this operation is complete if you choose to continue."
+    ERR_SNMP_BAD_SHUTDOWN   "Error stopping the SNMP Service. Setup can not continue"
+    ERR_SNMP_BAD_STARTUP    "Error starting the SNMP Service"
+    ERR_SLAPD_SHUTDOWN      "Unable to shutdown the Directory Server (%s).\nWarning, all files and registry keys may not be removed.\nWould you like to continue uninstalling?"
+    ERR_UNK_INST_CREATE     "An unknown error occured while executing program %s.\nPlease refer to the log file %s for more information."
+    IDS_UG_DESC             "You may already have a directory server you want to use to store your data, such as user and group information."
+    IDS_UG_GB_DESC          "Directory to store data"
+    IDS_UG_RADIO_EXIST      "Store data in an existing directory server"
+    IDS_UG_RADIO_CREATE     "Store data in this directory server"
+    IDS_UG_DLG_CAPTION      " "
+    ERR_NO_ADMIN_DOMAIN     "You must enter an Admin Domain."
+    ERR_8BIT_PW             "Passwords must contain 7 bit characters only."
+    ERR_8BIT_SERVID         "Server identifiers must contain 7 bit characters only."
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ERR_8BIT_PATH           "Paths must contain 7 bit characters only."
+    SUM_DS_SET_TITLE        "Directory Server Settings"
+    SUM_SERVER_IDENTIFIER   "Server Identifier"
+    SUM_SUFFIX              "Suffix"
+    SUM_PORT                "Port"
+    SUM_CONFIG_DS_TITLE     "Configuration Directory Server Settings"
+    SUM_HOST                "Host"
+    SUM_BIND_AS             "Bind As"
+    SUM_DATA_DS_TITLE       "Data Directory Server Settings"
+    SUM_CFG_ADM_ID          "Configuration Directory Administrator ID"
+    SUM_ADMIN_DOMAIN        "Administration Domain"
+    SUM_DIRECTORY_MANAGER   "Directory Manager DN"
+    SUM_SUPPLIER_REPL_TITLE "Supplier Replication Settings"
+    SUM_CHANGELOG_DB_DIR    "Changelog DB Directory"
+    SUM_CHANGELOG_SUFFIX    "Changelog Suffix"
+    SUM_REPL_AGR_TITLE      "Replication Agreement"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    SUM_REPL_ROOT           "Root of Replication"
+    SUM_REPL_DAYS           "Replication Days"
+    SUM_REPL_TIMES          "Replication Times"
+    SUM_CONSUMER_BIND_DN    "Consumer Bind DN"
+    SUM_CONSUMER_REPL_TITLE "Consumer Replication Settings"
+    SUM_SUPPLIER_DN         "Supplier Bind DN"
+    SUM_REPL_SYNC_INTERVAL  "Replication Sync Interval"
+    SUM_POP_ORG_STRUCT      "Install Sample Organizational Structure"
+    SUM_POP_DB_FILE         "Populate Database with"
+    SUM_DISABLE_SCHEMA_CHECKING "Disable Schema Checking"
+    ERR_INVALID_DN          "%s is not a valid DN."
+    SUM_REINSTALL           "Files will be updated, no configuration changes."
+    ERR_CANT_FIND_DS_REPL   "Could not connect to ldap://%s:%d/ for bind DN %s Please check your settings.  Otherwise, the remote server may be down at this time. You may need to manually start replication after installation. Would you like to continue using these settings?"
+    IDS_STARTING_SERVICE    "Starting Brandx Directory Server (%s)"
+    IDS_STOPPING_SERVICE    "Stopping Brandx Directory Server (%s)"
+    IDS_WAIT_SERVICE_START  "Waiting for Brandx Directory Server (%s) to start"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_WAIT_SERVICE_STOP   "Waiting for Brandx Directory Server (%s) to stop"
+    ERR_ADMIN_DOMAIN_DN     "A DN [%s] is not allowed here.  Please enter a valid string."
+    ERR_CANT_FIND_ADMIN_DOMAIN 
+                            "Could not find the Admin Domain %s in ldap://%s:%d/ for bind DN %s\nPlease check your settings.  You may need to install using Custom mode in order to specify the Admin domain.\nThe installation cannot proceed."
+    WARN_USING_LDAPV2_QUOTES 
+                            "The given value [%s] is quoted in the deprecated LDAPv2 style\nquoting format.  It will be automatically converted to use the\nLDAPv3 style escaped format [%s]."
+    ERR_8BIT_UID            "The UID value must contain 7 bit characters only."
+    ERR_SERVER_ID_EXISTS_TITLE "Directory Server (%s) Already Exists"
+    ERR_NO_CONFIG_URL       "The Config Directory URL could not be found."
+    WARN_USING_LDAPV2_QUOTES_TITLE "Warning: Deprecated Quoting Style [%s]"
+    ERR_INVALID_DN_TITLE    "Invalid DN: %s"
+    ERR_NO_WINSOCK_TITLE    "Could Not Find Winsock"
+    ERR_NO_WINSOCK_VER_TITLE "Invalid Winsock Version"
+    ERR_8BIT_SERVID_TITLE   "Invalid Server ID"
+    ERR_SERV_RUN_ON_PORT_TITLE "Port Is In Use"
+    ERR_INIT_DIALOG_TITLE   "Could Not Initialize Dialog"
+    ERR_NO_HOST_TITLE       "Host Required"
+    ERR_NO_PORT_TITLE       "Port Required"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ERR_NO_SUFFIX_TITLE     "Suffix Required"
+    ERR_NO_BIND_DN_TITLE    "Bind DN Required"
+    ERR_NO_PW_TITLE         "Password Required"
+    ERR_NO_SERVER_ID_TITLE  "Server ID Required"
+    ERR_INVALID_PORT_TITLE  "Port Is Invalid"
+    ERR_PW_TOO_SHORT_TITLE  "Password Length Too Short"
+    ERR_NO_PW_AGAIN_TITLE   "Enter Password Again"
+    ERR_PW_DIFFER_TITLE     "Passwords Are Different"
+    ERR_NO_ROOT_DN_TITLE    "Root DN Required"
+    ERR_NO_SS_ADMIN_TITLE   "Configuration Administrator Required"
+    ERR_NO_SUPPLIER_DN_TITLE "Supplier DN Required"
+    ERR_NO_CHANGELOG_DB_TITLE "Changelog DB Required"
+    ERR_NO_CHANGELOG_SUFFIX_TITLE "Changelog Suffix Required"
+    ERR_NO_CONSUMER_DN_TITLE "Consumer DN Required"
+    ERR_NO_FIND_INST_PROG_TITLE "Program Not Found"
+    ERR_EXEC_INST_PROG_TITLE "Could Not Execute Program"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ERR_NO_STAT_TMP_FILE_TITLE "File Not Found"
+    ERR_NO_CREATE_FILE_TITLE "Could Not Create File"
+    ERR_CREATE_MCC_BAT_TITLE "Could Not Create Script File"
+    ERR_CREATE_DS_INSTANCE_TITLE "Could Not Create Directory Server Instance"
+    ERR_REMOVE_EVLOG_KEY_TITLE "Could Not Remove EVLOG Key"
+    ERR_REMOVE_INSTANCE_TITLE "Could Not Remove Directory Server Instance"
+    ERR_REM_INST_REG_KEYS_TITLE "Could Not Remove Registry Keys"
+    ERR_INVALID_HOST_TITLE  "Invalid Host: %s"
+    ERR_CANT_FIND_DS_TITLE  "Could Not Contact Directory Server"
+    ERR_SNMP_IS_RUNNING_TITLE "SNMP Is Running"
+    ERR_SNMP_BAD_SHUTDOWN_TITLE "Error Shutting Down SNMP"
+    ERR_SNMP_BAD_STARTUP_TITLE "Could Not Start SNMP"
+    ERR_SLAPD_SHUTDOWN_TITLE "Error Shutting Down Directory Server (%s)"
+    ERR_NO_ADMIN_DOMAIN_TITLE "Admin Domain Required"
+    ERR_8BIT_PW_TITLE       "Invalid Password"
+    ERR_8BIT_PATH_TITLE     "Invalid Path"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ERR_CANT_FIND_DS_REPL_TITLE "Could Not Connect To Replication Server"
+    ERR_ADMIN_DOMAIN_DN_TITLE "Invalid Admin Domain %s"
+    ERR_CANT_FIND_ADMIN_DOMAIN_TITLE "Admin Domain %s Not Found"
+    ERR_8BIT_UID_TITLE      "Invalid User ID Value"
+    ERR_NO_CONFIG_URL_TITLE "Configuration Directory Information Not Found"
+    ERR_NO_USER_URL         "The information about the User Directory could not be found."
+    ERR_NO_USER_URL_TITLE   "Could Nof Find User Directory Information"
+    ERR_UNINSTALL_DS        "Could not uninstall Directory Server.  Please check the log file\n%s for problems,\ncorrect them, and uninstall again.  Exiting."
+    ERR_UNINSTALL_DS_TITLE  "Could not uninstall Directory Server"
+    ERR_REG_DEL_KEY_TITLE   "Could Not Delete Registry Key"
+    ERR_REG_DEL_KEY         "Could not delete the registry key %s - error %d (%s)."
+    ERR_REG_CREATE_KEY_TITLE "Could not Create Registry Key"
+    ERR_REG_CREATE_KEY      "Could not create the registry key %s - error %d (%s)."
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/ldap/cm/newinstnt/setup.inf b/ldap/cm/newinstnt/setup.inf
index 52430144..6f3bfb64 100644
--- a/ldap/cm/newinstnt/setup.inf
+++ b/ldap/cm/newinstnt/setup.inf
@@ -13,9 +13,9 @@
 # does note exist the setup program will ignore the component
 
 [General]
-Name         =      Netscape Server Family
-Vendor       =      Netscape Communications Corp.
-Description  =      Netscape Server Family
+Name         =      Brandx Server Family
+Vendor       =      Brandx, Inc.
+Description  =      Brandx Server Family
 Version      =      %%%SERVER_VERSION%%%
 Components   =      svrcore, base, admin, slapd, dssynch, msg, mcc
 
diff --git a/ldap/cm/newinstnt/slapd.inf b/ldap/cm/newinstnt/slapd.inf
index c9233bc2..0bb48c4b 100644
--- a/ldap/cm/newinstnt/slapd.inf
+++ b/ldap/cm/newinstnt/slapd.inf
@@ -6,13 +6,13 @@
 # END COPYRIGHT BLOCK
 #
 [General]
-Name=Netscape Directory Suite
+Name=Brandx Directory Suite
 Components=slapd,slapd-client
 Checked=TRUE
-Description=Netscape Directory Server
+Description=Brandx Directory Server
 
 [slapd]
-Name=Netscape Directory Server
+Name=Brandx Directory Server
 InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
 NickName=slapd
 Version= %%%SERVER_VERSION%%%
@@ -20,8 +20,8 @@ Compatible= %%%SERVER_VERSION%%%
 BuildNumber= %%%SERVER_BUILD_NUM%%%
 Expires= %%%PUMPKIN_HOUR%%%
 Security= %%%SECURITY%%%
-Vendor=Netscape Communications Corp.
-Description=Netscape Directory Server
+Vendor=Brandx, Inc.
+Description=Brandx Directory Server
 DefaultAcceptLanguage=en
 Dependencies=admin/4.5,nsperl561/1.10,perldap14/1.01
 Revision= 
@@ -48,8 +48,8 @@ NSPerlPostInstall=lib\nsPerl5.6.1\install.bat
 [slapd-client]
 NickName=slapd-client
 Dependencies=base-client/4.5
-Name=Netscape Directory Server Console
-Description=Netscape Directory Server Console
+Name=Brandx Directory Server
+Description=Brandx Directory Server
 Version= %%%SERVER_VERSION%%%
 Compatible= %%%SERVER_VERSION%%%
 BuildNumber= %%%SERVER_BUILD_NUM%%%
diff --git a/ldap/include/dirlite_strings.h b/ldap/include/dirlite_strings.h
index 8cc36920..96c211bf 100644
--- a/ldap/include/dirlite_strings.h
+++ b/ldap/include/dirlite_strings.h
@@ -33,7 +33,7 @@
 #define LITE_PW_EXP_ERR "Error: password policy is disabled in the " LITE_PRODUCT_NAME ", pw_exp " LITE_GENERIC_ERR
 
 /* all plugins which need to be used for Directory Lite must use this as their vendor string */
-#define PLUGIN_MAGIC_VENDOR_STR "Netscape Communications Corp."
+#define PLUGIN_MAGIC_VENDOR_STR "Brandx, Inc."
 
 /* plugins which contain this substring in their pluginid will not be aprroved in DS Lite */
 #define LITE_NTSYNCH_PLUGIN_ID_SUBSTR "nt-sync"
diff --git a/ldap/include/ntslapdregparms.h b/ldap/include/ntslapdregparms.h
index ea1ff559..8f235032 100644
--- a/ldap/include/ntslapdregparms.h
+++ b/ldap/include/ntslapdregparms.h
@@ -16,8 +16,8 @@
 #define	_NTSLAPDREGPARMS_H_
 
 #define COMPANY_KEY "SOFTWARE\\Netscape"
-#define COMPANY_NAME		"Netscape Communications Corp."
-#define PROGRAM_GROUP_NAME	"Netscape"
+#define COMPANY_NAME		"Brandx, Inc."
+#define PROGRAM_GROUP_NAME	"Brandx"
 #define PRODUCT_NAME		"slapd"
 #define PRODUCT_BIN			"ns-slapd"
 #define SLAPD_EXE		    "slapd.exe"
@@ -27,8 +27,8 @@
 #define SLAPD_DONGLE_FILE	"password.dng"
 #define DONGLE_FILE_NAME	SLAPD_DONGLE_FILE
 #define PRODUCT_VERSION		"1.0"
-#define EVENTLOG_APPNAME	"NetscapeSlapd"
-#define DIRECTORY_SERVICE_PREFIX	"Netscape Directory Server "
+#define EVENTLOG_APPNAME	"BrandxSlapd"
+#define DIRECTORY_SERVICE_PREFIX	"Brandx Directory Server "
 #define SERVICE_PREFIX		DIRECTORY_SERVICE_PREFIX
 #define CONFIG_PATH_KEY		"ConfigurationPath"
 #define EVENTLOG_MESSAGES_KEY "EventMessageFile"
diff --git a/ldap/ldif/Example-roles.ldif b/ldap/ldif/Example-roles.ldif
index 94f4904a..e6543819 100644
--- a/ldap/ldif/Example-roles.ldif
+++ b/ldap/ldif/Example-roles.ldif
@@ -2988,8 +2988,8 @@ objectclass: nsManagedRoleDefinition
 cn: PD Managers
 description: People who can manage engineer entries
 
-dn: ou=Netscape Servers,dc=example,dc=com
+dn: ou=Brandx Servers,dc=example,dc=com
 objectclass: top
 objectclass: organizationalUnit
-ou: Netscape Servers
-description: Standard branch for Netscape Server registration
+ou: Brandx Servers
+description: Standard branch for Brandx Server registration
diff --git a/ldap/ldif/Example.ldif b/ldap/ldif/Example.ldif
index 71196a06..e6b3db21 100644
--- a/ldap/ldif/Example.ldif
+++ b/ldap/ldif/Example.ldif
@@ -2974,8 +2974,8 @@ uniquemember: uid=kwinters, ou=People, dc=example,dc=com
 uniquemember: uid=trigden, ou=People, dc=example,dc=com
 description: People who can manage engineer entries
 
-dn: ou=Netscape Servers,dc=example,dc=com
+dn: ou=Brandx Servers,dc=example,dc=com
 objectclass: top
 objectclass: organizationalUnit
-ou: Netscape Servers
-description: Standard branch for Netscape Server registration
+ou: Brandx Servers
+description: Standard branch for Brandx Server registration
diff --git a/ldap/ldif/roledit.ldif b/ldap/ldif/roledit.ldif
index 0d8051e2..f7afdc90 100644
--- a/ldap/ldif/roledit.ldif
+++ b/ldap/ldif/roledit.ldif
@@ -32,9 +32,9 @@ objectclass: top
 objectclass: extensibleObject
 objectclass: nsResourceRef
 objectclass: nsAdminResourceEditorExtension
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@ds70.jar
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@ds70.jar
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@ds70.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@ds71.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@ds71.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@ds71.jar
 nsmerge: {nsclassname}MULTI_MERGE
 
 dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=4.0, ou=Admin, ou=Global Preferences
@@ -43,8 +43,8 @@ objectclass: top
 objectclass: extensibleObject
 objectclass: nsResourceRef
 objectclass: nsAdminResourceEditorExtension
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@ds70.jar
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@ds70.jar
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@ds70.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@ds71.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@ds71.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@ds71.jar
 nsmerge: {nsclassname}MULTI_MERGE
 
diff --git a/ldap/ldif/tasks.ldif b/ldap/ldif/tasks.ldif
index 0c0dd979..c83b5a29 100644
--- a/ldap/ldif/tasks.ldif
+++ b/ldap/ldif/tasks.ldif
@@ -30,60 +30,60 @@ dn: cn=start, cn=Operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Start@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.Start@ds71.jar
 nsexecref: start
 
 dn: cn=stop, cn=Operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Stop@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.Stop@ds71.jar
 nsexecref: shutdown
 
 dn: cn=restart, cn=Operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Restart@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.Restart@ds71.jar
 nsexecref: restart
 
 dn: cn=Backup, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Backup@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.Backup@ds71.jar
 nsexecref: ds_db2bak
 
 dn: cn=Restore, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Restore@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.Restore@ds71.jar
 nsexecref: ds_bak2db
 
 dn: cn=KeyCert, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.KeyCert@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.KeyCert@ds71.jar
 
 dn: cn=Authenticate, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Authenticate@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.Authenticate@ds71.jar
 
 dn: cn=CompleteImport, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.CompleteImport@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.CompleteImport@ds71.jar
 
 dn: cn=CompleteExport, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.CompleteExport@ds70.jar
+nsClassname: com.netscape.admin.dirserv.task.CompleteExport@ds71.jar
 
 dn: cn=Export, cn=operation, cn=Tasks
 objectclass: top
diff --git a/ldap/nsldap.mk b/ldap/nsldap.mk
index 7c19f73c..144aa978 100644
--- a/ldap/nsldap.mk
+++ b/ldap/nsldap.mk
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 #
-# nsldap.mk: GNU Makefile for common defs used in Netscape Directory Server 
+# nsldap.mk: GNU Makefile for common defs used in Brandx Directory Server 
 #	and related tools.
 # 									
 
diff --git a/ldap/schema/ns-calendar-globopt.conf b/ldap/schema/ns-calendar-globopt.conf
index 0bdb7dd9..a6bca0ad 100644
--- a/ldap/schema/ns-calendar-globopt.conf
+++ b/ldap/schema/ns-calendar-globopt.conf
@@ -5,6 +5,6 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Directory Server
+# Used by Brandx Directory Server
 
 index   nsCalXItemId    pres,eq,sub
diff --git a/ldap/schema/ns-compass-globopt.conf b/ldap/schema/ns-compass-globopt.conf
index 4d2e1e21..99c5ccbf 100644
--- a/ldap/schema/ns-compass-globopt.conf
+++ b/ldap/schema/ns-compass-globopt.conf
@@ -5,7 +5,7 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Directory Server
+# Used by Brandx Directory Server
 index	pipuid			pres,eq,sub
 index	pipstatus		eq
 
diff --git a/ldap/schema/ns-directory-globopt.conf b/ldap/schema/ns-directory-globopt.conf
index 65ba5064..90121aed 100644
--- a/ldap/schema/ns-directory-globopt.conf
+++ b/ldap/schema/ns-directory-globopt.conf
@@ -5,5 +5,5 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Directory Server
+# Used by Brandx Directory Server
 
diff --git a/ldap/schema/ns-mail-globopt.conf b/ldap/schema/ns-mail-globopt.conf
index 2e6cac65..7318651e 100644
--- a/ldap/schema/ns-mail-globopt.conf
+++ b/ldap/schema/ns-mail-globopt.conf
@@ -5,7 +5,7 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Messaging Server
+# Used by Brandx Messaging Server
 index	mailAlternateAddress	eq
 index	mailHost	eq
 #index	uid,mail	eq
diff --git a/ldap/schema/ns-media-globopt.conf b/ldap/schema/ns-media-globopt.conf
index 65ba5064..90121aed 100644
--- a/ldap/schema/ns-media-globopt.conf
+++ b/ldap/schema/ns-media-globopt.conf
@@ -5,5 +5,5 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Directory Server
+# Used by Brandx Directory Server
 
diff --git a/ldap/schema/ns-proxy-globopt.conf b/ldap/schema/ns-proxy-globopt.conf
index 65ba5064..90121aed 100644
--- a/ldap/schema/ns-proxy-globopt.conf
+++ b/ldap/schema/ns-proxy-globopt.conf
@@ -5,5 +5,5 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Directory Server
+# Used by Brandx Directory Server
 
diff --git a/ldap/schema/ns-wcal-globopt.conf b/ldap/schema/ns-wcal-globopt.conf
index 57a3183e..d6a035d8 100644
--- a/ldap/schema/ns-wcal-globopt.conf
+++ b/ldap/schema/ns-wcal-globopt.conf
@@ -5,6 +5,6 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-#used by Netscape Calendar Hosting Server
+#used by Brandx Calendar Hosting Server
 
 index nswcalCALID pres,eq
diff --git a/ldap/schema/ns-web-globopt.conf b/ldap/schema/ns-web-globopt.conf
index 6c18733f..14c8f2ff 100644
--- a/ldap/schema/ns-web-globopt.conf
+++ b/ldap/schema/ns-web-globopt.conf
@@ -5,6 +5,6 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Web Server
+# Used by Brandx Web Server
 #index	uniquemember,member	eq
 
diff --git a/ldap/schema/slapd-collations.conf b/ldap/schema/slapd-collations.conf
index 7cfcb22f..cba57648 100644
--- a/ldap/schema/slapd-collations.conf
+++ b/ldap/schema/slapd-collations.conf
@@ -5,7 +5,7 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Netscape Directory Server
+# Used by Brandx Directory Server
 #######################################################################
 # Collations
 #######################################################################
diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def
index 947638cd..08b38c64 100644
--- a/ldap/servers/plugins/acl/libacl.def
+++ b/ldap/servers/plugins/acl/libacl.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Netscape Directory Server 7.0 ACL Plugin'
+DESCRIPTION     'Brandx Directory Server 7.1 ACL Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def
index 71fe8482..9b82ad38 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Netscape Directory Server 7 Chaining Database Plugin'
+DESCRIPTION     'Brandx Directory Server 7 Chaining Database Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def
index bd5d531b..02733ec8 100644
--- a/ldap/servers/plugins/collation/collation.def
+++ b/ldap/servers/plugins/collation/collation.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 7 Collation Plugin'
+DESCRIPTION     'Brandx Directory Server 7 Collation Plugin'
 EXPORTS
 	orderingRule_init	@2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def
index 484d9c6a..e1b6551a 100644
--- a/ldap/servers/plugins/cos/cos.def
+++ b/ldap/servers/plugins/cos/cos.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 7 Class Of Service Plugin'
+DESCRIPTION     'Brandx Directory Server 7 Class Of Service Plugin'
 EXPORTS
 	cos_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README
index 3ee6ff88..516d33ce 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/README
@@ -4,7 +4,7 @@
                    ----------------------------
 
 This directory contains code for some sample server plug-ins intended for
-use with the Netscape Directory Server 7.  
+use with the Brandx Directory Server 7.  
 
     NOTE: Before you compile and run these examples, make sure 
     to change any server-specific data in the examples to  
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index baef2027..9c36e66d 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -4,7 +4,7 @@
 ; Some preexisting portions Copyright 2001 Netscape Communications Corp.
 ; All rights reserved.
 ;-------------------------------------------------------------------------
-DESCRIPTION 	'Netscape Directory Server 7 distribution logic example'
+DESCRIPTION 	'Brandx Directory Server 7 distribution logic example'
 EXPORTS
 	alpha_distribution @1
 	hash_distribution @2
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index b08d907a..f1b04c7e 100644
--- a/ldap/servers/plugins/passthru/libpassthru.def
+++ b/ldap/servers/plugins/passthru/libpassthru.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Netscape Directory Server 7 Pass Through Authentication Plugin'
+DESCRIPTION     'Brandx Directory Server 7 Pass Through Authentication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index e19305d5..846905d2 100644
--- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def
+++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION		'Netscape Directory Server 7 password storage scheme Plugin'
+DESCRIPTION		'Brandx Directory Server 7 password storage scheme Plugin'
 EXPORTS
 	sha_pwd_storage_scheme_init @2
 	ssha_pwd_storage_scheme_init @3
diff --git a/ldap/servers/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def
index 75861791..3dcd618a 100644
--- a/ldap/servers/plugins/referint/referint.def
+++ b/ldap/servers/plugins/referint/referint.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 7 Referint Plugin'
+DESCRIPTION     'Brandx Directory Server 7 Referint Plugin'
 CODE            SHARED READ EXECUTE
 DATA            SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/replication/replication.def b/ldap/servers/plugins/replication/replication.def
index e71be4f6..739b49cf 100644
--- a/ldap/servers/plugins/replication/replication.def
+++ b/ldap/servers/plugins/replication/replication.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Netscape Directory Server 7.0 Replication Plugin'
+DESCRIPTION     'Brandx Directory Server 7.1 Replication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/retrocl/retrocl.def b/ldap/servers/plugins/retrocl/retrocl.def
index ce730c44..e8708361 100644
--- a/ldap/servers/plugins/retrocl/retrocl.def
+++ b/ldap/servers/plugins/retrocl/retrocl.def
@@ -6,7 +6,7 @@
 ;
 ;
 
-DESCRIPTION     'Netscape Directory Server 7.0 Retro-Changelog Plugin'
+DESCRIPTION     'Brandx Directory Server 7.1 Retro-Changelog Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/roles/roles.def b/ldap/servers/plugins/roles/roles.def
index 0ae9d85f..a124811a 100644
--- a/ldap/servers/plugins/roles/roles.def
+++ b/ldap/servers/plugins/roles/roles.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 7.0 Roles Plugin'
+DESCRIPTION     'Brandx Directory Server 7.1 Roles Plugin'
 EXPORTS
 	roles_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/statechange/statechange.def b/ldap/servers/plugins/statechange/statechange.def
index ed6dca6b..601f0b90 100644
--- a/ldap/servers/plugins/statechange/statechange.def
+++ b/ldap/servers/plugins/statechange/statechange.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 7.0 State Change Plugin'
+DESCRIPTION     'Brandx Directory Server 7.1 State Change Plugin'
 EXPORTS
 	statechange_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def
index 30cb6b40..63397bc7 100644
--- a/ldap/servers/plugins/syntaxes/libsyntax.def
+++ b/ldap/servers/plugins/syntaxes/libsyntax.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Directory Server 7 syntaxes Plugin'
+DESCRIPTION     'Brandx Directory Server 7 syntaxes Plugin'
 EXPORTS
 	cis_init				@2
 	ces_init				@3
diff --git a/ldap/servers/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def
index 52bbfcca..41da527b 100644
--- a/ldap/servers/plugins/uiduniq/libuiduniq.def
+++ b/ldap/servers/plugins/uiduniq/libuiduniq.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Netscape Directory Server 7 Unique Attribute Checking Plugin'
+DESCRIPTION     'Brandx Directory Server 7 Unique Attribute Checking Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/views/views.def b/ldap/servers/plugins/views/views.def
index 26d28966..173f3124 100644
--- a/ldap/servers/plugins/views/views.def
+++ b/ldap/servers/plugins/views/views.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 7.0 State Change Plugin'
+DESCRIPTION     'Brandx Directory Server 7.1 State Change Plugin'
 EXPORTS
 	views_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/slapd/agtmmap.c b/ldap/servers/slapd/agtmmap.c
index 76abedeb..65fbbe4b 100644
--- a/ldap/servers/slapd/agtmmap.c
+++ b/ldap/servers/slapd/agtmmap.c
@@ -6,7 +6,7 @@
 /********************************************************************
  *
  *      agtmmap.c: Memory Map interface for SNMP sub-agent for 
- * 		   Netscape Directory Server stats (for UNIX environment).
+ * 		   Brandx Directory Server stats (for UNIX environment).
  *
  *      Revision History:
  *      07/22/97        Created                 Steve Ross
diff --git a/ldap/servers/slapd/agtmmap.h b/ldap/servers/slapd/agtmmap.h
index 7f7cbfc1..1a9cd6b7 100644
--- a/ldap/servers/slapd/agtmmap.h
+++ b/ldap/servers/slapd/agtmmap.h
@@ -7,7 +7,7 @@
 /********************************************************************
  *
  *      agtmmap.h: Memory Map interface for SNMP sub-agent for 
- *                 Netscape Directory Server stats (for UNIX environment).
+ *                 Brandx Directory Server stats (for UNIX environment).
  *
  *      Revision History:
  *      07/22/97        Created                 Steve Ross
diff --git a/ldap/servers/slapd/back-ldbm/init.c b/ldap/servers/slapd/back-ldbm/init.c
index a740ce76..cfb59871 100644
--- a/ldap/servers/slapd/back-ldbm/init.c
+++ b/ldap/servers/slapd/back-ldbm/init.c
@@ -239,7 +239,7 @@ add_ldbm_internal_attr_syntax( const char *name, const char *oid,
 	origins[1] = NULL;
 
 	rc = attr_syntax_create( oid, names, 1,
-			"Netscape defined attribute type",
+			"Brandx defined attribute type",
 			 NULL,						/* superior */
 			 mr_equality, NULL, NULL,	/* matching rules */
 			 origins, syntax,
diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def
index 072439a9..ce7da865 100644
--- a/ldap/servers/slapd/libslapd.def
+++ b/ldap/servers/slapd/libslapd.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Directory Server 7 Utility Library'
+DESCRIPTION     'Brandx Directory Server 7 Utility Library'
 EXPORTS
 	slapd_log_error_proc		@2
 	slapd_log_audit_proc		@3
diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
index 242df822..9189ca68 100644
--- a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
+++ b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
@@ -148,7 +148,7 @@ Severity=Success
 Facility=Startup
 SymbolicName=MSG_SERVER_STARTED
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server has successfully started.
 .
 MessageId=0x2
@@ -156,7 +156,7 @@ Severity=Success
 Facility=Slapd
 SymbolicName=MSG_SERVER_SHUTDOWN
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server has shutdown.
 .
 MessageId=0x3
@@ -164,7 +164,7 @@ Severity=Success
 Facility=Slapd
 SymbolicName=MSG_SERVER_STOPPED
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server has stopped.
 .
 MessageId=0x4
@@ -172,7 +172,7 @@ Severity=Success
 Facility=Startup
 SymbolicName=MSG_SERVER_STARTING
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server is starting.
 .
 MessageId=0x5
@@ -180,7 +180,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_START_FAILED
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server has failed on startup. %2
 .
 MessageId=0x6
@@ -188,7 +188,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_START_FAILED_CTRL_HANDLER
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server has failed on startup. Failed to Register with Service Control handler.
 .
 MessageId=0x7
@@ -196,7 +196,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_PASSWORD_DIALOG_FAILED
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server failed to create the Key Database Passphrase dialog.
 .
 MessageId=0x8
@@ -204,7 +204,7 @@ Severity=Error
 Facility=Registry
 SymbolicName=MSG_WD_REGISTRY
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 Could not open registry key: %2
 .
 MessageId=0x9
@@ -212,7 +212,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_BADCMDLINE
 Language=English
-Netscape Directory Server: %1
+Brandx Directory Server: %1
 Invalid command line specified: %2
 .
 MessageId=0xA
@@ -220,7 +220,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_BADPASSWORD
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 Incorrect SSL password entered.
 .
 MessageId=0xB
@@ -228,7 +228,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_STRING
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 %2
 .
 MessageId=0xC
@@ -236,7 +236,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_STARTFAILED
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server could not be started.
 Command line used: %2
 .
@@ -245,7 +245,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_RESTART
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server terminated abnormally with error code %2.
 An attempt will be made to restart it.
 .
@@ -254,7 +254,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_CRON_STARTFAILED
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The scheduled job (%2) could not be started.
 .
 MessageId=0xF
@@ -262,7 +262,7 @@ Severity=Error
 Facility=Slapd
 SymbolicName=MSG_SERVER_SHUTDOWN_STARTING
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The directory server is shutting down.
 .
 MessageId=0x10
@@ -270,7 +270,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_KEYDB_PASSPHRASE_WRONG
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 The specified key database passphrase is incorrect.
 .
 MessageId=0x11
@@ -278,6 +278,6 @@ Severity=Error
 Facility=Slapd
 SymbolicName=MSG_SERVER_FAILED_TO_WRITE_LOG
 Language=English
-Netscape Directory Server: %1.
+Brandx Directory Server: %1.
 Failed to write log: %2.
 .
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
index 82db3140..1b0d6263 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
@@ -13,8 +13,8 @@ symbolfile=nsldapctrdef.h
 009=English
 
 [text]
-NS_OBJ_009_NAME=Netscape Directory Server 7.0
-NS_OBJ_009_HELP=Netscape Directory Server
+NS_OBJ_009_NAME=Brandx Directory Server 7.1
+NS_OBJ_009_HELP=Brandx Directory Server
 CONN_RATE_009_NAME=Client Connections/sec
 CONN_RATE_009_HELP=Rate of incoming client connections
 THROUGHPUT_009_NAME=Server Network Throughput (bytes/sec)
diff --git a/ldap/servers/slapd/ntuserpin.c b/ldap/servers/slapd/ntuserpin.c
index 6e0de7d4..e183f8e6 100644
--- a/ldap/servers/slapd/ntuserpin.c
+++ b/ldap/servers/slapd/ntuserpin.c
@@ -105,7 +105,7 @@ static char *getPin(SVRCOREPinObj *obj, const char *tokenName, PRBool retry)
     	if (retry)
     	{
             MessageBox(GetDesktopWindow(), nt_retryWarning,
-                        "Netscape Server", MB_ICONEXCLAMATION | MB_OK);
+                        "Brandx Server", MB_ICONEXCLAMATION | MB_OK);
 	} else {
 	    if((cbRemotePassword != 0) && (szRemotePassword != 0))
 	    {
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 28663b6d..0172384b 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -156,8 +156,8 @@ typedef struct symbol_t {
 #define LDAP_CONTROL_GET_EFFECTIVE_RIGHTS "1.3.6.1.4.1.42.2.27.9.5.2"
 #endif
 
-#define SLAPD_VENDOR_NAME	"Netscape Communications Corp."
-#define SLAPD_VERSION_STR	"Netscape-Directory/" PRODUCTTEXT
+#define SLAPD_VENDOR_NAME	"Brandx, Inc."
+#define SLAPD_VERSION_STR	"Brandx-Directory/" PRODUCTTEXT
 #define SLAPD_SHORT_VERSION_STR	PRODUCTTEXT
 
 typedef void	(*VFP)(void *);
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 523805f0..d34085f9 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -32,7 +32,7 @@
 /* #define START_TLS_OID	"1.3.6.1.4.1.1466.20037" */
 
 
-Slapi_PluginDesc exopdesc = { "start_tls_plugin", "Netscape", "0.1",
+Slapi_PluginDesc exopdesc = { "start_tls_plugin", "Brandx", "0.1",
 	"Start TLS extended operation plugin" };
 
 
diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README
index ecdcac58..1faf1b05 100644
--- a/ldap/servers/slapd/test-plugins/README
+++ b/ldap/servers/slapd/test-plugins/README
@@ -11,7 +11,7 @@
                    ----------------------------
 
 This directory contains code for some sample server plug-ins intended for
-use with the Netscape Directory Server 7.  
+use with the Brandx Directory Server 7.  
 
     NOTE: Before you compile and run these examples, make sure 
     to change any server-specific data in the examples to  
diff --git a/ldap/servers/slapd/test-plugins/testplugin.def b/ldap/servers/slapd/test-plugins/testplugin.def
index b14c082e..38863078 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.def
+++ b/ldap/servers/slapd/test-plugins/testplugin.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION		'Netscape Directory Server 7 test plugin'
+DESCRIPTION		'Brandx Directory Server 7 test plugin'
 EXPORTS
 	testentry_scramble				@2
 	testentry_unscramble				@3
diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c
index 3d265f4d..5b8e5021 100644
--- a/ldap/servers/slapd/test-plugins/testsaslbind.c
+++ b/ldap/servers/slapd/test-plugins/testsaslbind.c
@@ -33,13 +33,13 @@ objectclass: top
 objectclass: nsSlapdPlugin
 objectclass: extensibleObject
 cn: test-saslbind
-nsslapd-pluginpath: /usr/netscape/servers/plugins/slapd/slapi/examples/libtest-plugin.so
+nsslapd-pluginpath: /usr/brandx/servers/plugins/slapd/slapi/examples/libtest-plugin.so
 nsslapd-plugininitfunc: testsasl_init
 nsslapd-plugintype: preoperation
 nsslapd-pluginenabled: on
 nsslapd-pluginid: test-saslbind
 nsslapd-pluginversion: 5.0
-nsslapd-pluginvendor: Netscape Communications Corp.
+nsslapd-pluginvendor: Brandx, Inc.
 nsslapd-plugindescription: sample SASL bind pre-operation plugin
 
 
@@ -48,7 +48,7 @@ nsslapd-plugindescription: sample SASL bind pre-operation plugin
 #include <string.h>
 #include "slapi-plugin.h"
 
-Slapi_PluginDesc saslpdesc = { "test-saslbind", "Netscape Communications Corp.", "7.0",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", "Brandx, Inc.", "7.1",
 	"sample SASL bind pre-operation plugin" };
 
 
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index 20949b8a..80f7dca6 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 #
-# 	Make file SNMP subagent for Netscape Directory Server
+# 	Make file SNMP subagent for Brandx Directory Server
 #
 #
 # 	Revision History:
diff --git a/ldap/servers/snmp/netscape-ldap.mib b/ldap/servers/snmp/netscape-ldap.mib
index 3e51839a..915b3a25 100644
--- a/ldap/servers/snmp/netscape-ldap.mib
+++ b/ldap/servers/snmp/netscape-ldap.mib
@@ -5,7 +5,7 @@
 -- END COPYRIGHT BLOCK
 --
 --
--- MIB for Netscape Directory Server 7 
+-- MIB for Brandx Directory Server 7 
 --
 -- This is an implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
 -- directories described in RFC 2788 and 2789
@@ -47,7 +47,7 @@ IMPORTS
             DESCRIPTION
                " An implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
 		 directories described in RFC 2788 and 2789
-                 used for Netscape Directory Server 7"
+                 used for Brandx Directory Server 7"
             ::= { netscape 7}
 
     dsOpsTable OBJECT-TYPE
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.c b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
index 268ee27e..6a6904fe 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.c
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
@@ -749,7 +749,7 @@ int MagtLoadStaticInfo(MagtStaticInfo_t *staticInfo, char *pszRootDir, int *SNMP
  
   staticInfo->ApplIndex = 0;
  
-  REPLACE(staticInfo->entityDescr.val, "Netscape Directory Server");
+  REPLACE(staticInfo->entityDescr.val, "Brandx Directory Server");
   staticInfo->entityDescr.len = strlen(staticInfo->entityDescr.val);
  
   REPLACE(staticInfo->entityVers.val, "7");
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.def b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
index 9968af40..2f30cde4 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.def
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
@@ -6,7 +6,7 @@
 ;
 LIBRARY ns-ldapagt
 
-DESCRIPTION 'Netscape Directory Server SNMP Agent'
+DESCRIPTION 'Brandx Directory Server SNMP Agent'
 
 CODE  LOADONCALL MOVEABLE DISCARDABLE
 DATA  PRELOAD    MOVEABLE SINGLE
diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c
index c6afaa1d..bbdf435e 100644
--- a/ldap/systools/idsktune.c
+++ b/ldap/systools/idsktune.c
@@ -609,7 +609,7 @@ int sun_check_kern_arch(char *a,char *b)
     if (flag_debug) printf("DEBUG  : Kernel architecture: sun4u\n");
   } else {
     if (flag_html) printf("<P>\n");
-    printf("%s: The kernel architecture is %s.  Netscape products are optimized\nfor the UltraSPARC architecture and will exhibit poorer performance on earlier\nmachines.\n\n","WARNING",b);
+    printf("%s: The kernel architecture is %s.  Brandx products are optimized\nfor the UltraSPARC architecture and will exhibit poorer performance on earlier\nmachines.\n\n","WARNING",b);
     if (flag_html) printf("</P>\n");
     flag_arch_bad = 1;
   }
@@ -2756,8 +2756,8 @@ static void disk_tests(void)
 #if defined(_WIN32)
     /* TBD */
 #else
-    if (access("/usr/netscape",X_OK) == 0) {
-      sprintf(install_dir,"/usr/netscape");      
+    if (access("/usr/brandx",X_OK) == 0) {
+      sprintf(install_dir,"/usr/brandx");      
     } else {
       sprintf(install_dir,"/opt");
     }
@@ -3235,7 +3235,7 @@ int main(int argc,char *argv[])
     char sysbuf[BUFSIZ];
     int nproc;
     if (flag_html) printf("<P>\n");
-    printf("Netscape Directory Server system tuning analysis version %s.\n\n", build_date);
+    printf("Brandx Directory Server system tuning analysis version %s.\n\n", build_date);
     ids_get_platform(sysbuf);
     nproc = count_processors();
     if (nproc == 1) {
diff --git a/lib/libsi18n/getstrmem.h b/lib/libsi18n/getstrmem.h
index edb6d754..56359fd2 100644
--- a/lib/libsi18n/getstrmem.h
+++ b/lib/libsi18n/getstrmem.h
@@ -57,7 +57,7 @@ static char* userforms[] = {
   "",
   "Error: could not open servers list file.<p>\n",
   "Error: could not open %s server list file.<p>\n",
-  "Netscape Server Account",
+  "Brandx Server Account",
   "Server Account Management for %s",
   "Server Account Management",
   emptyString };
@@ -478,7 +478,7 @@ static char* httpdaemon[] = {
   "warning: daemon is running as super-user\n",
   "could not determine current user name\n",
   "error: chroot to %s failed (%s)\n",
-  "WARNING! Netscape executable and library have different versions.\n",
+  "WARNING! Brandx executable and library have different versions.\n",
   "startup: listening to %s://%s, port %d as %s\n",
   "startup: listening to %s://%s, port %d as %s\n",
   "seminit failed (%s)\n",
@@ -828,7 +828,7 @@ static char* base[] = {
   "unable to allocate hash entry",
   "cache_insert: unable to create cache entry",
   "HTTP/1.0 200 OK\nContent-type: text/html\n\n",
-  "<H2>Netscape cache status report</H2>\n",
+  "<H2>Brandx cache status report</H2>\n",
   "No caches on system<P>",
   "<H2>%s cache</H2>\n",
   "Cache hit ratio: %d/%d (%f)</P>\n</P>\n",
@@ -863,7 +863,7 @@ static char* base[] = {
   "error getting processor info for processor %d",
   "Error binding to processor %d",
   "bound process %d to processor %d",
-  "Netscape server is not explicitly binding to any processors.",
+  "Brandx server is not explicitly binding to any processors.",
   "cache monitor exited",
   "cache batch update daemon exited",
   "Using single threaded accepts.",
@@ -872,7 +872,7 @@ static char* base[] = {
   "This machine has %d processors.",
   "Error calling thr_seconcurrency(%d)- (%s)",
   "Set conncurrency to %d.",
-  "WARNING! Netscape executable and library have different versions.\n",
+  "WARNING! Brandx executable and library have different versions.\n",
   "",
   "",
   "seminit failed (%s)\n",
@@ -938,7 +938,7 @@ static char* base[] = {
   "dns-cache-insert: malloc failure",
   "successful server startup",
   "%s B%s",
-  "Netscape executable and shared library have different versions",
+  "Brandx executable and shared library have different versions",
   "   executable version is %s",
   "   shared library version is %s",
   "error reporting shutting down",
diff --git a/nsdefs.mk b/nsdefs.mk
index f2e913dc..6307dada 100644
--- a/nsdefs.mk
+++ b/nsdefs.mk
@@ -99,9 +99,9 @@ endif
 endif
 
 MAJOR_VERSION:="7"
-MINOR_VERSION:="0"
+MINOR_VERSION:="1"
 MAJOR_VERSION_NOQUOTES:=7
-MINOR_VERSION_NOQUOTES:=0
+MINOR_VERSION_NOQUOTES:=1
 
 # the LINK version is the one used for -l linking e.g. -l$(LINK_HTTPDLL_NAME)
 ifeq ($(BUILD_ARCH), WINNT)
@@ -176,7 +176,7 @@ else
  NSPR_DIR=nspr
 endif
 NSPR_BASENAME=libnspr21
-PRODUCT="Netscape Directory Server"
+PRODUCT="Brandx Directory Server"
 PRODUCT_IS_DIRECTORY_SERVER=1
 INSTANCE_NAME_PREFIX="Directory Server"
 DIR=slapd
@@ -197,8 +197,8 @@ COMMON_OBJDIR_32=$(BUILD_ROOT)/built/$(ARCHPROCESSOR)-$(SECURITY)$(SSL_PREFIX)-$
 OBJDIR=$(COMMON_OBJDIR)
 OBJDIR_32=$(COMMON_OBJDIR_32)
 DO_SEARCH=no
-DIR_VERSION:=7.0
-DIR_NORM_VERSION:=7.0
+DIR_VERSION:=7.1
+DIR_NORM_VERSION:=7.1
 # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
 # update all of the .exp and .def files by executing the following command:
 #	cd ldap/libraries; gmake exportfiles