[Bug 146919] Directory Server rebranding

1) Brandx -> Fedora
2) Pick up new internal component set (Admin SDK, Setup SDK, Admin Server)
3) Use JRE from the Admin Server package
4) Docs
  a) Componentize Docs
  b) Rebrand Docs
  c) Drop packaging Administration Guide in the external version

41 files changed, 64 insertions, 64 deletions

diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def
index b032de32..80670d25 100644
--- a/ldap/servers/plugins/acl/libacl.def
+++ b/ldap/servers/plugins/acl/libacl.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7.1 ACL Plugin'
+DESCRIPTION     'Fedora 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 4af437c1..3aa834e8 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7 Chaining Database Plugin'
+DESCRIPTION     'Fedora 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 76dc59e3..7ed5b806 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     'Brandx Directory Server 7 Collation Plugin'
+DESCRIPTION     'Fedora 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 49214f90..fa6b1a8c 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     'Brandx Directory Server 7 Class Of Service Plugin'
+DESCRIPTION     'Fedora 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 14a7a2ca..e95c17ad 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/README
@@ -10,7 +10,7 @@
                    ----------------------------
 
 This directory contains code for some sample server plug-ins intended for
-use with the Brandx Directory Server 7.  
+use with the Fedora 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 2ee3c79e..7b8d0afb 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -3,7 +3,7 @@
 ; Copyright (C) 2005 Red Hat, Inc.
 ; All rights reserved.
 ; --- END COPYRIGHT BLOCK ---
-DESCRIPTION 	'Brandx Directory Server 7 distribution logic example'
+DESCRIPTION 	'Fedora Directory Server 7 distribution logic example'
 EXPORTS
 	alpha_distribution @1
 	hash_distribution @2
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 285d2f24..cedc5479 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -624,10 +624,10 @@ static int nssReinitializationRequired()
 	if ( err == LDAP_SUCCESS && entry!=NULL  && entry[0]!=NULL)
 	{
 		value = slapi_entry_attr_get_charptr(entry[0], "vendorVersion");
-		if (value == NULL || strncmp(value, "Netscape", strlen("Netscape")))		
+		if (value == NULL || strncmp(value, "Fedora", strlen("Fedora")))
 		{
 			slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
-				"nssReinitializationRequired: vendor is not Netscape \n");
+				"nssReinitializationRequired: vendor is not Fedora \n");
 			slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
 				"or version is earlier than 6.0\n", value);
 			nssReinitializationRequired = 1;
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index 3127d931..40ce8e73 100644
--- a/ldap/servers/plugins/passthru/libpassthru.def
+++ b/ldap/servers/plugins/passthru/libpassthru.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7 Pass Through Authentication Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Pass Through Authentication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def
index f44814d7..f0c4199d 100644
--- a/ldap/servers/plugins/presence/presence.def
+++ b/ldap/servers/plugins/presence/presence.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Netscape Directory Server 6.2.1 Presence Plugin'
+DESCRIPTION     'Fedora Directory Server 7 Presence Plugin'
 EXPORTS
 	presence_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index 50c1466f..b2db24ef 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		'Brandx Directory Server 7 password storage scheme Plugin'
+DESCRIPTION		'Fedora 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 d99eb393..f28debf4 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     'Brandx Directory Server 7 Referint Plugin'
+DESCRIPTION     'Fedora 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 09b280d2..4325b502 100644
--- a/ldap/servers/plugins/replication/replication.def
+++ b/ldap/servers/plugins/replication/replication.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7.1 Replication Plugin'
+DESCRIPTION     'Fedora 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 0e2502a9..c4db11f7 100644
--- a/ldap/servers/plugins/retrocl/retrocl.def
+++ b/ldap/servers/plugins/retrocl/retrocl.def
@@ -6,7 +6,7 @@
 ;
 ;
 
-DESCRIPTION     'Brandx Directory Server 7.1 Retro-Changelog Plugin'
+DESCRIPTION     'Fedora 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 449e1e1c..6ad662ca 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     'Brandx Directory Server 7.1 Roles Plugin'
+DESCRIPTION     'Fedora 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 8fc6aa77..2779f613 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     'Brandx Directory Server 7.1 State Change Plugin'
+DESCRIPTION     'Fedora 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 79c0ff1d..2c651f2d 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     'Brandx Directory Server 7 syntaxes Plugin'
+DESCRIPTION     'Fedora 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 8c6fbe48..76dfecd9 100644
--- a/ldap/servers/plugins/uiduniq/libuiduniq.def
+++ b/ldap/servers/plugins/uiduniq/libuiduniq.def
@@ -6,7 +6,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Brandx Directory Server 7 Unique Attribute Checking Plugin'
+DESCRIPTION     'Fedora 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 2e688e26..f1db5b7f 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     'Brandx Directory Server 7.1 State Change Plugin'
+DESCRIPTION     'Fedora Directory Server 7.1 State Change Plugin'
 EXPORTS
 	views_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
