diff --git a/docs/manpages/ndn-client.conf.rst b/docs/manpages/ndn-client.conf.rst
index ab8d828..d267c14 100644
--- a/docs/manpages/ndn-client.conf.rst
+++ b/docs/manpages/ndn-client.conf.rst
@@ -6,7 +6,8 @@
 The configuration file ``client.conf`` is looked up in several directories in the following order:
 
 - ``$HOME/.ndn/``: user-specific settings
-- ``@SYSCONFDIR@/ndn/`` (``/usr/local/etc/ndn``, ``/opt/local/etc/ndn``, or other, depending how the library is configured): system-wide settings
+- ``@SYSCONFDIR@/ndn/`` (``/usr/local/etc/ndn``, ``/opt/local/etc/ndn``, or other, depending how the
+  library is configured): system-wide settings
 - ``/etc/ndn``: default system-wide settings
 
 Here is an example of ``client.conf`` for current ndn-cxx package:
@@ -18,13 +19,13 @@
 ---
 
 transport
-  FaceUri for default connection toward local NDN forwarder.  Only ``unix`` and ``tcp4`` FaceUri
+  FaceUri for default connection toward local NDN forwarder.  Only ``unix`` and ``tcp4`` FaceUris
   can be specified here.
 
   By default, ``unix:///var/run/nfd.sock`` is used.
 
   ..note::
-    This value can be overriden using `NDN_CLIENT_TRANSPORT` environment variable.
+    This value can be overridden using the ``NDN_CLIENT_TRANSPORT`` environment variable.
 
 Key Management
 --------------
@@ -48,9 +49,9 @@
 
      pib=pib-sqlite3
 
-  Changing PIB scheme without changing location is **not** allowed.  If such change is
-  necessary, the whole backend storage must be destroyed.  For example, when default location
-  is used::
+  Changing PIB scheme without changing location is **not** allowed.  If a change like this is
+  necessary, the whole backend storage must be destroyed.  For example, when the default location is
+  used::
 
       rm -rf ~/.ndn/ndnsec-*
 
@@ -58,7 +59,7 @@
   Simultaneous access from multiple machines may cause errors.
 
   ..note::
-    This value can be overriden using `NDN_CLIENT_PIB` environment variable.
+    This value can be overridden using the ``NDN_CLIENT_PIB`` environment variable.
 
 tpm
   Trusted Platform Module (TPM) where the private keys are stored.  The format for this setting
@@ -96,4 +97,4 @@
   Simultaneous access from multiple machines may cause errors.
 
   ..note::
-    This value can be overriden using `NDN_CLIENT_TPM` environment variable.
+    This value can be overridden using the ``NDN_CLIENT_TPM`` environment variable.