diff --git a/docs/manpages/ndn-autoconfig-server.rst b/docs/manpages/ndn-autoconfig-server.rst
index d5b14d7..369252e 100644
--- a/docs/manpages/ndn-autoconfig-server.rst
+++ b/docs/manpages/ndn-autoconfig-server.rst
@@ -3,12 +3,10 @@
 ndn-autoconfig-server
 =====================
 
-Usage
------
+Synopsis
+--------
 
-::
-
-    ndn-autoconfig-server [-h] [-p <PREFIX>] [-p <PREFIX>] ... <FACEURI>
+**ndn-autoconfig-server** [**-h**] [**-V**] [**-p** *PREFIX*]... *FACEURI*
 
 Description
 -----------
diff --git a/docs/manpages/ndn-autoconfig.rst b/docs/manpages/ndn-autoconfig.rst
index 9767c86..c455bb9 100644
--- a/docs/manpages/ndn-autoconfig.rst
+++ b/docs/manpages/ndn-autoconfig.rst
@@ -3,12 +3,10 @@
 ndn-autoconfig
 ==============
 
-Usage
------
+Synopsis
+--------
 
-::
-
-    ndn-autoconfig [options]
+**ndn-autoconfig** [**-h**] [**-V**] [**-c** *file*] [**-d**]
 
 Description
 -----------
@@ -24,11 +22,11 @@
 
   NOTE: if connection to NFD fails, the daemon will be terminated.
 
-``-c [FILE]`` or ``--config=[FILE]``
+``-c FILE`` or ``--config=FILE``
   Use the specified configuration file. If `enabled = true` is not specified in the
   configuration file, no actions will be performed.
 
-``--ndn-fch-url=[URL]``
+``--ndn-fch-url=URL``
   Use the specified URL to find the closest hub (NDN-FCH protocol).  If not specified,
   ``http://ndn-fch.named-data.net/`` will be used.  Only ``http://`` URLs are supported.
 
diff --git a/docs/manpages/nfd-autoreg.rst b/docs/manpages/nfd-autoreg.rst
index 33e94bd..3ce898a 100644
--- a/docs/manpages/nfd-autoreg.rst
+++ b/docs/manpages/nfd-autoreg.rst
@@ -1,12 +1,10 @@
 nfd-autoreg
 ===========
 
-Usage
------
+Synopsis
+--------
 
-::
-
-    nfd-autoreg --prefix=</autoreg/prefix> [--prefix=</another/prefix>] ...
+**nfd-autoreg** --prefix=</autoreg/prefix> [--prefix=</another/prefix>]...
 
 Description
 -----------
diff --git a/docs/manpages/nfd-status-http-server.rst b/docs/manpages/nfd-status-http-server.rst
index e4e39eb..9d6ee15 100644
--- a/docs/manpages/nfd-status-http-server.rst
+++ b/docs/manpages/nfd-status-http-server.rst
@@ -1,12 +1,10 @@
 nfd-status-http-server
 ======================
 
-Usage
------
+Synopsis
+--------
 
-::
-
-    nfd-status-http-server [-h] [-p <PORT>] [-a <IPADDR>] [-r] [-v]
+**nfd-status-http-server** [**-h**] [**-a** *IPADDR*] [**-p** *PORT*] [**-r**] [**-v**]
 
 Description
 -----------
@@ -17,14 +15,14 @@
 -------
 
 ``-h``
-  Show this help message and exit.
-
-``-p <PORT>``
-  HTTP server port number (default is 8080).
+  Show help message and exit.
 
 ``-a <IPADDR>``
   HTTP server IP address (default is 127.0.0.1).
 
+``-p <PORT>``
+  HTTP server port number (default is 8080).
+
 ``-r``
   Enable HTTP robots to crawl (disabled by default).
 
diff --git a/docs/manpages/nfd.rst b/docs/manpages/nfd.rst
index b87c0f3..a3ed42b 100644
--- a/docs/manpages/nfd.rst
+++ b/docs/manpages/nfd.rst
@@ -1,12 +1,10 @@
 nfd
 ===
 
-Usage
------
+Synopsis
+--------
 
-::
-
-    nfd [options]
+**nfd** [**-h**] [**-V**] [**-c** *file*] [**-m**]
 
 Description
 -----------