mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[master] Swapped ncr-protocol and ncr-format descriptions in Kea Admin Guide

Browse Source 
Merged in branch 'trac4117'
This commit is contained in:
Thomas Markwalder
2015-11-18 07:09:43 -05:00
parent fa1e32d952 645a757e70
commit 034c1c95b5
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/guide/ddns.xml
View File

@@ -233,15 +233,15 @@ strings <userinput>path</userinput>/kea-dhcp-ddns | sed -n 's/;;;; //p'
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
<command>ncr_protocol</command> - Packet format to use when sending requests to D2. <command>ncr_protocol</command> - Socket protocol to use when sending requests to D2.
Currently only JSON format is supported. Other formats may be available Currently only UDP is supported. TCP may be available in an upcoming
in future releases. release.
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
<command>ncr_format</command> - Socket protocol to use when sending requests to D2. <command>ncr_format</command> - Packet format to use when sending requests to D2.
Currently only UDP is supported. TCP may be available in an upcoming Currently only JSON format is supported. Other formats may be available
release. in future releases.
</simpara></listitem> </simpara></listitem>
</itemizedlist> </itemizedlist>

7
doc/guide/dhcp4-srv.xml
View File

@@ -1769,18 +1769,15 @@ It is merely echoed by the server
continue lease operations without running the risk that its memory usage continue lease operations without running the risk that its memory usage
grows without limit. The default value is 1024. grows without limit. The default value is 1024.
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
<command>ncr-format</command> - socket protocol use when sending requests to D2. Currently <command>ncr-protocol</command> - socket protocol use when sending requests to D2. Currently
only UDP is supported. TCP may be available in an upcoming release. only UDP is supported. TCP may be available in an upcoming release.
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
<command>ncr-protocol</command> - packet format to use when sending requests to D2. <command>ncr-format</command> - packet format to use when sending requests to D2.
Currently only JSON format is supported. Other formats may be available Currently only JSON format is supported. Other formats may be available
in future releases. in future releases.
</simpara></listitem> </simpara></listitem>
</itemizedlist> </itemizedlist>
By default, kea-dhcp-ddns is assumed to be running on the same machine as kea-dhcp4, and By default, kea-dhcp-ddns is assumed to be running on the same machine as kea-dhcp4, and
all of the default values mentioned above should be sufficient. all of the default values mentioned above should be sufficient.

4
doc/guide/dhcp6-srv.xml
View File

@@ -1751,11 +1751,11 @@ should include options from the isc option space:
continue lease operations. The default value is 1024. continue lease operations. The default value is 1024.
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
<command>ncr-format</command> - Socket protocol use when sending requests to D2. Currently <command>ncr-protocol</command> - Socket protocol use when sending requests to D2. Currently
only UDP is supported. TCP may be available in an upcoming release. only UDP is supported. TCP may be available in an upcoming release.
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
<command>ncr-protocol</command> - Packet format to use when sending requests to D2. <command>ncr-format</command> - Packet format to use when sending requests to D2.
Currently only JSON format is supported. Other formats may be available Currently only JSON format is supported. Other formats may be available
in future releases. in future releases.
</simpara></listitem> </simpara></listitem>