[#644,!370] Manual apply of 85c5b01d694c995f6e93c0454ee6e0031fc75d83

diff --git a/doc/sphinx/arm/ddns.rst b/doc/sphinx/arm/ddns.rst
index c3399a679121556552696bed9f537cfd58fd1a06..5e496ce4cf36c9355d29156667e43f66e6020818 100644 (file)
--- a/doc/sphinx/arm/ddns.rst
+++ b/doc/sphinx/arm/ddns.rst
@@ -141,10 +141,10 @@ Upon startup, the module will load its configuration and begin listening
 for NCRs based on that configuration.
 
 During startup, the server will attempt to create a PID file of the form:
-[**localstatedir**]/[**conf name**].kea-dhcp-ddns.pid where:
+[**runstatedir**]/[**conf name**].kea-dhcp-ddns.pid where:
 
--  ``localstatedir`` - is the value as passed into the build configure
-   script; it defaults to "/usr/local/var". Note that this value may be
+-  ``runstatedir`` - is the value as passed into the build configure
+   script; it defaults to "/usr/local/var/run". Note that this value may be
    overridden at runtime by setting the environment variable
    KEA_PIDFILE_DIR. This is intended primarily for testing purposes.
 

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index b91c99b2a6074e7f35a28966c8becc032c4c588e..949b1e71e26fefdca70ba9a3e3e2c6e912087fb1 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -58,10 +58,10 @@ configuration file. Since the DHCPv4 server opens privileged ports, it
 requires root access. This daemon must be run as root.
 
 During startup, the server will attempt to create a PID file of the
-form: [localstatedir]/[conf name].kea-dhcp4.pid where:
+form: [runstatedir]/[conf name].kea-dhcp4.pid where:
 
--  ``localstatedir``: The value as passed into the build configure
-   script; it defaults to "/usr/local/var". Note that this value may be
+-  ``runstatedir``: The value as passed into the build configure
+   script; it defaults to "/usr/local/var/run". Note that this value may be
    overridden at runtime by setting the environment variable
    KEA_PIDFILE_DIR, although this is intended primarily for testing
    purposes.

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index b9d3472b04475c7f1424fa64036702732326af75..1a2cb2f7d2d2dc66e6e68c085ce64e9c080a0e93 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -58,10 +58,10 @@ configuration file. Since the DHCPv6 server opens privileged ports, it
 requires root access. This daemon must be run as root.
 
 During startup, the server will attempt to create a PID file of the
-form: [**localstatedir**]/[**conf name**].kea-dhcp6.pid where:
+form: [**runstatedir**]/[**conf name**].kea-dhcp6.pid where:
 
--  ``localstatedir``: The value as passed into the build configure
-   script; it defaults to "/usr/local/var". Note that this value may be
+-  ``runstatedir``: The value as passed into the build configure
+   script; it defaults to "/usr/local/var/run". Note that this value may be
    overridden at runtime by setting the environment variable
    KEA_PIDFILE_DIR, although this is intended primarily for testing
    purposes.