From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 14 Mar 2012 19:55:49 +0000 (+0000)
Subject: Add config file section in RST user guide
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=905003f708036fd9c5d0669312e3d244b2dbfc1a;p=krb5.git

Add config file section in RST user guide

Move the .k5identity and .k5login man pages to a separate section from
user commands.  Also, kadmin.local and k5srvutil are not user-oriented
commands, so don't link to them in the user_commands index.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25767 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/doc/rst_source/krb_users/index.rst b/doc/rst_source/krb_users/index.rst
index c2baf97da..ef653dd92 100644
--- a/doc/rst_source/krb_users/index.rst
+++ b/doc/rst_source/krb_users/index.rst
@@ -17,4 +17,5 @@ Contents
 
    pwd_mgmt.rst
    tkt_mgmt.rst
+   user_config/index.rst
    user_commands/index.rst
diff --git a/doc/rst_source/krb_users/user_commands/index.rst b/doc/rst_source/krb_users/user_commands/index.rst
index 7cb1ed49f..97f57b7a6 100644
--- a/doc/rst_source/krb_users/user_commands/index.rst
+++ b/doc/rst_source/krb_users/user_commands/index.rst
@@ -18,9 +18,5 @@ User commands
    kpasswd.rst
    kvno.rst
    ksu.rst
-   k5login.rst
-   k5identity.rst
-   ../../krb_admins/admin_commands/kadmin_local.rst
-   ../../krb_admins/admin_commands/k5srvutil.rst
    sclient.rst
    send-pr.rst
diff --git a/doc/rst_source/krb_users/user_config/index.rst b/doc/rst_source/krb_users/user_config/index.rst
new file mode 100644
index 000000000..6b3d4393b
--- /dev/null
+++ b/doc/rst_source/krb_users/user_config/index.rst
@@ -0,0 +1,12 @@
+User config files
+=================
+
+The following files in your home directory can be used to control the
+behavior of Kerberos as it applies to your account (unless they have
+been disabled by your host's configuration):
+
+.. toctree::
+   :maxdepth: 1
+
+   k5login.rst
+   k5identity.rst
diff --git a/doc/rst_source/krb_users/user_commands/k5identity.rst b/doc/rst_source/krb_users/user_config/k5identity.rst
similarity index 100%
rename from doc/rst_source/krb_users/user_commands/k5identity.rst
rename to doc/rst_source/krb_users/user_config/k5identity.rst
diff --git a/doc/rst_source/krb_users/user_commands/k5login.rst b/doc/rst_source/krb_users/user_config/k5login.rst
similarity index 100%
rename from doc/rst_source/krb_users/user_commands/k5login.rst
rename to doc/rst_source/krb_users/user_config/k5login.rst