ITS#5554

diff --git a/CHANGES b/CHANGES
index 8cb9a7377cc22196609efe3a157d4f0eea9edd41..01cfdb45ba5f798b24265404d721ec8bfaa5dbf0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ OpenLDAP 2.4.11 Engineering
                Fixed test048 to skip if threads is not available (ITS#5529)
        Documentation
                Added slapo-pcache(5) sizelimit caching (ITS#5559)
+               admin24 GnuTLS documentation (ITS#5554)
 
 OpenLDAP 2.4.10 Release (2008/06/08)
        Fixed libldap file descriptor leak with SELinux (ITS#5507)

diff --git a/doc/guide/admin/appendix-contrib.sdf b/doc/guide/admin/appendix-contrib.sdf
index ddb33077bd434bb14bcea10cb809ca5d5f213a00..8b847023cd935710a9129ec75cb5eddc34db6922 100644 (file)
--- a/doc/guide/admin/appendix-contrib.sdf
+++ b/doc/guide/admin/appendix-contrib.sdf
@@ -50,7 +50,7 @@ Component Matching rules (RFC 3687).
 
 H3: denyop
 
-Deny selected operations, returning {unwillingToPerform}.
+Deny selected operations, returning {{unwillingToPerform}}.
 
 
 H3: dsaschema
@@ -86,7 +86,7 @@ Proxy Authorization compatibility with obsolete internet-draft.
 H3: smbk5pwd
 
 Make the PasswordModify Extended Operation update Kerberos
-keys and Samba password hashes as well as {userPassword}.
+keys and Samba password hashes as well as {{userPassword}}.
 
 
 H3: trace
@@ -96,7 +96,7 @@ Trace overlay invocation.
 
 H3: usn
 
-Maintain {usnCreated} and {usnChanged} attrs similar to Microsoft AD.
+Maintain {{usnCreated}} and {{usnChanged}} attrs similar to Microsoft AD.
 
 
 H2: Tools

diff --git a/doc/guide/admin/tls.sdf b/doc/guide/admin/tls.sdf
index 8098055417684474e51e585be9638e33b2ecdbb0..a3b97f4fe93dec496f558846803e204d8dd73927 100644 (file)
--- a/doc/guide/admin/tls.sdf
+++ b/doc/guide/admin/tls.sdf
@@ -113,6 +113,11 @@ specification for OpenSSL. You can use the command
 >      openssl ciphers -v ALL
 
 to obtain a verbose list of available cipher specifications.
+
+To obtain the list of ciphers in GNUtls use:
+
+>      gnutls-cli -l
+
 Besides the individual cipher names, the specifiers {{EX:HIGH}},
 {{EX:MEDIUM}}, {{EX:LOW}}, {{EX:EXPORT}}, and {{EX:EXPORT40}}
 may be helpful, along with {{EX:TLSv1}}, {{EX:SSLv3}},