diff --git a/Doc b/Doc
index 512160a5..00e04892 100644
--- a/Doc
+++ b/Doc
@@ -1,8 +1,8 @@
 D prog-intro.sgml
-C lib
 C nest
 C conf
 C filter
 C proto
 C sysdep
 C client
+C lib
diff --git a/nest/cli.c b/nest/cli.c
index c575bfa7..dd7e4fa9 100644
--- a/nest/cli.c
+++ b/nest/cli.c
@@ -35,7 +35,7 @@
  * on the current state of command processing.
  *
  * The CLI commands are declared as a part of the configuration grammar
- * by using the CF_CLI() macro. When a command is received, it's processed
+ * by using the |CF_CLI| macro. When a command is received, it's processed
  * by the same lexical analyser and parser as used for the configuration, but
  * it's switched to a special mode by prepending a fake token to the text,
  * so that it uses only the CLI command rules. Then the parser invokes