diff --git a/Documentation/Makefile b/Documentation/Makefile
index b43d66eae6..a9fb497b83 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -337,7 +337,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
 
 user-manual.xml: user-manual.txt user-manual.conf
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-	$(TXT_TO_XML) -d article -o $@+ $< && \
+	$(TXT_TO_XML) -d book -o $@+ $< && \
 	mv $@+ $@
 
 technical/api-index.txt: technical/api-index-skel.txt \
diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index 35473ad02f..bd57ea2c1a 100644
--- a/Documentation/giteveryday.txt
+++ b/Documentation/giteveryday.txt
@@ -308,18 +308,15 @@ master or exposed as a part of a stable branch.
 <10> create a signed tag.
 <11> make sure master was not accidentally rewound beyond that
 already pushed out.  `ko` shorthand points at the Git maintainer's
-repository at kernel.org, and looks like this:
-+
-------------
-(in .git/config)
-[remote "ko"]
-	url = kernel.org:/pub/scm/git/git.git
-	fetch = refs/heads/*:refs/remotes/ko/*
-	push = refs/heads/master
-	push = refs/heads/next
-	push = +refs/heads/pu
-	push = refs/heads/maint
-------------
+repository at kernel.org, and looks like this: +
+++(in .git/config) +
+{startsb}remote "ko"{endsb} +
+{nbsp}{nbsp}{nbsp}{nbsp}url = kernel.org:/pub/scm/git/git.git +
+{nbsp}{nbsp}{nbsp}{nbsp}fetch = refs/heads/\*:refs/remotes/ko/* +
+{nbsp}{nbsp}{nbsp}{nbsp}push = refs/heads/master +
+{nbsp}{nbsp}{nbsp}{nbsp}push = refs/heads/next +
+{nbsp}{nbsp}{nbsp}{nbsp}push = +refs/heads/pu +
+{nbsp}{nbsp}{nbsp}{nbsp}push = refs/heads/maint++
 +
 <12> In the output from `git show-branch`, `master` should have
 everything `ko/master` has, and `next` should have
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 5e07454572..bc29298678 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4395,6 +4395,10 @@ itself!
 Git Glossary
 ============
 
+[[git-explained]]
+Git explained
+-------------
+
 include::glossary-content.txt[]
 
 [[git-quick-start]]
@@ -4636,6 +4640,10 @@ $ git gc
 Appendix B: Notes and todo list for this manual
 ===============================================
 
+[[todo-list]]
+Todo list
+---------
+
 This is a work in progress.
 
 The basic requirements: