diff --git a/docs/nmap-install.xml b/docs/nmap-install.xml
index 65dad6b92..19d07b455 100644
--- a/docs/nmap-install.xml
+++ b/docs/nmap-install.xml
@@ -444,17 +444,19 @@ I would run <command>./configure --prefix=<replaceable>/home/fyodor</replaceable
 
 <variablelist>
 <varlistentry>
+<term>
 <indexterm><primary><envar>CFLAGS</envar></primary></indexterm>
 <indexterm><primary><envar>CXXFLAGS</envar></primary></indexterm>
 <indexterm><primary><envar>LDFLAGS</envar></primary></indexterm>
-<term><envar>CFLAGS</envar></term><term><envar>CXXFLAGS</envar></term><term>LDFLAGS</term>
+<envar>CFLAGS</envar></term><term><envar>CXXFLAGS</envar></term><term>LDFLAGS</term>
 <listitem><para>Extra options to pass to the C compiler, C++ compiler, and linker, respectively. Because parts of Nmap are written in C and others in C++, it's best to use both <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> if you're going to use one of them.</para></listitem>
 </varlistentry>
 <varlistentry>
+<term>
 <indexterm><primary><envar>LINGUAS</envar> environment variable</primary></indexterm>
-<term><envar>LINGUAS</envar></term>
 <indexterm><primary>translations</primary><secondary>of manual pages</secondary></indexterm>
 <indexterm><primary>foreign languages</primary><see>translations</see></indexterm>
+<envar>LINGUAS</envar></term>
 <listitem><para>By default, <command>make install</command> will install all the available translations of the Nmap man page in addition to the English one. The <envar>LINGUAS</envar> environment variable can control which translations are installed. Its value should be a space-separated list of ISO language codes. For example, to install only the French and German translations, you might run <command>LINGUAS="fr de" make install</command>. To disable the installation of all translations, run configure with the <option>--disable-nls</option> option or set <envar>LINGUAS</envar> to the empty string.</para></listitem>
 </varlistentry>
 </variablelist>
diff --git a/docs/refguide.xml b/docs/refguide.xml
index 55084c0bc..63ff596b4 100644
--- a/docs/refguide.xml
+++ b/docs/refguide.xml
@@ -2232,9 +2232,9 @@ until found:
 <indexterm><primary>data files</primary><secondary>directory search order</secondary></indexterm><indexterm><primary>scripts, location of</primary></indexterm>
 <simplelist>
 <member><option>--datadir</option></member>
-<member><envar>$NMAPDIR</envar></member><indexterm><primary><envar>NMAPDIR</envar> environment variable</primary></indexterm>
-<member><filename>~/.nmap</filename> (not searched on Windows)</member><indexterm><primary sortas="nmap directory"><filename>.nmap</filename> directory</primary></indexterm>
-<member><varname>NMAPDATADIR</varname></member><indexterm><primary><varname>NMAPDATADIR</varname></primary></indexterm>
+<member><envar>$NMAPDIR</envar><indexterm><primary><envar>NMAPDIR</envar> environment variable</primary></indexterm></member>
+<member><filename>~/.nmap</filename> (not searched on Windows)<indexterm><primary sortas="nmap directory"><filename>.nmap</filename> directory</primary></indexterm></member>
+<member><varname>NMAPDATADIR</varname><indexterm><primary><varname>NMAPDATADIR</varname></primary></indexterm></member>
 <member>the current directory</member>
 </simplelist>
 A <filename>scripts</filename> subdirectory is also tried in each of
diff --git a/docs/scripting.xml b/docs/scripting.xml
index 6b542b05e..8901bb9c5 100644
--- a/docs/scripting.xml
+++ b/docs/scripting.xml
@@ -481,9 +481,9 @@ until found:
 <indexterm><primary>data files</primary><secondary>directory search order</secondary></indexterm><indexterm><primary>scripts, location of</primary></indexterm>
 <simplelist>
 <member><option>--datadir</option></member>
-<member><envar>$NMAPDIR</envar></member><indexterm><primary><envar>NMAPDIR</envar> environment variable</primary></indexterm>
-<member><filename>~/.nmap</filename> (not searched on Windows)</member><indexterm><primary sortas="nmap directory"><filename>.nmap</filename> directory</primary></indexterm>
-<member><varname>NMAPDATADIR</varname></member><indexterm><primary><varname>NMAPDATADIR</varname></primary></indexterm>
+<member><envar>$NMAPDIR</envar><indexterm><primary><envar>NMAPDIR</envar> environment variable</primary></indexterm></member>
+<member><filename>~/.nmap</filename> (not searched on Windows)<indexterm><primary sortas="nmap directory"><filename>.nmap</filename> directory</primary></indexterm></member>
+<member><varname>NMAPDATADIR</varname><indexterm><primary><varname>NMAPDATADIR</varname></primary></indexterm></member>
 <member>the current directory</member>
 </simplelist>
 A <filename>scripts</filename> subdirectory is also tried in each of
@@ -806,15 +806,17 @@ local username = nmap.registry.args.user
           </listitem>
         </varlistentry>
         <varlistentry>
+          <term>
           <indexterm><primary><option>--script-trace</option></primary><secondary>example of</secondary></indexterm>
-          <term><command>nmap --script smb-os-discovery --script-trace example.com</command></term>
+          <command>nmap --script smb-os-discovery --script-trace example.com</command></term>
           <listitem>
           <para>Execute a specific script with script tracing.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
+          <term>
           <indexterm><primary><option>--script-args</option></primary><secondary>example of</secondary></indexterm>
-          <term><command>nmap --script snmp-sysdescr --script-args snmpcommunity=admin example.com</command></term>
+          <command>nmap --script snmp-sysdescr --script-args snmpcommunity=admin example.com</command></term>
           <listitem>
           <para>Run an individual script that takes a script
           argument.</para>