diff --git a/doc/index.docbook b/doc/index.docbook
index 0c8b14f..0182369 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -263,7 +263,7 @@ to be unusable.
 
 <para>
 You can do also setup to install to a system-wide directory (&eg; <filename
-type="directory">/usr/src/local</filename>) if you wish. This document
+class="directory">/usr/src/local</filename>) if you wish. This document
 does not cover this installation type, since we assume you know what you are doing.
 </para>
 
@@ -313,9 +313,9 @@ least Perl 5.14), but you will also need some additional modules (&kdesrc-build;
 will warn if they are not present):</para>
 
 <itemizedlist>
-    <listitem>IO::Socket::SSL</listitem>
-    <listitem>JSON::PP or JSON::XS</listitem>
-    <listitem>YAML::PP, YAML::XS, or YAML::Syck</listitem>
+    <listitem><para>IO::Socket::SSL</para></listitem>
+    <listitem><para>JSON::PP or JSON::XS</para></listitem>
+    <listitem><para>YAML::PP, YAML::XS, or YAML::Syck</para></listitem>
 </itemizedlist>
 </listitem>
 
@@ -419,7 +419,6 @@ included sample configuration file
 linkend="kdesrc-buildrc"/> will be a useful reference for this, especially its
 <link linkend="conf-options-table">table of configuration options</link>.
 </para>
-</sect4>
 
 <para>&kdesrc-build; contains many recommended configuration files to support
 &kde; Frameworks 5, &plasma; 5, and other &kde; applications.  The <application>kdesrc-build-setup</application> refers to these files in the configuration file it generates, but you can also use them
@@ -430,7 +429,7 @@ to use other configuration files from your own <filename>~/.kdesrc-buildrc</file
 linkend="configure-data">configuration file</link> in <xref
 linkend="configure-data" /> and in <xref linkend="kdesrc-buildrc" />.
 </para>
-
+</sect4>
 </sect3>
 </sect2>
 </sect1>
@@ -576,8 +575,6 @@ linkend="cmdline-pretend">--pretend</link></option> command line option.</para>
     nothing was actually built).  If there were no significant problems shown, you can proceed
     to actually running the script.</para>
 
-</sect2>
-
 <screen>
     <prompt>&percnt;</prompt> <userinput><command>kdesrc-build</command> <option>--stop-on-failure</option></userinput>
 </screen>
@@ -623,6 +620,7 @@ Built 200 modules
 Your logs are saved in /home/kde-src/kdesrc/log/2018-01-20-07
 </screen>
 </example>
+</sect2>
 
 <sect2 id="fixing-build-failures">
 <title>Resolving build failures</title>
@@ -667,14 +665,13 @@ solutions, as well as general tips and strategies to build &kde; in the
 Build from Source</ulink>.
 </para>
 
-</sect2>
-
 <para>On the other hand, assuming everything went well, you should have a new
 &kde; install on your computer, and now it is simply a matter of running
 it, described next in <xref linkend="environment"/>.</para>
 
 <note><para>For more information about &kdesrc-build;'s logging features,
 please see <xref linkend="kdesrc-build-logging"/>.</para></note>
+</sect2>
 
 </sect1>
 
@@ -1063,7 +1060,6 @@ end module-set
 
 <tip><para>This <literal>kde-projects</literal> module set construct is the main method
 of declaring which modules you want to build.</para></tip>
-</sect3>
 
 <para>All module sets use the <link linkend="conf-repository">repository</link>
 and <link linkend="conf-use-modules">use-modules</link> options.  <link
@@ -1072,6 +1068,7 @@ sets have a predefined <option>repository</option> value, but other types of
 module sets also will use the <link
 linkend="conf-git-repository-base">git-repository-base</link> option.
 </para>
+</sect3>
 
 </sect2>