[#1680] fixed rebase

diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst
index f1513ad24ffb09f63a0f184b01044590f7d2a683..4104a976643e7290864c1453f19db99ca2c7e15a 100644 (file)
--- a/doc/sphinx/arm/hooks.rst
+++ b/doc/sphinx/arm/hooks.rst
@@ -930,25 +930,26 @@ Two hooks library parameters for text file are supported:
    current system date to form the current forensic file name. It
    defaults to ``kea-legal``.
 
--  time-unit - configures the time unit used to rotate the log file. Valid
-   values are ``second``, ``day``, ``month`` or ``year``. It defaults to ``day``.
+-  ``time-unit`` - configures the time unit used to rotate the log file. Valid
+   values are ``second``, ``day``, ``month`` or ``year``. It defaults to
+   ``day``.
 
--  count - configures the number of time units that need to pass until the log
-   file is rotated. It can be any positive number, or 0 which disabled log rotate.
-   It defaults to 1.
+-  ``count`` - configures the number of time units that need to pass until the
+   log file is rotated. It can be any positive number, or 0 which disabled log
+   rotate. It defaults to 1.
 
-To note that if log rotate is disabled, a new file will be created when the
-library is loaded and the new file name is different that any previous file name.
+If log rotate is disabled, a new file will be created when the library is
+loaded and the new file name is different that any previous file name.
 
 Additional actions can be performed just before closing the old file and after
 opening the new file. These actions must point to an external executable or
 script and are configured by setting:
 
--  prerotate - external executable or script called with the name of the file
-   that will be closed (Kea will not wait for the process to finish)
+-  ``prerotate`` - external executable or script called with the name of the
+   file that will be closed (Kea will not wait for the process to finish)
 
--  portrotate - external executable or script called with the name of the file
-   that had been opened (Kea will not wait for the process to finish)
+-  ``portrotate`` - external executable or script called with the name of the
+   file that had been opened (Kea will not wait for the process to finish)
 
 -  ``request-parser-format`` - evaluated parsed expression used to extract and
    log data from the incoming packet

diff --git a/src/lib/eval/eval.dox b/src/lib/eval/eval.dox
index a057e0f371edf17cdc76af1f110e6406343e782f..e72800630c5af1af21c8b7e397e1c70f0b1bbc6a 100644 (file)
--- a/src/lib/eval/eval.dox
+++ b/src/lib/eval/eval.dox
@@ -163,7 +163,7 @@ instantiated with the appropriate value and put onto the expression vector.
    concatenate two other tokens.
  - isc::dhcp::TokenIfElse -- represents the ifelse(cond, iftrue, ifelse) operator.
  - isc::dhcp::TokenToHexString -- represents the hexstring operator which
-   converts a binary value to its hexadecimal string representation. 
+   converts a binary value to its hexadecimal string representation.
  - isc::dhcp::TokenInt8ToText -- represents the signed 8 bit integer in string
    representation.
  - isc::dhcp::TokenInt16ToText -- represents the signed 16 bit integer in string