Misc updates

diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index b7a897a8ff2b9622d22eff6db05063fafb3c34c0..7305dd7901dcb9477e87b35a6e2079d17d814e06 100644 (file)
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -113,7 +113,7 @@ configure detects a usable Cyrus SASL installation.
 H3: Database Software
 
 OpenLDAP's {{slapd}}(8) {{TERM:BDB}} and {{TERM:HDB}} primary database backends
-require {{ORG[expand]Sleepycat}} {{PRD:Berkeley DB}}.
+require {{ORG[expand]Oracle}} {{PRD:Berkeley DB}}.
 If not available at configure time, you will not be able build
 {{slapd}}(8) with these primary database backends.
 
@@ -122,10 +122,10 @@ Your operating system may provide a supported version of
 software component.  If not, you'll have to obtain and
 install it yourself.
 
-{{PRD:Berkeley DB}} is available from {{ORG[expand]Sleepycat}}'s
-download page {{URL: http://www.sleepycat.com/download/}}.  There
-are several versions available.  Generally, the most recent release
-(with published patches) is recommended.  This package is required
+{{PRD:Berkeley DB}} is available from {{ORG[expand]Oracle}}'s Berkeley DB
+download page
+{{URL: http://www.oracle.com/technology/software/products/berkeley-db/index.html}}.  There are several versions available.  Generally, the most recent
+release (with published patches) is recommended.  This package is required
 if you wish to use the {{TERM:BDB}} or {{TERM:HDB}} database backends.
 
 

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index a26ac9cc9ee01936efb0c53d8a7476a9ffbdac43..33f45377a6888f09584143acf7a68254d1c8cbb0 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -268,7 +268,7 @@ of different database backends you can choose from. They include
 {{TERM:HDB}}, a hierarchical high-performance transactional
 backend; {{SHELL}}, a backend interface to arbitrary shell scripts;
 and PASSWD, a simple backend interface to the {{passwd}}(5) file.
-The BDB and HDB backends utilize {{ORG:Sleepycat}} {{PRD:Berkeley
+The BDB and HDB backends utilize {{ORG:Oracle}} {{PRD:Berkeley
 DB}}.
 
 {{B:Multiple database instances}}: {{slapd}} can be configured to

diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index abd72b940e019f29f6f26a58188ba7df24828b03..308cd26f46f785cf7a995a418047ad8f581114b9 100644 (file)
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -102,29 +102,29 @@ ________________<BR>
 Name|Long|Jump
 ANSI|American National Standards Institute|http://www.ansi.org/
 BSI|British Standards Institute|http://www.bsa-global.com/
-OpenLDAP|OpenLDAP|http://www.openldap.org/
-OLF|OpenLDAP Foundation|http://www.openldap.org/foundation/
-OLP|OpenLDAP Project|http://www.openldap.org/project/
-UM|University of Michigan|http://www.umich.edu/
-UMLDAP|University of Michigan LDAP|http://www.umich.edu/~dirsvcs/ldap/ldap.html
-IANA|Internet Assigned Numbers Authority|http://www.iana.org/
+Cyrus|Project Cyrus|http://asg.web.cmu.edu/cyrus/
+FSF|Free Software Foundation|http://www.fsf.org/
+GNU|GNU Not Unix Project|http://www.gnu.org/
 IAB|Internet Architecture Board|http://www.iab.org/
-IETF|Internet Engineering Task Force|http://www.ietf.org/
+IANA|Internet Assigned Numbers Authority|http://www.iana.org/
 IESG|Internet Engineering Steering Group|http://www.ietf.org/iesg/
+IETF|Internet Engineering Task Force|http://www.ietf.org/
 IRTF|Internet Research Task Force|http://www.irtf.org/
 ISO|International Standards Organisation|http://www.iso.org/
 ITU|International Telephone Union|http://www.itu.int/
+OLF|OpenLDAP Foundation|http://www.openldap.org/foundation/
+OLP|OpenLDAP Project|http://www.openldap.org/project/
+OpenLDAP|OpenLDAP Project|http://www.openldap.org/
+OpenSSL|OpenSSL Project|http://www.openssl.org/
 RFC|RFC Editor|http://www.rfc-editor.org/
-OpenSSL|OpenSSL|http://www.openssl.org/
-Cyrus|Cyrus Electronic Mail Project|http://asg.web.cmu.edu/cyrus/
-Sleepycat|Sleepycat Software|http://www.sleepycat.com/
-FSF|Free Software Foundation|http://www.fsf.org/
-GNU|GNU Not Unix|http://www.gnu.org/
+Oracle|Oracle|http://www.oracle.com/
+UM|University of Michigan|http://www.umich.edu/
+UMLDAP|University of Michigan LDAP Team|http://www.umich.edu/~dirsvcs/ldap/ldap.html
 !endblock
 
 !block products; data
 Name|Jump
-Berkeley DB|http://www.sleepycat.com/products/transactional.shtml
+Berkeley DB|http://www.oracle.com/database/berkeley-db/db/index.html
 CVS|http://www.cvshome.org/
 Cyrus|http://asg.web.cmu.edu/cyrus/
 GNU|http://www.gnu.org/software/
@@ -137,6 +137,7 @@ Perl|http://www.perl.org/
 SASL|http://asg.web.cmu.edu/sasl/sasl-library.html
 SQL|http://www.jcc.com/SQLPages/jccs_sql.htm
 TCL|http://www.tcl.tk/
+UMLDAP|University of Michigan LDAP|http://www.umich.edu/~dirsvcs/ldap/ldap.html
 !endblock
 
 # Internet and X.500 terms