Commit 48cdc9a1 authored by Shawn Routhier's avatar Shawn Routhier
Browse files

[trac4282] Tidy up some grammar and typo level items

parent c79649b0
...@@ -574,13 +574,13 @@ $ <userinput>kea-admin lease-init pgsql -u <replaceable>database-user</replaceab ...@@ -574,13 +574,13 @@ $ <userinput>kea-admin lease-init pgsql -u <replaceable>database-user</replaceab
<section id="pgsql-upgrade"> <section id="pgsql-upgrade">
<title>Upgrading a PostgreSQL Database from an Earlier Version of Kea</title> <title>Upgrading a PostgreSQL Database from an Earlier Version of Kea</title>
<para> <para>
PostgreSQL database schema can be upgraded using the same tool and The PostgreSQL database schema can be upgraded using the same tool and
commands as described in <xref linkend="mysql-upgrade"/>, with an commands as described in <xref linkend="mysql-upgrade"/>, with the
exception that the "pgsql" database backend type must be used in exception that the "pgsql" database backend type must be used in
those commands. the commands.
</para> </para>
<para> <para>
Use the following command to check current schema version: Use the following command to check the current schema version:
<screen> <screen>
$ <userinput>kea-admin lease-version pgsql -u <replaceable>database-user</replaceable> -p <replaceable>database-password</replaceable> -n <replaceable>database-name</replaceable></userinput> $ <userinput>kea-admin lease-version pgsql -u <replaceable>database-user</replaceable> -p <replaceable>database-password</replaceable> -n <replaceable>database-name</replaceable></userinput>
</screen> </screen>
......
...@@ -482,21 +482,21 @@ If a timeout is given though, it should be an integer greater than zero. ...@@ -482,21 +482,21 @@ If a timeout is given though, it should be an integer greater than zero.
<title id="hosts4-storage">Hosts Storage</title> <title id="hosts4-storage">Hosts Storage</title>
<para>Kea is also able to store information about host reservations in the <para>Kea is also able to store information about host reservations in the
database. Hosts database configuration uses the same syntax as lease database. The hosts database configuration uses the same syntax as the lease
database. In fact, Kea server opens independent connections for each database. In fact, a Kea server opens independent connections for each
purpose, be it lease or hosts information. This gives the solution most purpose, be it lease or hosts information. This arrangement gives the most
flexibility. Kea can be used to keep leases and host reservations flexibility. Kea can be used to keep leases and host reservations
separately, but can also point to the same database. Currently the separately, but can also point to the same database. Currently the
supported hosts database types are MySQL and PostgreSQL. Cassandra supported hosts database types are MySQL and PostgreSQL. Cassandra
backend does not support host reservations yet.</para> backend does not support host reservations yet.</para>
<para>Please note that usage of hosts storage is optional. User can define <para>Please note that usage of hosts storage is optional. A user can define
all host reservations in the configuration file. That is the recommended way all host reservations in the configuration file. That is the recommended way
if the number of reservations is small. However, with the number of if the number of reservations is small. However, when the number of
reservations growing it's more convenient to use host storage. Please note reservations grows it's more convenient to use host storage. Please note
that two storages (configuration file and one of the supported databases) that both storage methods (configuration file and one of the supported databases)
can be used together. If hosts are defined in both places, the definitions can be used together. If hosts are defined in both places, the definitions
from configuration file are checked first and external storage is checked from the configuration file are checked first and external storage is checked
later, if necessary.</para> later, if necessary.</para>
<section id="hosts-database-configuration4"> <section id="hosts-database-configuration4">
...@@ -514,7 +514,7 @@ If a timeout is given though, it should be an integer greater than zero. ...@@ -514,7 +514,7 @@ If a timeout is given though, it should be an integer greater than zero.
<screen> <screen>
"Dhcp4": { "hosts-database": { <userinput>"name": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... } "Dhcp4": { "hosts-database": { <userinput>"name": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... }
</screen> </screen>
If the database is located on a different system to the DHCPv4 server, the If the database is located on a different system than the DHCPv4 server, the
database host name must also be specified (although it should be noted that this database host name must also be specified (although it should be noted that this
configuration may have a severe impact on server performance): configuration may have a severe impact on server performance):
<screen> <screen>
......
...@@ -482,21 +482,21 @@ If a timeout is given though, it should be an integer greater than zero. ...@@ -482,21 +482,21 @@ If a timeout is given though, it should be an integer greater than zero.
<section id="hosts6-storage"> <section id="hosts6-storage">
<title>Hosts Storage</title> <title>Hosts Storage</title>
<para>Kea is also able to store information about host reservations in the <para>Kea is also able to store information about host reservations in the
database. Hosts database configuration uses the same syntax as lease database. The hosts database configuration uses the same syntax as the lease
database. In fact, Kea server opens independent connections for each database. In fact, a Kea server opens independent connections for each
purpose, be it lease or hosts information. This gives the solution most purpose, be it lease or hosts information. This arrangment gives the most
flexibility. Kea can be used to keep leases and host reservations flexibility. Kea can be used to keep leases and host reservations
separately, but can also point to the same database. Currently the separately, but can also point to the same database. Currently the
supported hosts database types are MySQL and PostgreSQL. Cassandra supported hosts database types are MySQL and PostgreSQL. Cassandra
backend does not support host reservations yet.</para> backend does not support host reservations yet.</para>
<para>Please note that usage of hosts storage is optional. User can define <para>Please note that usage of hosts storage is optional. A user can define
all host reservations in the configuration file. That is the recommended way all host reservations in the configuration file. That is the recommended way
if the number of reservations is small. However, with the number of if the number of reservations is small. However, when the number of
reservations growing it's more convenient to use host storage. Please note reservations grows it's more convenient to use host storage. Please note
that both storages (configuration file and one of the supported databases) that both storage methods (configuration file and one of the supported databases)
can be used together. If hosts are defined in both places, the definitions can be used together. If hosts are defined in both places, the definitions
from configuration file are checked first and external storage is checked from the configuration file are checked first and external storage is checked
later, if necessary.</para> later, if necessary.</para>
<section id="hosts-database-configuration6"> <section id="hosts-database-configuration6">
...@@ -514,7 +514,7 @@ If a timeout is given though, it should be an integer greater than zero. ...@@ -514,7 +514,7 @@ If a timeout is given though, it should be an integer greater than zero.
<screen> <screen>
"Dhcp6": { "hosts-database": { <userinput>"name": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... } "Dhcp6": { "hosts-database": { <userinput>"name": "<replaceable>database-name</replaceable>" </userinput>, ... }, ... }
</screen> </screen>
If the database is located on a different system to the DHCPv6 server, the If the database is located on a different system than the DHCPv6 server, the
database host name must also be specified (although it should be noted that this database host name must also be specified (although it should be noted that this
configuration may have a severe impact on server performance): configuration may have a severe impact on server performance):
<screen> <screen>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment