diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-08-11 14:37:44 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-08-11 15:17:44 -0600 |
| commit | 886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7 (patch) | |
| tree | 7afa75c8dd680409fe7049827cf0a4f2905036a5 /ldap/docs | |
| parent | abff3feacb218a7bb65a358dce2e9c90a2f185b1 (diff) | |
| download | ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.tar.gz ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.tar.xz ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.zip | |
Change default branding to 389 - remove lite code
The vendor, brand, and capbrand are set in configure - we should use those
everywhere rather than have to run some sort of script over the code to
change vendor, brand, version, etc. I've added VENDOR, BRAND, CAPBRAND
to the default defines passed to the compiler, and changed the code to use
these defines. And instead of the unintuitively named PRODUCTTEXT macro,
we should use the already defined PRODUCT_VERSION.
This allowed me to get rid of some code. The version was from a generated
file called dirver.h which we don't need anymore, and we don't need the perl
script dirver.pl which generated it.
The vendor string was coming from the dirlite header file. So I also used this
as an excuse to get rid of all references to dirlite once and for all (yay!).
For the places in plain text files which are not substituted, I just used the
generic name Dirsrv or Directory Server instead of having an explicit brand
and/or version in there.
Reviewed by: nkinder (Thanks!)
Diffstat (limited to 'ldap/docs')
| -rw-r--r-- | ldap/docs/LICENSE.txt | 8 | ||||
| -rw-r--r-- | ldap/docs/README.txt | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ldap/docs/LICENSE.txt b/ldap/docs/LICENSE.txt index a1591af9..a6bc4cb9 100644 --- a/ldap/docs/LICENSE.txt +++ b/ldap/docs/LICENSE.txt @@ -1,14 +1,14 @@ LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY -FEDORA(TM) DIRECTORY SERVER +389(TM) DIRECTORY SERVER -This agreement governs the use of Fedora Directory Server, +This agreement governs the use of 389 Directory Server, Administration Server and Management Console (collectively, the "SOFTWARE") and any updates to the Software, regardless of the delivery mechanism. -1. FEDORA DIRECTORY SERVER +1. 389 DIRECTORY SERVER -1.1 LICENSE GRANT. Fedora Directory Server ("FDS") is a modular +1.1 LICENSE GRANT. 389 Directory Server ("389") is a modular application consisting of hundreds of software components and is a collective work under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("RED HAT") grants to the user ("LICENSEE") a diff --git a/ldap/docs/README.txt b/ldap/docs/README.txt index f5c2bda2..45be98bc 100644 --- a/ldap/docs/README.txt +++ b/ldap/docs/README.txt @@ -1,11 +1,11 @@ ======================================================================= - Fedora Directory Server 1.0.4 + 389 Directory Server 1.2.1 ======================================================================= -The Fedora Directory Server is subject to the terms detailed in the +The 389 Directory Server is subject to the terms detailed in the license agreement file called LICENSE.txt. -Late-breaking news and information on the Fedora Directory Server is +Late-breaking news and information on the 389 Directory Server is available at the following location: - http://directory.fedora.redhat.com + http://port389.org/ |