From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 22 Mar 2012 17:28:42 +0000 (+0000)
Subject: Miscellaneous small edits to RST docs
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=84ebeb7e08f4486393c890772fbd87e6b956205b;p=krb5.git

Miscellaneous small edits to RST docs

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

diff --git a/doc/rst_source/krb_admins/install_appl_srv.rst b/doc/rst_source/krb_admins/install_appl_srv.rst
index 9e76e2074..149050098 100644
--- a/doc/rst_source/krb_admins/install_appl_srv.rst
+++ b/doc/rst_source/krb_admins/install_appl_srv.rst
@@ -44,16 +44,17 @@ pop, the administrator ``joeadmin`` would issue the command (on
 ``trillium.mit.edu``)::
 
     trillium% kadmin
-    kadmin5: ktadd host/trillium.mit.edu ftp/trillium.mit.edu pop/trillium.mit.edu
+    kadmin5: ktadd host/trillium.mit.edu ftp/trillium.mit.edu
+        pop/trillium.mit.edu
     kadmin: Entry for principal host/trillium.mit.edu@ATHENA.MIT.EDU with
-    kvno 3, encryption type DES-CBC-CRC added to keytab
-    WRFILE:/etc/krb5.keytab.
+        kvno 3, encryption type DES-CBC-CRC added to keytab
+        FILE:/etc/krb5.keytab.
     kadmin: Entry for principal ftp/trillium.mit.edu@ATHENA.MIT.EDU with
-    kvno 3, encryption type DES-CBC-CRC added to keytab
-    WRFILE:/etc/krb5.keytab.
+        kvno 3, encryption type DES-CBC-CRC added to keytab
+        FILE:/etc/krb5.keytab.
     kadmin: Entry for principal pop/trillium.mit.edu@ATHENA.MIT.EDU with
-    kvno 3, encryption type DES-CBC-CRC added to keytab
-    WRFILE:/etc/krb5.keytab.
+        kvno 3, encryption type DES-CBC-CRC added to keytab
+        FILE:/etc/krb5.keytab.
     kadmin5: quit
     trillium%
 
diff --git a/doc/rst_source/krb_admins/install_kdc.rst b/doc/rst_source/krb_admins/install_kdc.rst
index 1b9c899b4..6b8e0a31d 100644
--- a/doc/rst_source/krb_admins/install_kdc.rst
+++ b/doc/rst_source/krb_admins/install_kdc.rst
@@ -122,7 +122,7 @@ An example kdc.conf file::
             master_key_type = aes256-cts
             supported_enctypes = aes256-cts:normal aes128-cts:normal
             # If the default location does not suit your setup,
-            # explicitly configure the following four values:
+            # explicitly configure the following values:
             #    database_name = /var/krb5kdc/principal
             #    key_stash_file = /var/krb5kdc/.k5.ATHENA.MIT.EDU
             #    acl_file = /var/krb5kdc/kadm5.acl
@@ -450,7 +450,7 @@ the :ref:`kpropd(8)` daemon.  You must explicitly specify the
 principals which are allowed to provide Kerberos dump updates on the
 slave machine with a new database.  Create a file named kpropd.acl in
 the KDC state directory containing the ``host`` principals for each of
-the KDCs:
+the KDCs::
 
     host/kerberos.mit.edu@ATHENA.MIT.EDU
     host/kerberos-1.mit.edu@ATHENA.MIT.EDU
@@ -463,7 +463,7 @@ the KDCs:
           slave KDCs.
 
 Then, add the following line to ``/etc/inetd.conf`` on each KDC
-(Adjust the path to kpropd)::
+(adjust the path to kpropd)::
 
     krb5_prop stream tcp nowait root /usr/local/sbin/kpropd kpropd
 
diff --git a/doc/rst_source/krb_build/osconf.rst b/doc/rst_source/krb_build/osconf.rst
index d78713033..22ee6804e 100644
--- a/doc/rst_source/krb_build/osconf.rst
+++ b/doc/rst_source/krb_build/osconf.rst
@@ -18,9 +18,6 @@ interesting variables.
 **DEFAULT_KDC_ENCTYPE**
     The default encryption type for the KDC database master key.  The
     default value is |defmkey|.
-**KDCRCACHE**
-    The name of the replay cache used by the KDC.  The default value
-    is ``krb5kdc_rcache``.
 **RCTMPDIR**
     The directory which stores replay caches.  The default is
     ``/var/tmp``.