index 6dfd1b9b..4d9d28a3 100644
--- a/ldap/servers/slapd/Makefile
+++ b/ldap/servers/slapd/Makefile
@@ -19,7 +19,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 OBJDEST = $(OBJDIR)/servers/obj
 BINDIR = $(LDAP_SERVER_RELDIR)
 ifndef INSTDIR
-INSTDIR = /netscape/server4/
+INSTDIR = /opt/servers/
 endif
 
 include $(BUILD_ROOT)/nsdefs.mk
diff --git a/ldap/servers/slapd/agtmmap.c b/ldap/servers/slapd/agtmmap.c
index ee49ea0c..c67282cb 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 
- * 		   Brandx Directory Server stats (for UNIX environment).
+ * 		   Fedora 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 7c9d3bf9..330475e9 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 
- *                 Brandx Directory Server stats (for UNIX environment).
+ *                 Fedora 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 f3793eb5..1e4077ce 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,
-			"Brandx defined attribute type",
+			"Fedora defined attribute type",
 			 NULL,						/* superior */
 			 mr_equality, NULL, NULL,	/* matching rules */
 			 origins, syntax,
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index 0d9a573b..c4c051f7 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -286,9 +286,9 @@ extended_op_oid2string( const char *oid )
 	const char *rval = NULL;
 
 	if ( 0 == strcmp(oid, EXTOP_BULK_IMPORT_START_OID)) {
-		rval = "Netscape Bulk Import Start";
+		rval = "Fedora Bulk Import Start";
 	} else if ( 0 == strcmp(oid, EXTOP_BULK_IMPORT_DONE_OID)) {
-		rval = "Netscape Bulk Import End";
+		rval = "Fedora Bulk Import End";
 	} else {
 		rval = plugin_extended_op_oid2string( oid );
 	}
diff --git a/ldap/servers/slapd/libmakefile b/ldap/servers/slapd/libmakefile
index d0b323d8..633180d7 100644
--- a/ldap/servers/slapd/libmakefile
+++ b/ldap/servers/slapd/libmakefile
@@ -21,7 +21,7 @@ OBJDEST = $(OBJDIR)/servers/obj
 BINDIR = $(LIB_RELDIR)
 LIBDIR = $(OBJDIR)/lib
 ifndef INSTDIR
-INSTDIR = /netscape/server4/
+INSTDIR = /opt/servers/
 endif
 
 include $(BUILD_ROOT)/nsdefs.mk
diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def
index 71896812..9d17e90a 100644
--- a/ldap/servers/slapd/libslapd.def
+++ b/ldap/servers/slapd/libslapd.def
@@ -4,7 +4,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Brandx Directory Server 7 Utility Library'
+DESCRIPTION     'Fedora Directory Server 7 Utility Library'
 EXPORTS
 	slapd_log_error_proc		@2
 	slapd_log_audit_proc		@3
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index 091abca2..03c73e5a 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -1530,7 +1530,7 @@ log_write_title (LOGFD fp)
 	int bufflen = sizeof(buff);
 
 	PR_snprintf(buff, bufflen, "\t%s B%s\n",
-				fe_cfg->versionstring ? fe_cfg->versionstring : "Netscape-Directory",
+				fe_cfg->versionstring ? fe_cfg->versionstring : "Fedora-Directory",
 				buildnum ? buildnum : "");
 	LOG_WRITE_NOW(fp, buff, strlen(buff), 0);
 
diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
index e37040a7..75cbaa7c 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora Directory Server: %1.
 The directory server has shutdown.
 .
 MessageId=0x3
@@ -164,7 +164,7 @@ Severity=Success
 Facility=Slapd
 SymbolicName=MSG_SERVER_STOPPED
 Language=English
-Brandx Directory Server: %1.
+Fedora Directory Server: %1.
 The directory server has stopped.
 .
 MessageId=0x4
@@ -172,7 +172,7 @@ Severity=Success
 Facility=Startup
 SymbolicName=MSG_SERVER_STARTING
 Language=English
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1
+Fedora Directory Server: %1
 Invalid command line specified: %2
 .
 MessageId=0xA
@@ -220,7 +220,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_BADPASSWORD
 Language=English
-Brandx Directory Server: %1.
+Fedora Directory Server: %1.
 Incorrect SSL password entered.
 .
 MessageId=0xB
@@ -228,7 +228,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_STRING
 Language=English
-Brandx Directory Server: %1.
+Fedora Directory Server: %1.
 %2
 .
 MessageId=0xC
