[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

2 files changed, 16 insertions, 16 deletions

diff --git a/lib/ldaputil/examples/Certmap.mak b/lib/ldaputil/examples/Certmap.mak
index a8e2d0ee..d965d152 100644
--- a/lib/ldaputil/examples/Certmap.mak
+++ b/lib/ldaputil/examples/Certmap.mak
@@ -72,8 +72,8 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\netscape\suitespot\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\netscape\suitespot\include" /D "WIN32"\
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32"\
  /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX /Fo"$(INTDIR)/" /c 
 CPP_OBJS=.\Release/
 CPP_SBRS=.\.
@@ -99,7 +99,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
 LINK32_OBJS= \
 	"$(INTDIR)\init.obj" \
 	"$(INTDIR)\plugin.obj" \
-	"C:\Netscape\SuiteSpot\lib\nsldap32v10.lib"
+	"C:\Fedora\servers\lib\nsldap32v10.lib"
 
 "$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -138,8 +138,8 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\netscape\suitespot\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\netscape\suitespot\include" /D\
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D\
  "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX\
  /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
 CPP_OBJS=.\Debug/
@@ -166,7 +166,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
 LINK32_OBJS= \
 	"$(INTDIR)\init.obj" \
 	"$(INTDIR)\plugin.obj" \
-	"C:\Netscape\SuiteSpot\lib\nsldap32v10.lib"
+	"C:\Fedora\servers\lib\nsldap32v10.lib"
 
 "$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -211,9 +211,9 @@ LINK32_OBJS= \
 SOURCE=.\plugin.c
 DEP_CPP_PLUGI=\
 	".\plugin.h"\
-	"c:\netscape\suitespot\include\certmap.h"\
-	"c:\netscape\suitespot\include\lber.h"\
-	"c:\netscape\suitespot\include\ldap.h"\
+	"c:\Fedora\servers\include\certmap.h"\
+	"c:\Fedora\servers\include\lber.h"\
+	"c:\Fedora\servers\include\ldap.h"\
 	{$(INCLUDE)}"\sys\types.h"\
 	
 
@@ -227,9 +227,9 @@ DEP_CPP_PLUGI=\
 SOURCE=.\init.c
 DEP_CPP_INIT_=\
 	".\plugin.h"\
-	"c:\netscape\suitespot\include\certmap.h"\
-	"c:\netscape\suitespot\include\lber.h"\
-	"c:\netscape\suitespot\include\ldap.h"\
+	"c:\Fedora\servers\include\certmap.h"\
+	"c:\Fedora\servers\include\lber.h"\
+	"c:\Fedora\servers\include\ldap.h"\
 	{$(INCLUDE)}"\sys\types.h"\
 	
 
@@ -240,7 +240,7 @@ DEP_CPP_INIT_=\
 ################################################################################
 # Begin Source File
 
-SOURCE=C:\Netscape\SuiteSpot\lib\nsldap32v10.lib
+SOURCE=C:\Fedora\servers\lib\nsldap32v10.lib
 
 !IF  "$(CFG)" == "Certmap - Win32 Release"
 
diff --git a/lib/ldaputil/examples/README b/lib/ldaputil/examples/README
index 51bc59e8..0cf56b0f 100644
--- a/lib/ldaputil/examples/README
+++ b/lib/ldaputil/examples/README
@@ -7,7 +7,7 @@
 
 This directory contains an example program to demonstrate
 writing plugins using the "Certificate to LDAP Mapping" API.
-Please read the "Managing Netscape Servers" manual to find out
+Please read the "Managing Servers" manual to find out
 about how certificate to ldap mapping can be configured using
 the <ServerRoot>/userdb/certmap.conf file.  Also refer to the
 "Certificate to LDAP Mapping API" documentation to find out
@@ -66,8 +66,8 @@ subject DN and the issuer DN from the certificate.
 Build Procedure
 ---------------
 On UNIX: Edit the Makefile, and set the variables ARCH & SROOT
-according to the comments in the Makefile.  Download LDAP SDK
-from the Netscape's DevEdge site and make the ldap include
+according to the comments in the Makefile.  Download LDAP C SDK
+from the mozilla.org site and make the ldap include
 files available in <SROOT>/include.  Copy the
 ../include/certmap.h file to the <SROOT>/include directory.
 Use 'gmake' to build the plugin.  A shared library plugin.so