From: Jeremy C. Reed Date: Mon, 11 Aug 2014 19:54:29 +0000 (+0000) Subject: just keep sentence together X-Git-Tag: trac3482_base~41^2~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e421bf275059998283f312f3d968275a8b6ea6a;p=thirdparty%2Fkea.git just keep sentence together versus splitting sentence with example in middle. This is just my style preference. While doing this fix the explanation for enabling mysql and postgres as previously it appeared to imply that you had to specify the path to the config script (but first example didn't follow what was stated). --- diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 1d9d05f450..1dca48804a 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -247,7 +247,9 @@ url="http://jsonviewer.stack.hu/"/>. parameters. Let's comment this out When default parameters are used, the Memfile backend will write leases to a disk in the [kea-install-dir]/var/kea/kea-leases4.csv. --> - The following configuration: + The following configuration sets the name of the lease file to + /tmp/kea-leases4.csv: + "Dhcp4": { "lease-database": { @@ -258,7 +260,6 @@ url="http://jsonviewer.stack.hu/"/>. ... } - ...sets the name of the lease file to /tmp/kea-leases4.csv. The "persist" parameter controls whether the leases are written to disk. diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 84099542da..ceb68fc2a7 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -254,7 +254,9 @@ JSON validator is available at . parameters. Let's comment this out When default parameters are used, the Memfile backend will write leases to a disk in the [kea-install-dir]/var/kea/kea-leases4.csv. --> - The following configuration: + The following configuration sets the name of the lease file to + /tmp/kea-leases6.csv: + "Dhcp6": { "lease-database": { @@ -265,7 +267,6 @@ JSON validator is available at . ... } - ...sets the name of the lease file to /tmp/kea-leases6.csv. The "persist" parameter controls whether the leases are written to disk. diff --git a/doc/guide/install.xml b/doc/guide/install.xml index 9627d852dd..7cd5d5553a 100644 --- a/doc/guide/install.xml +++ b/doc/guide/install.xml @@ -448,14 +448,12 @@ Debian and Ubuntu: Build and install Kea as described in , with - the following modification: to enable the MySQL database code, at the - "configure" step (see ), specify the location of the - MySQL configuration program "mysql_config" with the "--with-dhcp-mysql" switch, - i.e. + the following modification. To enable the MySQL database code, at the + "configure" step (see ), do: ./configure [other-options] --with-dhcp-mysql - ...if MySQL was installed in the default location, or: + Or specify the location of the MySQL configuration program + "mysql_config" if MySQL was not installed in the default location: ./configure [other-options] --with-dhcp-mysql=path-to-mysql_config - ...if not.
@@ -474,7 +472,8 @@ mysql> 2. Create the database: mysql> CREATE DATABASE database-name; - ... database-name is the name you have chosen for the database. + (database-name is the name you + have chosen for the database.) 3. Create the database tables by running the dhcpdb_create.mysql script supplied as part of Kea: @@ -503,14 +502,13 @@ $ Build and install Kea as described in , with - the following modification: to enable the PostgreSQL database code, at the - "configure" step (see ), specify the location of the - PostgreSQL configuration program "pg_config" with the "--with-dhcp-pgsql" switch, - i.e. + the following modification. To enable the PostgreSQL database code, at the + "configure" step (see ), do: ./configure [other-options] --with-dhcp-pgsql - ...if PostgreSQL was installed in the default location, or: + Or specify the location of the PostgreSQL configuration + program "pg_config" if PostgreSQL was not installed in + the default location: ./configure [other-options] --with-dhcp-pgsql=path-to-pg_config - ...if not.
@@ -533,7 +531,8 @@ postgres=# CREATE DATABASE database-name;< CREATE DATABASE postgres=# - ... database-name is the name you have chosen for the database. + (database-name is the name you + have chosen for the database.) 3. Create the user under which Kea will access the database (and give it a password), then grant it access to the database: diff --git a/doc/guide/keactrl.xml b/doc/guide/keactrl.xml index 334ec14ae1..3befae5805 100644 --- a/doc/guide/keactrl.xml +++ b/doc/guide/keactrl.xml @@ -214,23 +214,23 @@ keactrl configuration file: /usr/local/etc/kea/keactrl.conf The optional -s switch allows the selection of the servers to which keactrl - command is issued. For example, + command is issued. For example, the following + instructs keactrl to stop the + kea-dhcp4 and kea-dhcp6 servers + and leave the kea-dhcp-ddns server running: $ keactrl stop -s dhcp4,dhcp6 - ... instructs keactrl to stop the - kea-dhcp4 and kea-dhcp6 servers - and leave the kea-dhcp-ddns running. - Similarly, + Similarly, the following + will only start the kea-dhcp4 and + kea-dhcp-ddns servers and not + kea-dhcp6. $ keactrl start -s dhcp4,dhcp_ddns - ... will only start the kea-dhcp4 and - kea-dhcp-ddns servers and not - kea-dhcp6. Note that the behavior of the -s switch