Parcourir la source

[5132] spelling

Francis Dupont il y a 8 ans
Parent
commit
7ed2e66084

+ 2 - 2
doc/guide/hooks.xml

@@ -205,7 +205,7 @@
               example and create your own custom logging hooks.</entry>
               example and create your own custom logging hooks.</entry>
             </row>
             </row>
             <row>
             <row>
-              <entry>Flexible Indentifier</entry>
+              <entry>Flexible Identifier</entry>
               <entry>Support customers</entry>
               <entry>Support customers</entry>
               <entry>Kea 1.2.0 beta</entry>
               <entry>Kea 1.2.0 beta</entry>
               <entry>Kea software provides a way to handle host reservations
               <entry>Kea software provides a way to handle host reservations
@@ -218,7 +218,7 @@
               combination of several options and fields to uniquely identify a
               combination of several options and fields to uniquely identify a
               client. Those scenarios are addressed by the Flexible Identifiers
               client. Those scenarios are addressed by the Flexible Identifiers
               hook application. It allows defining an expression, similar to
               hook application. It allows defining an expression, similar to
-              the one used in client classifiation,
+              the one used in client classification,
 	      e.g. substring(relay6[0].option[37],0,6). Each incoming packet is
 	      e.g. substring(relay6[0].option[37],0,6). Each incoming packet is
 	      evaluated against that expression and its value is then searched
 	      evaluated against that expression and its value is then searched
 	      in the reservations database.
 	      in the reservations database.

+ 1 - 0
premium

@@ -0,0 +1 @@
+Subproject commit f6008c55962332a5261d3d9f1973771c870e1c47

+ 2 - 2
src/bin/dhcp4/dhcp4_hooks.dox

@@ -115,9 +115,9 @@ to the end of this list.
    - name: @b id_type, type isc::dhcp::Host::IdentifierType, direction: <b>in/out</b>
    - name: @b id_type, type isc::dhcp::Host::IdentifierType, direction: <b>in/out</b>
    - name: @b id_value, type std::vector<uint8_t>, direction: <b>out</b>
    - name: @b id_value, type std::vector<uint8_t>, direction: <b>out</b>
 
 
- - @b Description: this callout is executed only if flexible identifers are
+ - @b Description: this callout is executed only if flexible identifiers are
    enabled, i.e. host-reservation-identifiers contain 'flex-id' value. This
    enabled, i.e. host-reservation-identifiers contain 'flex-id' value. This
-   callout enables external library to provide values for flexible identifers.
+   callout enables external library to provide values for flexible identifiers.
    To be able to use this feature, flex_id hook library is needed.
    To be able to use this feature, flex_id hook library is needed.
 
 
  - <b>Next step status</b>: If a callout installed on the "host4_identifier" hook
  - <b>Next step status</b>: If a callout installed on the "host4_identifier" hook

+ 2 - 2
src/bin/dhcp4/dhcp4_messages.mes

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
 #
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -238,7 +238,7 @@ information.
 % DHCP4_FLEX_ID flexible identifier generated for incoming packet: %1
 % DHCP4_FLEX_ID flexible identifier generated for incoming packet: %1
 This debug message is printed when host reservation type is set to flexible identifier
 This debug message is printed when host reservation type is set to flexible identifier
 and the expression specified in its configuration generated (was evaluated to)
 and the expression specified in its configuration generated (was evaluated to)
-an indetifier for incoming packet. This debug message is mainly intended as a
+an identifier for incoming packet. This debug message is mainly intended as a
 debugging assistance for flexible identifier.
 debugging assistance for flexible identifier.
 
 
 % DHCP4_GENERATE_FQDN %1: client did not send a FQDN or hostname; FQDN will be be generated for the client
 % DHCP4_GENERATE_FQDN %1: client did not send a FQDN or hostname; FQDN will be be generated for the client

+ 2 - 2
src/bin/dhcp6/dhcp6_hooks.dox

@@ -116,9 +116,9 @@ to the end of this list.
    - name: @b id_type, type isc::dhcp::Host::IdentifierType, direction: <b>in/out</b>
    - name: @b id_type, type isc::dhcp::Host::IdentifierType, direction: <b>in/out</b>
    - name: @b id_value, type std::vector<uint8_t>, direction: <b>out</b>
    - name: @b id_value, type std::vector<uint8_t>, direction: <b>out</b>
 
 
- - @b Description: this callout is executed only if flexible identifers are
+ - @b Description: this callout is executed only if flexible identifiers are
    enabled, i.e. host-reservation-identifiers contain 'flex-id' value. This
    enabled, i.e. host-reservation-identifiers contain 'flex-id' value. This
-   callout enables external library to provide values for flexible identifers.
+   callout enables external library to provide values for flexible identifiers.
    To be able to use this feature, flex_id hook library is needed.
    To be able to use this feature, flex_id hook library is needed.
 
 
  - <b>Next step status</b>: If a callout installed on the "host6_identifier" hook
  - <b>Next step status</b>: If a callout installed on the "host6_identifier" hook

+ 1 - 1
src/lib/eval/evaluate.cc

@@ -17,7 +17,7 @@ bool evaluateBool(const Expression& expr, Pkt& pkt) {
     }
     }
     if (values.size() != 1) {
     if (values.size() != 1) {
         isc_throw(EvalBadStack, "Incorrect stack order. Expected exactly "
         isc_throw(EvalBadStack, "Incorrect stack order. Expected exactly "
-                  "1 value at the end of evaluatuion, got " << values.size());
+                  "1 value at the end of evaluation, got " << values.size());
     }
     }
     return (Token::toBool(values.top()));
     return (Token::toBool(values.top()));
 }
 }