summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2012-03-14 19:55:49 +0000
committerGreg Hudson <ghudson@mit.edu>2012-03-14 19:55:49 +0000
commit905003f708036fd9c5d0669312e3d244b2dbfc1a (patch)
tree1bf19173472aa1ec7ae11d270ed7b6c17591fb2f /doc
parent0bb72611892782381e7c73e1a4481d9b2e503f9f (diff)
downloadkrb5-905003f708036fd9c5d0669312e3d244b2dbfc1a.tar.gz
krb5-905003f708036fd9c5d0669312e3d244b2dbfc1a.tar.xz
krb5-905003f708036fd9c5d0669312e3d244b2dbfc1a.zip
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
Diffstat (limited to 'doc')
-rw-r--r--doc/rst_source/krb_users/index.rst1
-rw-r--r--doc/rst_source/krb_users/user_commands/index.rst4
-rw-r--r--doc/rst_source/krb_users/user_config/index.rst12
-rw-r--r--doc/rst_source/krb_users/user_config/k5identity.rst (renamed from doc/rst_source/krb_users/user_commands/k5identity.rst)0
-rw-r--r--doc/rst_source/krb_users/user_config/k5login.rst (renamed from doc/rst_source/krb_users/user_commands/k5login.rst)0
5 files changed, 13 insertions, 4 deletions
diff --git a/doc/rst_source/krb_users/index.rst b/doc/rst_source/krb_users/index.rst
index c2baf97da1..ef653dd92e 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 7cb1ed49fa..97f57b7a63 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 0000000000..6b3d4393bd
--- /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
index 5dbdff2b4a..5dbdff2b4a 100644
--- a/doc/rst_source/krb_users/user_commands/k5identity.rst
+++ b/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
index bf607f7892..bf607f7892 100644
--- a/doc/rst_source/krb_users/user_commands/k5login.rst
+++ b/doc/rst_source/krb_users/user_config/k5login.rst