From: Nicolas Williams <nico@cryptonector.com>
Date: Mon, 24 Sep 2012 15:24:54 +0000 (-0500)
Subject: Correct docs re: kpropd usage w/ iprop
X-Git-Tag: krb5-1.11-alpha1~138
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a50490ed48050e7a6d061553a6b610dc979aa2b;p=thirdparty%2Fkrb5.git

Correct docs re: kpropd usage w/ iprop

ticket: 7379
---

diff --git a/doc/rst_source/krb_admins/admin_commands/kpropd.rst b/doc/rst_source/krb_admins/admin_commands/kpropd.rst
index 555ec3cfa4..8f048b5b4b 100644
--- a/doc/rst_source/krb_admins/admin_commands/kpropd.rst
+++ b/doc/rst_source/krb_admins/admin_commands/kpropd.rst
@@ -32,16 +32,17 @@ Kerberos server to use :ref:`kprop(8)` to propagate its database to
 the slave servers.  Upon a successful download of the KDC database
 file, the slave Kerberos server will have an up-to-date KDC database.
 
-Normally, kpropd is invoked out of inetd(8).  This is done by adding
-a line to the ``/etc/inetd.conf`` file which looks like this:
+Where incremental propagation is not used, kpropd is commonly invoked
+out of inetd(8) as a nowait service.  This is done by adding a line to
+the ``/etc/inetd.conf`` file which looks like this:
 
  ::
 
     kprop  stream  tcp  nowait  root  /usr/local/sbin/kpropd  kpropd
 
-kpropd can also run as a standalone daemon by specifying the **-S**
-option.  This is done for debugging purposes, or if for some reason
-the system administrator just doesn't want to run it out of inetd(8).
+kpropd can also run as a standalone daemon.  This is required for
+incremental propagation.  But this is also useful for debugging
+purposes.
 
 Incremental propagation may be enabled with the **iprop_enable**
 variable in :ref:`kdc.conf(5)`.  If incremental propagation is
diff --git a/doc/rst_source/krb_admins/install_kdc.rst b/doc/rst_source/krb_admins/install_kdc.rst
index c43e4161f6..3d0d0f1f44 100644
--- a/doc/rst_source/krb_admins/install_kdc.rst
+++ b/doc/rst_source/krb_admins/install_kdc.rst
@@ -378,8 +378,8 @@ used)::
 
 Restart inetd daemon.
 
-Alternatively, start :ref:`kpropd(8)` as a stand-alone daemon with
-``kpropd -S``.
+Alternatively, start :ref:`kpropd(8)` as a stand-alone daemon.  This is
+required when incremental propagation is enabled.
 
 Now that the slave KDC is able to accept database propagation, you’ll
 need to propagate the database from the master server.