[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

3 files changed, 16 insertions, 6 deletions

diff --git a/ldap/admin/src/scripts/template-cl-dump.pl b/ldap/admin/src/scripts/template-cl-dump.pl
index 8fad1505..b2d682f7 100755
--- a/ldap/admin/src/scripts/template-cl-dump.pl
+++ b/ldap/admin/src/scripts/template-cl-dump.pl
@@ -6,6 +6,11 @@
 # END COPYRIGHT BLOCK
 ################################################################################
 #
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
 # FILE: cl-dump.pl
 #
 # SYNOPSIS:
@@ -16,7 +21,7 @@
 #    cl-dump.pl -i changelog-ldif-file-with-base64encoding [-o output-file] [-c]\n";
 #
 # DESCRIPTION:
-#    Dump and decode Netscape Directory Server replication change log
+#    Dump and decode Directory Server replication change log
 #
 # OPTIONS:
 #
@@ -74,7 +79,7 @@ use MIME::Base64;			# Decode
 
 # Global variables
 
-$version = "Netscape Directory Server Changelog Dump - Version 1.0";
+$version = "Directory Server Changelog Dump - Version 1.0";
 
 #main
 {
diff --git a/ldap/admin/src/scripts/template-dsml-activate.pl b/ldap/admin/src/scripts/template-dsml-activate.pl
index 3bd159ad..7f0d93b2 100644
--- a/ldap/admin/src/scripts/template-dsml-activate.pl
+++ b/ldap/admin/src/scripts/template-dsml-activate.pl
@@ -155,7 +155,7 @@ EOF
 		print STDERR "adding necessary entry to $file.\n";
 		print <<EOF;
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE vs SYSTEM "file:${SERVERROOT}/bin/https/dtds/nes-webapps_6_1.dtd">
+<!DOCTYPE vs SYSTEM "file:${SERVERROOT}/bin/https/dtds/nes-webapps_6_2.dtd">
 
 <vs>
  <web-app uri="/axis" dir="${SERVERROOT}{{SEP}}clients{{SEP}}dsmlgw" enable="true"/>
diff --git a/ldap/admin/src/scripts/template-repl-monitor.pl b/ldap/admin/src/scripts/template-repl-monitor.pl
index 3a356e4e..3a79ac69 100755
--- a/ldap/admin/src/scripts/template-repl-monitor.pl
+++ b/ldap/admin/src/scripts/template-repl-monitor.pl
@@ -6,6 +6,11 @@
 # END COPYRIGHT BLOCK
 ##############################################################################
 #
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
 # FILE: repl-monitor.pl
 #
 # SYNOPSIS:
@@ -28,7 +33,7 @@
 #	parameters, the server alias, and the thresholds for different colors
 #	when display the time lags between consumers and master.
 #	If the Admin Server is running on Windows, the configuration-file
-#	name may have format "D:/Netscape/replmon.conf".
+#	name may have format "D:/opt/replmon.conf".
 #
 #	The connection parameter section consists of the section name
 #	followed by one of more connection parameter entries:
@@ -135,7 +140,7 @@ use Time::Local; # to convert GMT Z strings to localtime
 #
 # Global variables
 #
-$product = "Netscape Directory Server Replication Monitor";
+$product = "Directory Server Replication Monitor";
 $version = "Version 1.0";
 #
 # ldap servers given or discovered from the replication agreements:
@@ -907,7 +912,7 @@ sub print_html_header
 	print "<table border=0 cellspacing=0 cellpadding=10 width=100% class=bgColor1>\n";
 	print "<tr><td><font class=text8>$now</font></td>\n";
 	print "<td align=center class=page-title><font color=#0099CC>";
-	print "Netscape Directory Server Replication Status</font>\n";
+	print "Directory Server Replication Status</font>\n";
 
 	if ($opt_u) {
 		print "<br><font class=text8>(This page updates every $interval seconds)</font>\n";