Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / doc / guide / admin / appendix-recommended-versions.sdf

diff --git a/doc/guide/admin/appendix-recommended-versions.sdf b/doc/guide/admin/appendix-recommended-versions.sdf
index 4276d89f45cb7f1ddfcf606f9ca41d6a2eabf27d..a82b68ef106f6ba9adcbcb7d0e92d5bb25996663 100644 (file)
--- a/doc/guide/admin/appendix-recommended-versions.sdf
+++ b/doc/guide/admin/appendix-recommended-versions.sdf
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-# Copyright 1999-2007 The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 1999-2013 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Recommended OpenLDAP Software Dependency Versions
@@ -10,21 +10,30 @@ that OpenLDAP depends on.
 Please read the {{SECT:Prerequisite software}} section for more 
 information on the following software dependencies.
 
-H2: Version Table
+H2: Dependency Versions
 
 !block table; align=Center; coltags="N,EX,EX"; title="Table 8.5: OpenLDAP Software Dependency Versions"
-Feature                                                Software                                                                        Version
+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
+|{{PRD:OpenSSL}}|0.9.7+
+|{{PRD:GnuTLS}}|2.0.1
+|{{PRD:MozNSS}}|3.12.9
+{{TERM[expand]SASL}}|{{PRD:Cyrus SASL}}|2.1.21+
 {{TERM[expand]Kerberos}}:
-                                                       {{PRD:Heimdal}}                                                         Version
-                                                       {{PRD:MIT Kerberos}}                                            Version
-Database Software                      {{ORG[expand]Oracle}} {{PRD:Berkeley DB}}       Versions
+|{{PRD:Heimdal}}|Version
+|{{PRD:MIT Kerberos}}|Version
+Database Software|{{PRD:Berkeley DB}}:|
+||4.4
+||4.5
+||4.6
+||4.7
+||4.8
+||5.0
+||5.1
+||Note: It is highly recommended to apply the patches from Oracle for a given release.
 Threads:
-                                                       POSIX {{pthreads}}                                                      Version
-                                                       Mach {{CThreads}}                                                       Version
-TCP Wrappers                           Name                                                                            Version
+|POSIX {{pthreads}}|Version
+|Mach {{CThreads}}|Version
+TCP Wrappers|Name|Version
 !endblock