diff --git a/src/bin/dhcp4/config_parser.cc b/src/bin/dhcp4/config_parser.cc index f4e85f53f7..ac4b3c69da 100644 --- a/src/bin/dhcp4/config_parser.cc +++ b/src/bin/dhcp4/config_parser.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC") // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -162,7 +162,7 @@ public: /// @brief does nothing /// - /// This method is required for all parser. The value itself + /// This method is required for all parsers. The value itself /// is not commited anywhere. Higher level parsers are expected to /// use values stored in the storage, e.g. renew-timer for a given /// subnet is stored in subnet-specific storage. It is not commited @@ -220,7 +220,7 @@ public: /// @brief parses parameter value /// - /// Parses configuration entry and stored it in storage. See + /// Parses configuration entry and stores it in storage. See /// \ref setStorage() for details. /// /// @param value pointer to the content of parsed values @@ -425,7 +425,7 @@ public: /// @brief does nothing. /// - /// This method is required for all parser. The value itself + /// This method is required for all parsers. The value itself /// is not commited anywhere. Higher level parsers (for subnet) are expected /// to use values stored in the storage. virtual void commit() {} @@ -455,7 +455,7 @@ public: /// @brief constructor Subnet4ConfigParser(const std::string& ) { // The parameter should always be "subnet", but we don't check here - // against it in case some wants to reuse this parser somewhere. + // against it in case someone wants to reuse this parser somewhere. } /// @brief parses parameter value diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index 1fe91df0a8..88b0435a7e 100644 --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@ -37,7 +37,7 @@ updated configuration from the BIND 10 configuration system. % DHCP4_CONFIG_START DHCPv4 server is processing the following configuration: %1 This is a debug message that is issued every time the server receives a -configuration. That happens start up and also when a server configuration +configuration. That happens at start up and also when a server configuration change is committed by the administrator. % DHCP4_CONFIG_NEW_SUBNET A new subnet has been added to configuration: %1