[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, 5 insertions, 5 deletions

diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c
index cac3d5fe..bf0b5358 100644
--- a/ldap/systools/idsktune.c
+++ b/ldap/systools/idsktune.c
@@ -610,7 +610,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.  Brandx 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.  Fedora 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;
   }
@@ -2757,8 +2757,8 @@ static void disk_tests(void)
 #if defined(_WIN32)
     /* TBD */
 #else
-    if (access("/usr/brandx",X_OK) == 0) {
-      sprintf(install_dir,"/usr/brandx");      
+    if (access("/usr/fedora",X_OK) == 0) {
+      sprintf(install_dir,"/usr/fedora");      
     } else {
       sprintf(install_dir,"/opt");
     }
@@ -3236,7 +3236,7 @@ int main(int argc,char *argv[])
     char sysbuf[BUFSIZ];
     int nproc;
     if (flag_html) printf("<P>\n");
-    printf("Brandx Directory Server system tuning analysis version %s.\n\n", build_date);
+    printf("Fedora Directory Server system tuning analysis version %s.\n\n", build_date);
     ids_get_platform(sysbuf);
     nproc = count_processors();
     if (nproc == 1) {
diff --git a/ldap/systools/viewcore.c b/ldap/systools/viewcore.c
index dc6a620c..814c3841 100644
--- a/ldap/systools/viewcore.c
+++ b/ldap/systools/viewcore.c
@@ -343,7 +343,7 @@ main(int argc, char ** argv)
   ofname = argv[3];
   of = fopen(ofname,"a");
   
-  fprintf(of,"Core analysis %s. Copyright 2001 Sun Microsystems, Inc.\nPortions copyright 1999, 2001-2003 Netscape Communications Corporation.\nAll rights reserved.\nCurrently %sOpening %s %s\n",reldate,ctime(&t),argv[1],argv[2]);
+  fprintf(of,"Core analysis %s. Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.\nCurrently %sOpening %s %s\n",reldate,ctime(&t),argv[1],argv[2]);
 
   if ((fd2 = open(argv[1], O_RDONLY)) == -1) {
     perror(argv[1]);