New appendix on dependency versions. Could someone look at the table and tell me...

diff --git a/doc/guide/admin/Makefile b/doc/guide/admin/Makefile
index 1b25349d172da1212c5cf9fb029e84859d6f7c66..5b673a9201408f5935bb64fd18c3fa27b797eb14 100644 (file)
--- a/doc/guide/admin/Makefile
+++ b/doc/guide/admin/Makefile
@@ -24,6 +24,7 @@ sdf-src: \
        appendix-contrib.sdf \
        appendix-deployments.sdf \
        appendix-ldap-result-codes.sdf \
+       appendix-recommended-versions.sdf \
        appendix-upgrading.sdf \
        backends.sdf \
        config.sdf \

diff --git a/doc/guide/admin/appendix-recommended-versions.sdf b/doc/guide/admin/appendix-recommended-versions.sdf
new file mode 100644 (file)
index 0000000..4276d89
--- /dev/null
+++ b/doc/guide/admin/appendix-recommended-versions.sdf
@@ -0,0 +1,30 @@
+# $OpenLDAP$
+# Copyright 1999-2007 The OpenLDAP Foundation, All Rights Reserved.
+# COPYING RESTRICTIONS APPLY, see COPYRIGHT.
+
+H1: Recommended OpenLDAP Software Dependency Versions
+
+This appendix details the recommended versions of the software 
+that OpenLDAP depends on. 
+
+Please read the {{SECT:Prerequisite software}} section for more 
+information on the following software dependencies.
+
+H2: Version Table
+
+!block table; align=Center; coltags="N,EX,EX"; title="Table 8.5: OpenLDAP Software Dependency Versions"
+Feature                                                Software                                                                        Version
+{{TERM[expand]TLS}}:
+                                                       {{PRD:OpenSSL}}                                                         0.9.7
+                                                       {{PRD:GnuTLS}}                                                          2.0.1
+{{TERM[expand]SASL}}       {{PRD:Cyrus SASL}}                                                  2.1.22
+{{TERM[expand]Kerberos}}:
+                                                       {{PRD:Heimdal}}                                                         Version
+                                                       {{PRD:MIT Kerberos}}                                            Version
+Database Software                      {{ORG[expand]Oracle}} {{PRD:Berkeley DB}}       Versions
+Threads:
+                                                       POSIX {{pthreads}}                                                      Version
+                                                       Mach {{CThreads}}                                                       Version
+TCP Wrappers                           Name                                                                            Version
+!endblock
+

diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index 73a19841f856286d834f6ab94605deb54a252801..95f3672606cc497df04017cdd3e86197568d97bb 100644 (file)
--- a/doc/guide/admin/master.sdf
+++ b/doc/guide/admin/master.sdf
@@ -96,6 +96,10 @@ PB:
 !include "appendix-common-errors.sdf"; appendix
 PB:
 
+# What versions we recommend 
+!include "appendix-recommended-versions.sdf"; appendix
+PB:
+
 # Real Deployments
 !include "appendix-deployments.sdf"; appendix
 PB: