From 365321d07f67683993bccdc33a3d832e64bdef1c Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Sun, 31 Jan 2010 00:23:07 +0100
Subject: Few misc minor man page bugs

* sssd.conf
    * sbus_timeout was used in an example but explained nowhere
    * enum_cache_timeout unit was not defined
    * same for entry_cache_timeout
    * store_legacy_passwords option does not exist anymore
    * better example than domain/LOCAL - domain/LDAP which uses krb5/ldap
    * sssd.conf(5) listed sssd.conf(5) in SEE ALSO section

* sssd-krb5, sssd-ldap
    * these include each other in SEE ALSO section

Fixes: #393
---
 server/man/sssd-krb5.5.xml |  3 +++
 server/man/sssd-ldap.5.xml |  5 ++++-
 server/man/sssd.conf.5.xml | 41 ++++++++++++++++-------------------------
 3 files changed, 23 insertions(+), 26 deletions(-)

(limited to 'server')

diff --git a/server/man/sssd-krb5.5.xml b/server/man/sssd-krb5.5.xml
index e73e106a..32b6c293 100644
--- a/server/man/sssd-krb5.5.xml
+++ b/server/man/sssd-krb5.5.xml
@@ -238,6 +238,9 @@
             <citerefentry>
                 <refentrytitle>sssd.conf</refentrytitle><manvolnum>5</manvolnum>
             </citerefentry>,
+            <citerefentry>
+                <refentrytitle>sssd-ldap</refentrytitle><manvolnum>5</manvolnum>
+            </citerefentry>,
             <citerefentry>
                 <refentrytitle>sssd</refentrytitle><manvolnum>8</manvolnum>
             </citerefentry>
diff --git a/server/man/sssd-ldap.5.xml b/server/man/sssd-ldap.5.xml
index 18af37b3..2ef51437 100644
--- a/server/man/sssd-ldap.5.xml
+++ b/server/man/sssd-ldap.5.xml
@@ -651,7 +651,7 @@
     id_provider = ldap
     auth_provider = ldap
     ldap_uri = ldap://ldap.mydomain.org
-    ldap_user_search_base = dc=mydomain,dc=org
+    ldap_search_base = dc=mydomain,dc=org
     ldap_tls_reqcert = demand
     cache_credentials = true
     enumerate = true
@@ -676,6 +676,9 @@
             <citerefentry>
                 <refentrytitle>sssd.conf</refentrytitle><manvolnum>5</manvolnum>
             </citerefentry>,
+            <citerefentry>
+                <refentrytitle>sssd-krb5</refentrytitle><manvolnum>5</manvolnum>
+            </citerefentry>,
             <citerefentry>
                 <refentrytitle>sssd</refentrytitle><manvolnum>8</manvolnum>
             </citerefentry>
diff --git a/server/man/sssd.conf.5.xml b/server/man/sssd.conf.5.xml
index 4ebcb764..7b240c8f 100644
--- a/server/man/sssd.conf.5.xml
+++ b/server/man/sssd.conf.5.xml
@@ -245,7 +245,7 @@
                     <term>enum_cache_timeout (integer)</term>
                     <listitem>
                         <para>
-                            How long should nss_sss cache enumerations
+                            How many seconds should nss_sss cache enumerations
                             (requests for info about all users)
                         </para>
                         <para>
@@ -440,8 +440,8 @@
                     <term>entry_cache_timeout (integer)</term>
                     <listitem>
                         <para>
-                            How long should nss_sss consider entries valid
-                            before asking the backend again
+                            How many seconds should nss_sss consider
+                            entries valid before asking the backend again
                         </para>
                         <para>
                             Default: 600
@@ -461,18 +461,6 @@
                     </listitem>
                 </varlistentry>
 
-                <varlistentry>
-                    <term>store_legacy_passwords (bool)</term>
-                    <listitem>
-                        <para>
-                            Whether to also store passwords in a legacy domain
-                        </para>
-                        <para>
-                            Default: FALSE
-                        </para>
-                    </listitem>
-                </varlistentry>
-
                 <varlistentry>
                     <term>id_provider (string)</term>
                     <listitem>
@@ -757,10 +745,9 @@
             documentation on configuring domains for more details.
 <programlisting>
 [sssd]
-domains = LOCAL
+domains = LDAP
 services = nss, pam
 config_file_version = 2
-sbus_timeout = 30
 
 [nss]
 filter_groups = root
@@ -768,11 +755,18 @@ filter_users = root
 
 [pam]
 
-[domain/LOCAL]
-id_provider = local
-min_id = 1000
-max_id = 5000
-default_shell = /bin/ksh
+[domain/LDAP]
+id_provider = ldap
+ldap_uri = ldap://ldap.example.com
+ldap_search_base = dc=example,dc=com
+
+auth_provider = krb5
+krb5_kdcip = kerberos.example.com
+krb5_realm = EXAMPLE.COM
+cache_credentials = true
+
+min_id = 10000
+max_id = 20000
 enumerate = true
 </programlisting>
         </para>
@@ -781,9 +775,6 @@ enumerate = true
     <refsect1 id='see_also'>
         <title>SEE ALSO</title>
         <para>
-            <citerefentry>
-                <refentrytitle>sssd.conf</refentrytitle><manvolnum>5</manvolnum>
-            </citerefentry>,
             <citerefentry>
                 <refentrytitle>sssd-ldap</refentrytitle><manvolnum>5</manvolnum>
             </citerefentry>,
-- 
cgit