diff --git a/NEWS b/NEWS
index 4d5e0ffb9..f0b1931d3 100644
--- a/NEWS
+++ b/NEWS
@@ -10,9 +10,6 @@ ELinks 0.13.GIT now:
 
 To be released as ELinks 0.13.0.
 
-* enhancement: New actions move-cursor-line-start, move-link-down-line,
-  move-link-left-line, move-link-right-line, move-link-up-line.
-
 ELinks 0.12.GIT now:
 --------------------
 
@@ -108,7 +105,10 @@ Miscellaneous:
 * enhancement 887: ``Save'' in the cookie manager now saves cookies
   even if unmodified
 * enhancement 145: internal clipboard support
-* enhancement: new actions kill-word-back, move-backward-word,
+* enhancement: new main actions move-cursor-line-start,
+  move-link-down-line, move-link-left-line, move-link-right-line,
+  move-link-up-line
+* enhancement: new edit actions kill-word-back, move-backward-word,
   move-forward-word
 * enhancements 687, 688: options ui.tabs.top, ui.show_menu_bar_always
 * enhancement: highlight links as one enters link prefixes
diff --git a/configure.in b/configure.in
index bccc2a475..9a05ee147 100644
--- a/configure.in
+++ b/configure.in
@@ -1334,7 +1334,7 @@ EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary],
 	      [  --enable-small          reduce binary size as far as possible (but see the bottom of doc/small.txt!)])
 
 EL_ARG_ENABLE(CONFIG_UTF8, utf-8, [UTF-8],
-	      [  --enable-utf-8          enable UTF-8 support])
+	      [  --disable-utf-8         disable UTF-8 support])
 
 
 AC_ARG_ENABLE(weehoofooboomookerchoo,
diff --git a/doc/Makefile b/doc/Makefile
index 9badf021e..15ab5b2df 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -14,7 +14,7 @@ PDF_DIR  = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf
 TXT_DIR  = $(DESTDIR)$(docdir)/$(PACKAGE)/txt
 
 ASCIIDOC_CONF  = $(srcdir)asciidoc.conf
-ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/"
+ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/" -a asciidoc7compatible
 
 #############################################################################
 # Build files
diff --git a/src/config/opttypes.c b/src/config/opttypes.c
index ab0118299..12dae55e7 100644
--- a/src/config/opttypes.c
+++ b/src/config/opttypes.c
@@ -399,20 +399,31 @@ tree_dup(struct option *opt, struct option *template, int flags)
 }
 
 const struct option_type_info option_types[] = {
+	/* The OPT_ comments below are here to be found by grep.  */
+
+	/* OPT_BOOL */
 	{ N_("Boolean"),  bool_cmd,  num_rd,   num_wr,   NULL,     num_set,   N_("[0|1]") },
+	/* OPT_INT */
 	{ N_("Integer"),  gen_cmd,   num_rd,   num_wr,   NULL,     num_set,   N_("<num>") },
+	/* OPT_LONG */
 	{ N_("Longint"),  gen_cmd,   num_rd,   long_wr,  NULL,     long_set,  N_("<num>") },
+	/* OPT_STRING */
 	{ N_("String"),   gen_cmd,   str_rd,   str_wr,   str_dup,  str_set,   N_("<str>") },
 
+	/* OPT_CODEPAGE */
 	{ N_("Codepage"), gen_cmd,   str_rd,   cp_wr,    NULL,     cp_set,    N_("<codepage>") },
+	/* OPT_LANGUAGE */
 	{ N_("Language"), gen_cmd,   str_rd,   lang_wr,  NULL,     lang_set,  N_("<language>") },
+	/* OPT_COLOR */
 	{ N_("Color"),    gen_cmd,   str_rd,   color_wr, NULL,     color_set, N_("<color|#rrggbb>") },
 
+	/* OPT_COMMAND */
 	{ N_("Special"),  exec_cmd,  NULL,     NULL,     NULL,     NULL,      "" },
 
+	/* OPT_ALIAS */
 	{ N_("Alias"),    redir_cmd, redir_rd, redir_wr, NULL,     redir_set, "" },
 
-	/* tree */
+	/* OPT_TREE */
 	{ N_("Folder"),   NULL,      NULL,     NULL,     tree_dup, NULL,      "" },
 };