Commit 44c78206 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰

[github39] Merge branch 'docbook-upgrade' of https://github.com/andreipavelQ/kea into github39

 - improvements required (__VERSION__ macro omitted)
 - the patch tried to reverse some texts back to 1.1.0 (we're now at 1.3.0)
 - there were many conflicts...

# Conflicts:
#	doc/guide/admin.xml
#	doc/guide/ctrl-channel.xml
#	doc/guide/ddns.xml
#	doc/guide/dhcp4-srv.xml
#	doc/guide/dhcp6-srv.xml
#	doc/guide/install.xml
#	doc/guide/intro.xml
#	doc/guide/kea-guide.xml
#	src/bin/admin/kea-admin.xml
#	src/bin/agent/kea-ctrl-agent.xml
#	src/bin/d2/kea-dhcp-ddns.xml
#	src/bin/dhcp4/kea-dhcp4.xml
#	src/bin/dhcp6/kea-dhcp6.xml
#	src/bin/keactrl/keactrl.xml
#	src/bin/lfc/kea-lfc.xml
#	src/bin/perfdhcp/perfdhcp.xml
#	src/bin/shell/kea-shell.xml
#	src/bin/sockcreator/kea-sockcreator.xml
parents ecf3ea4b 00f4b5b0
<?xml version="1.0" encoding="UTF-8"?> <!--
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -
<!ENTITY mdash "&#x2014;" > - This Source Code Form is subject to the terms of the Mozilla Public
]> - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
<chapter id="admin"> -->
<!-- Converted by db4-upgrade version 1.1 -->
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="admin">
<title>Kea Database Administration</title> <title>Kea Database Administration</title>
<section id="kea-database-version"> <section xml:id="kea-database-version">
<title>Databases and Database Version Numbers</title> <title>Databases and Database Version Numbers</title>
<para> <para>
...@@ -52,7 +55,7 @@ ...@@ -52,7 +55,7 @@
</para> </para>
</section> </section>
<section id="kea-admin"> <section xml:id="kea-admin">
<title>The kea-admin Tool</title> <title>The kea-admin Tool</title>
<para> <para>
...@@ -71,7 +74,7 @@ ...@@ -71,7 +74,7 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<simpara> <simpara>
<command>lease-init</command> &mdash; <command>lease-init</command>
Initializes a new lease database. This is useful during a new Initializes a new lease database. This is useful during a new
Kea installation. The database is initialized to the Kea installation. The database is initialized to the
latest version supported by the version of the software being latest version supported by the version of the software being
...@@ -81,7 +84,7 @@ ...@@ -81,7 +84,7 @@
<listitem> <listitem>
<simpara> <simpara>
<command>lease-version</command> &mdash; <command>lease-version</command>
Reports the lease database version number. This is Reports the lease database version number. This is
not necessarily equal to the Kea version number as not necessarily equal to the Kea version number as
each backend has its own versioning scheme. each backend has its own versioning scheme.
...@@ -90,7 +93,7 @@ ...@@ -90,7 +93,7 @@
<listitem> <listitem>
<simpara> <simpara>
<command>lease-upgrade</command> &mdash; <command>lease-upgrade</command>
Conducts a lease database upgrade. This is useful when Conducts a lease database upgrade. This is useful when
upgrading Kea. upgrading Kea.
</simpara> </simpara>
...@@ -98,7 +101,7 @@ ...@@ -98,7 +101,7 @@
<listitem> <listitem>
<simpara> <simpara>
<command>lease-dump</command> &mdash; <command>lease-dump</command>
Dumps the contents of the lease database (for MySQL, PostgreSQL or Dumps the contents of the lease database (for MySQL, PostgreSQL or
CQL backends) to a CSV (comma separated values) text file. The first CQL backends) to a CSV (comma separated values) text file. The first
line of the file contains the column names. This is meant to be line of the file contains the column names. This is meant to be
...@@ -114,28 +117,28 @@ ...@@ -114,28 +117,28 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<simpara> <simpara>
<command>memfile</command> &mdash; Lease information is <command>memfile</command> Lease information is
stored on disk in a text file. stored on disk in a text file.
</simpara> </simpara>
</listitem> </listitem>
<listitem> <listitem>
<simpara> <simpara>
<command>mysql</command> &mdash; <command>mysql</command>
Lease information is stored in a MySQL relational database. Lease information is stored in a MySQL relational database.
</simpara> </simpara>
</listitem> </listitem>
<listitem> <listitem>
<simpara> <simpara>
<command>pgsql</command> &mdash; <command>pgsql</command>
Lease information is stored in a PostgreSQL relational database. Lease information is stored in a PostgreSQL relational database.
</simpara> </simpara>
</listitem> </listitem>
<listitem> <listitem>
<simpara> <simpara>
<command>cql</command> &mdash; <command>cql</command>
Lease information is stored in a CQL database. Lease information is stored in a CQL database.
</simpara> </simpara>
</listitem> </listitem>
...@@ -149,7 +152,7 @@ ...@@ -149,7 +152,7 @@
</para> </para>
</section> </section>
<section id="supported-databases"> <section xml:id="supported-databases">
<title>Supported Databases</title> <title>Supported Databases</title>
<para>The following table presents the capabilities of available <para>The following table presents the capabilities of available
...@@ -158,7 +161,7 @@ ...@@ -158,7 +161,7 @@
backend may be essential for success or failure of your deployment.</para> backend may be essential for success or failure of your deployment.</para>
<para> <para>
<table frame="all" id="backends"> <table frame="all" xml:id="backends">
<title>List of available backends</title> <title>List of available backends</title>
<tgroup cols='5'> <tgroup cols='5'>
<colspec colname='feature'/> <colspec colname='feature'/>
...@@ -240,7 +243,7 @@ ...@@ -240,7 +243,7 @@
present. Necessary disk write permission is required. present. Necessary disk write permission is required.
</para> </para>
<section id="memfile-upgrade"> <section xml:id="memfile-upgrade">
<title>Upgrading Memfile Lease Files from an Earlier Version of Kea</title> <title>Upgrading Memfile Lease Files from an Earlier Version of Kea</title>
<para> <para>
There are no special steps required to upgrade memfile lease files There are no special steps required to upgrade memfile lease files
...@@ -273,7 +276,7 @@ ...@@ -273,7 +276,7 @@
if you chose to store the data in other backends. if you chose to store the data in other backends.
</para> </para>
<section id="mysql-database-create"> <section xml:id="mysql-database-create">
<title>First Time Creation of the MySQL Database</title> <title>First Time Creation of the MySQL Database</title>
<para> <para>
...@@ -294,7 +297,7 @@ ...@@ -294,7 +297,7 @@
<screen> <screen>
$ <userinput>mysql -u root -p</userinput> $ <userinput>mysql -u root -p</userinput>
Enter password: Enter password:
mysql> mysql&gt;
</screen> </screen>
</para> </para>
</listitem> </listitem>
...@@ -303,7 +306,7 @@ mysql> ...@@ -303,7 +306,7 @@ mysql>
<para> <para>
Create the MySQL database: Create the MySQL database:
<screen> <screen>
mysql> <userinput>CREATE DATABASE <replaceable>database-name</replaceable>;</userinput> mysql&gt; <userinput>CREATE DATABASE <replaceable>database-name</replaceable>;</userinput>
</screen> </screen>
(<replaceable>database-name</replaceable> is the name (<replaceable>database-name</replaceable> is the name
you have chosen for the database.) you have chosen for the database.)
...@@ -316,8 +319,8 @@ mysql> <userinput>CREATE DATABASE <replaceable>database-name</replaceable>;</use ...@@ -316,8 +319,8 @@ mysql> <userinput>CREATE DATABASE <replaceable>database-name</replaceable>;</use
(and give it a password), then grant it access to the (and give it a password), then grant it access to the
database tables: database tables:
<screen> <screen>
mysql> <userinput>CREATE USER '<replaceable>user-name</replaceable>'@'localhost' IDENTIFIED BY '<replaceable>password</replaceable>';</userinput> mysql&gt; <userinput>CREATE USER '<replaceable>user-name</replaceable>'@'localhost' IDENTIFIED BY '<replaceable>password</replaceable>';</userinput>
mysql> <userinput>GRANT ALL ON <replaceable>database-name</replaceable>.* TO '<replaceable>user-name</replaceable>'@'localhost';</userinput> mysql&gt; <userinput>GRANT ALL ON <replaceable>database-name</replaceable>.* TO '<replaceable>user-name</replaceable>'@'localhost';</userinput>
</screen> </screen>
(<replaceable>user-name</replaceable> and (<replaceable>user-name</replaceable> and
<replaceable>password</replaceable> are the user ID <replaceable>password</replaceable> are the user ID
...@@ -334,8 +337,8 @@ mysql> <userinput>GRANT ALL ON <replaceable>database-name</replaceable>.* TO '<r ...@@ -334,8 +337,8 @@ mysql> <userinput>GRANT ALL ON <replaceable>database-name</replaceable>.* TO '<r
the tables using the <command>kea-admin</command> tool, the tables using the <command>kea-admin</command> tool,
as explained below.) To do this: as explained below.) To do this:
<screen> <screen>
mysql> <userinput>CONNECT <replaceable>database-name</replaceable>;</userinput> mysql&gt; <userinput>CONNECT <replaceable>database-name</replaceable>;</userinput>
mysql> <userinput>SOURCE <replaceable>path-to-kea</replaceable>/share/kea/scripts/mysql/dhcpdb_create.mysql</userinput> mysql&gt; <userinput>SOURCE <replaceable>path-to-kea</replaceable>/share/kea/scripts/mysql/dhcpdb_create.mysql</userinput>
</screen> </screen>
(<replaceable>path-to-kea</replaceable> is the (<replaceable>path-to-kea</replaceable> is the
location where you installed Kea.) location where you installed Kea.)
...@@ -346,7 +349,7 @@ mysql> <userinput>SOURCE <replaceable>path-to-kea</replaceable>/share/kea/script ...@@ -346,7 +349,7 @@ mysql> <userinput>SOURCE <replaceable>path-to-kea</replaceable>/share/kea/script
<para> <para>
Exit MySQL: Exit MySQL:
<screen> <screen>
mysql> <userinput>quit</userinput> mysql&gt; <userinput>quit</userinput>
Bye Bye
$ $
</screen> </screen>
...@@ -371,7 +374,7 @@ $ <userinput>kea-admin lease-init mysql -u <replaceable>database-user</replaceab ...@@ -371,7 +374,7 @@ $ <userinput>kea-admin lease-init mysql -u <replaceable>database-user</replaceab
</para> </para>
</section> </section>
<section id="mysql-upgrade"> <section xml:id="mysql-upgrade">
<title>Upgrading a MySQL Database from an Earlier Version of Kea</title> <title>Upgrading a MySQL Database from an Earlier Version of Kea</title>
<para> <para>
...@@ -416,7 +419,7 @@ $ <userinput>kea-admin lease-upgrade mysql -u <replaceable>database-user</replac ...@@ -416,7 +419,7 @@ $ <userinput>kea-admin lease-upgrade mysql -u <replaceable>database-user</replac
safely ignored if you are using other database backends. safely ignored if you are using other database backends.
</para> </para>
<section id="pgsql-database-create"> <section xml:id="pgsql-database-create">
<title>First Time Creation of the PostgreSQL Database</title> <title>First Time Creation of the PostgreSQL Database</title>
<para> <para>
...@@ -565,7 +568,7 @@ $ <userinput>kea-admin lease-init pgsql -u <replaceable>database-user</replaceab ...@@ -565,7 +568,7 @@ $ <userinput>kea-admin lease-init pgsql -u <replaceable>database-user</replaceab
by <command>kea-admin</command>.) by <command>kea-admin</command>.)
</para> </para>
</section> </section>
<section id="pgsql-upgrade"> <section xml: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>
The PostgreSQL database schema can be upgraded using the same tool and The PostgreSQL database schema can be upgraded using the same tool and
...@@ -603,7 +606,7 @@ $ <userinput>kea-admin lease-upgrade pgsql -u <replaceable>database-user</replac ...@@ -603,7 +606,7 @@ $ <userinput>kea-admin lease-upgrade pgsql -u <replaceable>database-user</replac
store the data in other backends. store the data in other backends.
</para> </para>
<section id="cql-database-create"> <section xml:id="cql-database-create">
<title>First Time Creation of the Cassandra Database</title> <title>First Time Creation of the Cassandra Database</title>
<para> <para>
...@@ -628,7 +631,7 @@ $ <userinput>export CQLSH_HOST=localhost</userinput> ...@@ -628,7 +631,7 @@ $ <userinput>export CQLSH_HOST=localhost</userinput>
Log into CQL: Log into CQL:
<screen> <screen>
$ <userinput>cqlsh</userinput> $ <userinput>cqlsh</userinput>
cql> cql&gt;
</screen> </screen>
</para> </para>
</listitem> </listitem>
...@@ -637,7 +640,7 @@ cql> ...@@ -637,7 +640,7 @@ cql>
<para> <para>
Create the CQL keyspace: Create the CQL keyspace:
<screen> <screen>
cql> <userinput>CREATE KEYSPACE keyspace-name WITH replication = {'class' : 'SimpleStrategy','replication_factor' : 1};</userinput> cql&gt; <userinput>CREATE KEYSPACE keyspace-name WITH replication = {'class' : 'SimpleStrategy','replication_factor' : 1};</userinput>
</screen> </screen>
(<replaceable>keyspace-name</replaceable> is the name you have (<replaceable>keyspace-name</replaceable> is the name you have
chosen for the keyspace) chosen for the keyspace)
...@@ -675,7 +678,7 @@ $ <userinput>kea-admin lease-init cql -n <replaceable>database-name</replaceable ...@@ -675,7 +678,7 @@ $ <userinput>kea-admin lease-init cql -n <replaceable>database-name</replaceable
</para> </para>
</section> </section>
<section id="cql-upgrade"> <section xml:id="cql-upgrade">
<title>Upgrading a CQL Database from an Earlier Version of Kea</title> <title>Upgrading a CQL Database from an Earlier Version of Kea</title>
<para> <para>
......
<?xml version="1.0" encoding="UTF-8"?> <!--
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -
<!ENTITY mdash "&#x2017;" > - This Source Code Form is subject to the terms of the Mozilla Public
]> - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
<chapter id="kea-ctrl-agent"> -->
<!-- Converted by db4-upgrade version 1.1 -->
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="kea-ctrl-agent">
<title>Kea Control Agent</title> <title>Kea Control Agent</title>
<section id="agent-overview"> <section xml:id="agent-overview">
<title>Overview</title> <title>Overview</title>
<para>Kea Control Agent (CA) is a daemon, first included in Kea 1.2, which <para>Kea Control Agent (CA) is a daemon, first included in Kea 1.2, which
exposes a RESTful control interface for managing Kea servers. The daemon exposes a RESTful control interface for managing Kea servers. The daemon
...@@ -23,7 +26,7 @@ ...@@ -23,7 +26,7 @@
libraries must implement callouts for 'control_command_receive' hook point. libraries must implement callouts for 'control_command_receive' hook point.
Details about creating new hook libraries and supported hook points can be Details about creating new hook libraries and supported hook points can be
found in found in
<ulink url="https://jenkins.isc.org/job/Kea_doc/doxygen/">Kea Developer's Guide</ulink>. <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://jenkins.isc.org/job/Kea_doc/doxygen/">Kea Developer's Guide</link>.
</para> </para>
<para> <para>
...@@ -54,7 +57,7 @@ ...@@ -54,7 +57,7 @@
</para> </para>
</section> </section>
<section id="agent-configuration"> <section xml:id="agent-configuration">
<title>Configuration</title> <title>Configuration</title>
<para>The following example demonstrates the basic CA configuration.</para> <para>The following example demonstrates the basic CA configuration.</para>
<para> <para>
...@@ -162,7 +165,7 @@ ...@@ -162,7 +165,7 @@
</para> </para>
</section> </section>
<section id="agent-secure-connection"> <section xml:id="agent-secure-connection">
<title>Secure Connections</title> <title>Secure Connections</title>
<para> <para>
Control Agent doesn't natively support secure HTTP connections like Control Agent doesn't natively support secure HTTP connections like
...@@ -274,7 +277,7 @@ http { ...@@ -274,7 +277,7 @@ http {
</section> </section>
<section id="agent-limitations"> <section xml:id="agent-limitations">
<title>Control Agent Limitations</title> <title>Control Agent Limitations</title>
<para> <para>
Control Agent is a new component, first released in Kea 1.2. In Control Agent is a new component, first released in Kea 1.2. In
...@@ -291,7 +294,7 @@ http { ...@@ -291,7 +294,7 @@ http {
</para> </para>
</section> </section>
<section id="agent-launch"> <section xml:id="agent-launch">
<title>Starting Control Agent</title> <title>Starting Control Agent</title>
<para> <para>
The CA is started by running its binary and specifying the configuration file The CA is started by running its binary and specifying the configuration file
...@@ -302,7 +305,7 @@ $ ./kea-ctrl-agent -c /usr/local/etc/kea/kea-ctrl-agent.conf ...@@ -302,7 +305,7 @@ $ ./kea-ctrl-agent -c /usr/local/etc/kea/kea-ctrl-agent.conf
</para> </para>
</section> </section>
<section id="agent-clients"> <section xml:id="agent-clients">
<title>Connecting to the Control Agent</title> <title>Connecting to the Control Agent</title>
<para>For an example of tool that can take advantage of the <para>For an example of tool that can take advantage of the
RESTful API, see <xref linkend="kea-shell"/>.</para> RESTful API, see <xref linkend="kea-shell"/>.</para>
......
<?xml version="1.0" encoding="UTF-8"?> <!--
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -
<!ENTITY mdash "&#x2014;" > - This Source Code Form is subject to the terms of the Mozilla Public
]> - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<chapter id="classify"> <!-- Converted by db4-upgrade version 1.1 -->
<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="classify">
<title>Client Classification</title> <title>Client Classification</title>
<section> <section>
...@@ -102,7 +105,7 @@ ...@@ -102,7 +105,7 @@
</note> </note>
</section> </section>
<section id="classification-using-host-reservations"> <section xml:id="classification-using-host-reservations">
<title>Using Static Host Reservations In Classification</title> <title>Using Static Host Reservations In Classification</title>
<para>Classes can be statically assigned to the clients using techniques described <para>Classes can be statically assigned to the clients using techniques described
in <xref linkend="reservation4-client-classes"/> and in <xref linkend="reservation4-client-classes"/> and
...@@ -110,29 +113,29 @@ ...@@ -110,29 +113,29 @@
</para> </para>
</section> </section>
<section id="classification-using-vendor"> <section xml:id="classification-using-vendor">
<title>Using Vendor Class Information In Classification</title> <title>Using Vendor Class Information In Classification</title>
<para> <para>
The server checks whether an incoming DHCPv4 packet includes The server checks whether an incoming DHCPv4 packet includes
the vendor class identifier option (60) or an incoming DHCPv6 packet the vendor class identifier option (60) or an incoming DHCPv6 packet
includes the vendor class option (16). If it does, the content of that includes the vendor class option (16). If it does, the content of that
option is prepended with &quot;VENDOR_CLASS_&quot; and the result is interpreted option is prepended with "VENDOR_CLASS_" and the result is interpreted
as a class. For example, modern cable modems will send this option with as a class. For example, modern cable modems will send this option with
value &quot;docsis3.0&quot; and so the packet will belong to value "docsis3.0" and so the packet will belong to
class &quot;VENDOR_CLASS_docsis3.0&quot;. class "VENDOR_CLASS_docsis3.0".
</para> </para>
</section> </section>
<section id="classification-using-expressions"> <section xml:id="classification-using-expressions">
<title>Using Expressions In Classification</title> <title>Using Expressions In Classification</title>
<para> <para>
The expression portion of classification contains operators and values. The expression portion of classification contains operators and values.
All values are currently strings and operators take a string or strings and All values are currently strings and operators take a string or strings and
return another string. When all the operations have completed return another string. When all the operations have completed
the result should be a value of &quot;true&quot; or &quot;false&quot;. the result should be a value of "true" or "false".
The packet belongs to The packet belongs to
the class (and the class name is added to the list of classes) if the result the class (and the class name is added to the list of classes) if the result
is &quot;true&quot;. Expressions are written in standard format and can be nested. is "true". Expressions are written in standard format and can be nested.
</para> </para>
<para> <para>
...@@ -159,12 +162,12 @@ ...@@ -159,12 +162,12 @@
</para> </para>
<para> <para>
<table frame="all" id="classification-values-list"> <table frame="all" xml:id="classification-values-list">
<title>List of Classification Values</title> <title>List of Classification Values</title>
<tgroup cols='3'> <tgroup cols="3">
<colspec colname='name' /> <colspec colname="name"/>
<colspec colname='example' /> <colspec colname="example"/>
<colspec colname='description' /> <colspec colname="description"/>
<thead> <thead>
<row> <row>
<entry>Name</entry> <entry>Name</entry>
...@@ -199,7 +202,7 @@ ...@@ -199,7 +202,7 @@
<entry>'123'</entry> <entry>'123'</entry>
<entry>A 32 bit unsigned integer value</entry> <entry>A 32 bit unsigned integer value</entry>
</row> </row>
<row></row> <row/>
<row> <row>
<entry>Binary content of the option</entry> <entry>Binary content of the option</entry>
<entry>option[123].hex</entry> <entry>option[123].hex</entry>
...@@ -437,9 +440,9 @@ ...@@ -437,9 +440,9 @@
<itemizedlist> <itemizedlist>
<listitem><para> <listitem><para>
Hexadecimal strings are converted into a string as expected. The starting &quot;0X&quot; or Hexadecimal strings are converted into a string as expected. The starting "0X" or
&quot;0x&quot; is removed and if the string is an odd number of characters a "0x" is removed and if the string is an odd number of characters a
&quot;0&quot; is prepended to it. "0" is prepended to it.
</para></listitem> </para></listitem>
<listitem><para> <listitem><para>
...@@ -520,14 +523,14 @@ ...@@ -520,14 +523,14 @@
<listitem><para> <listitem><para>
Vendor option means Vendor-Identifying Vendor-specific Information Vendor option means Vendor-Identifying Vendor-specific Information
option in DHCPv4 (code 125, see option in DHCPv4 (code 125, see
<ulink url="http://tools.ietf.org/html/rfc3925#section-4">Section 4 of RFC 3925</ulink>) and <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://tools.ietf.org/html/rfc3925#section-4">Section 4 of RFC 3925</link>) and
Vendor-specific Information Option in DHCPv6 (code 17, defined in Vendor-specific Information Option in DHCPv6 (code 17, defined in
<ulink url="https://tools.ietf.org/html/rfc3315#section-22.17">Section 22.17 of <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://tools.ietf.org/html/rfc3315#section-22.17">Section 22.17 of
RFC 3315</ulink>). Vendor class option means Vendor-Identifying Vendor RFC 3315</link>). Vendor class option means Vendor-Identifying Vendor
Class Option in DHCPv4 (code 124, see Class Option in DHCPv4 (code 124, see
<ulink url="http://tools.ietf.org/html/rfc3925#section-3">Section 3 of RFC 3925</ulink>) in DHCPv4 and <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://tools.ietf.org/html/rfc3925#section-3">Section 3 of RFC 3925</link>) in DHCPv4 and
Class Option in DHCPv6 (code 16, see Class Option in DHCPv6 (code 16, see
<ulink url="https://tools.ietf.org/html/rfc3315#section-22.16">Section 22.16 of RFC 3315</ulink>). <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://tools.ietf.org/html/rfc3315#section-22.16">Section 22.16 of RFC 3315</link>).
Vendor options may Vendor options may
have sub-options that are referenced by their codes. Vendor class have sub-options that are referenced by their codes. Vendor class
options do not have sub-options, but rather data chunks, which are options do not have sub-options, but rather data chunks, which are
...@@ -545,8 +548,8 @@ ...@@ -545,8 +548,8 @@
accessed using option[60] expression.</para></listitem> accessed using option[60] expression.</para></listitem>
<listitem><para> <listitem><para>
<ulink url="http://tools.ietf.org/html/rfc3925">RFC3925</ulink> and <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://tools.ietf.org/html/rfc3925">RFC3925</link> and
<ulink url="http://tools.ietf.org/html/rfc3315">RFC3315</ulink>