@@ -236,7 +236,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_STARTFAILED
 Language=English
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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
-Brandx Directory Server: %1.
+Fedora 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 fb7be118..a5b22760 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=Brandx Directory Server 7.1
-NS_OBJ_009_HELP=Brandx Directory Server
+NS_OBJ_009_NAME=Fedora Directory Server 7.1
+NS_OBJ_009_HELP=Fedora 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 251e4bfd..d450998a 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,
-                        "Brandx Server", MB_ICONEXCLAMATION | MB_OK);
+                        "Fedora Server", MB_ICONEXCLAMATION | MB_OK);
 	} else {
 	    if((cbRemotePassword != 0) && (szRemotePassword != 0))
 	    {
diff --git a/ldap/servers/slapd/passwd_extop.c b/ldap/servers/slapd/passwd_extop.c
index 2ff03411..0fb01f1f 100644
--- a/ldap/servers/slapd/passwd_extop.c
+++ b/ldap/servers/slapd/passwd_extop.c
@@ -40,7 +40,7 @@
 #define EXOP_PASSWD_OID	"1.3.6.1.4.1.4203.1.11.1"
 
 
-Slapi_PluginDesc passwdopdesc = { "passwd_modify_plugin", "Netscape", "0.1",
+Slapi_PluginDesc passwdopdesc = { "passwd_modify_plugin", "Fedora", "0.1",
 	"Password Modify extended operation plugin" };
 
 /* Check SLAPI_USERPWD_ATTR attribute of the directory entry 
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index bd7c92ba..0023524b 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/plugin.c
@@ -1510,7 +1510,7 @@ slapi_get_supported_extended_ops_copy( void )
  *
  * If the server is running as the Full version, all plugins are approved,
  * otherwise, if the server is running as DirectoryLite, only plugins from 
- * Netscape are approved.
+ * Red Hat are approved.
  *
  * We have a special case for the NT Synch plugin, which is disabled for DLite.
  */
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 8247e5ad..17c2671c 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -155,8 +155,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	"Brandx, Inc."
-#define SLAPD_VERSION_STR	"Brandx-Directory/" PRODUCTTEXT
+#define SLAPD_VENDOR_NAME	"Fedora Project"
+#define SLAPD_VERSION_STR	"Fedora-Directory/" PRODUCTTEXT
 #define SLAPD_SHORT_VERSION_STR	PRODUCTTEXT
 
 typedef void	(*VFP)(void *);
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index 05862cd6..289e7d57 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -658,7 +658,7 @@ struct slapi_componentid * plugin_get_default_component_id();
 #define COMPONENT_CERT_AUTH	"cn=certificate-based authentication,"COMPONENT_BASE_DN
 
 /* Component names for logging */
-#define SLAPI_COMPONENT_NAME_NSPR	"Netscape runtime"
+#define SLAPI_COMPONENT_NAME_NSPR	"Netscape Portable Runtime"
 #define SLAPI_COMPONENT_NAME_LDAPSDK	"LDAP sdk"
 
 /* return the list of attr defined in the schema matching the attr flags */
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 9f65ff2a..79d40e77 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", "Brandx", "0.1",
+Slapi_PluginDesc exopdesc = { "start_tls_plugin", "Fedora", "0.1",
 	"Start TLS extended operation plugin" };
 
 
diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README
index a5f2b0c6..6a1773f8 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 Brandx Directory Server 7.  
+use with the Fedora 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 d8d19af5..05f888cc 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		'Brandx Directory Server 7 test plugin'
+DESCRIPTION		'Fedora 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 14e61f58..6b2a0ee7 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/brandx/servers/plugins/slapd/slapi/examples/libtest-plugin.so
+nsslapd-pluginpath: /usr/fedora/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: Brandx, Inc.
+nsslapd-pluginvendor: Fedora Project
 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", "Brandx, Inc.", "7.1",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1",
 	"sample SASL bind pre-operation plugin" };
 
 
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index 87684a13..1951308c 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/Makefile
@@ -6,7 +6,7 @@
 # END COPYRIGHT BLOCK
 #
 #
-# 	Make file SNMP subagent for Brandx Directory Server
+# 	Make file SNMP subagent for Fedora Directory Server
 #
 #
 # 	Revision History:
diff --git a/ldap/servers/snmp/netscape-ldap.mib b/ldap/servers/snmp/netscape-ldap.mib
index 57e6174a..f0c59a05 100644
--- a/ldap/servers/snmp/netscape-ldap.mib
+++ b/ldap/servers/snmp/netscape-ldap.mib
@@ -5,7 +5,7 @@
 -- END COPYRIGHT BLOCK
 --
 --
--- MIB for Brandx Directory Server 7 
+-- MIB for Fedora 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 Brandx Directory Server 7"
+                 used for Fedora 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 c8bfac38..0a7ea626 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, "Brandx Directory Server");
+  REPLACE(staticInfo->entityDescr.val, "Fedora 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 4d203ed0..8a005b21 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 'Brandx Directory Server SNMP Agent'
+DESCRIPTION 'Fedora Directory Server SNMP Agent'
 
 CODE  LOADONCALL MOVEABLE DISCARDABLE
 DATA  PRELOAD    MOVEABLE SINGLE