diff --git a/make-directive-index.py b/make-directive-index.py
index 99e7bfaf28..396947b303 100755
--- a/make-directive-index.py
+++ b/make-directive-index.py
@@ -193,16 +193,25 @@ def _extract_directives(directive_groups, formatting, page):
                     formatting[text] = name
 
     storfile = directive_groups['filenames']
-    for xpath in ('.//refsynopsisdiv//filename',
-                  './/refsynopsisdiv//command'):
+    for xpath, absolute_only in (('.//refsynopsisdiv//filename', False),
+                                 ('.//refsynopsisdiv//command', False),
+                                 ('.//filename', True)):
         for name in t.iterfind(xpath):
+            if absolute_only and not (name.text and name.text.startswith('/')):
+                continue
+            if name.attrib.get('noindex'):
+                continue
             name.tail = ''
             if name.text:
+                if name.text.endswith('*'):
+                    name.text = name.text[:-1]
                 if not name.text.startswith('.'):
                     text = name.text.partition(' ')[0]
                     if text != name.text:
                         name.clear()
                         name.text = text
+                    if text.endswith('/'):
+                        text = text[:-1]
                     storfile[text].append((pagename, section))
                     if text not in formatting:
                         # use element as formatted display
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 91cc322604..cc7d1a0533 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -652,7 +652,7 @@
 
                 <programlisting>journalctl /usr/bin/dbus-daemon</programlisting>
 
-                <para>Show all logs of the kernel device node <filename>/dev/sda</filename>:</para>
+                <para>Show all logs of the kernel device node <filename noindex='true'>/dev/sda</filename>:</para>
 
                 <programlisting>journalctl /dev/sda</programlisting>
 
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index df3549dcb7..9c2ecc48b2 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -49,7 +49,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>kernel-install</command> <arg choice="req">COMMAND</arg> <arg choice="req">KERNEL VERSION</arg> <arg choice="req">KERNEL IMAGE</arg>
+      <command>kernel-install</command>
+      <arg choice="plain">COMMAND</arg>
+      <arg choice="plain"><replaceable>KERNEL-VERSION</replaceable></arg>
+      <arg choice="opt"><replaceable>KERNEL-IMAGE</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -60,9 +63,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
       initramfs images to and from <filename>/boot</filename>.
     </para>
 
-    <para>kernel-install will execute the files located in the directory <filename>/usr/lib/kernel/install.d/</filename>
+    <para><command>kernel-install</command> will execute the files
+    located in the directory <filename>/usr/lib/kernel/install.d/</filename>
     and the local administration directory <filename>/etc/kernel/install.d/</filename>.
-    All files are collectively sorted and executed in lexical order, regardless of the directories in
+    All files are collectively sorted and executed in lexical order, regardless of the directory in
     which they live. However, files with identical file names replace each other.
     Files in <filename>/etc/kernel/install.d/</filename> take precedence over files with the same name
     in <filename>/usr/lib/kernel/install.d/</filename>. This can be used to override a system-supplied
@@ -78,29 +82,44 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para>The following commands are understood:</para>
     <variablelist>
       <varlistentry>
-        <term>add &lt;KERNEL VERSION> &lt;KERNEL IMAGE></term>
+        <term><command>add <replaceable>KERNEL-VERSION</replaceable> <replaceable>KERNEL-IMAGE</replaceable></command></term>
         <listitem>
-          <para>calls every executable <filename>/usr/lib/kernel/install.d/*.install</filename>
-          and <filename>/etc/kernel/install.d/*.install</filename> with the arguments
-          "add &lt;KERNEL VERSION> <filename>/boot/&lt;MACHINE-ID>/&lt;KERNEL VERSION>/</filename>"</para>
+          <para>calls every executable
+          <filename>/usr/lib/kernel/install.d/*.install</filename> and
+          <filename>/etc/kernel/install.d/*.install</filename> with
+          the arguments
+          <programlisting>
+add <replaceable>KERNEL-VERSION</replaceable> <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename>
+          </programlisting>
+          </para>
 
-          <para>kernel-install copies &lt;KERNEL IMAGE> to
-          <filename>/boot/&lt;MACHINE-ID>/&lt;KERNEL VERSION>/linux</filename>.</para>
+          <para><command>kernel-install</command> copies
+          <replaceable>KERNEL-IMAGE</replaceable> to
+          <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/linux</filename>.
+          </para>
 
-          <para>kernel-install also creates a boot loader entry according to the boot loader specification
-          in <filename>/boot/loader/entries/&lt;MACHINE-ID>-&lt;KERNEL VERSION>.conf</filename>.
-          If the file <filename>initrd</filename> is found next to the <filename>linux</filename> file,
-          the initrd will be added to the configuration.</para>
+          <para><command>kernel-install</command> also creates a boot
+          loader entry according to the boot loader specification in
+          <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.
+          If the file <filename>initrd</filename> is found next to the
+          <filename>linux</filename> file, the initrd will be added to
+          the configuration.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>remove &lt;KERNEL VERSION> &lt;KERNEL IMAGE></term>
-        <listitem><para>calls every executable <filename>/usr/lib/kernel/install.d/*.install</filename>
-        and <filename>/etc/kernel/install.d/*.install</filename> with the arguments:
-        "remove &lt;KERNEL VERSION> <filename>/boot/&lt;MACHINE-ID>/&lt;KERNEL VERSION>/</filename>"
-        </para>
-        <para>kernel-install removes the entire directory <filename>/boot/&lt;MACHINE-ID>/&lt;KERNEL VERSION>/</filename>
-        and the file <filename>/boot/loader/entries/&lt;MACHINE-ID>-&lt;KERNEL VERSION>.conf</filename></para>
+        <term><command>remove</command> <replaceable>KERNEL-VERSION</replaceable> <replaceable>KERNEL-IMAGE</replaceable></term>
+        <listitem>
+          <para>calls every executable <filename>/usr/lib/kernel/install.d/*.install</filename>
+          and <filename>/etc/kernel/install.d/*.install</filename> with the arguments
+          <programlisting>
+remove <replaceable>KERNEL-VERSION</replaceable> <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename>
+          </programlisting>
+          </para>
+
+          <para><command>kernel-install</command> removes the entire directory
+          <filename>/boot/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename>
+          and the file
+          <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename></para>
         </listitem>
       </varlistentry>
 
@@ -140,7 +159,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           <filename>/etc/machine-id</filename>
         </term>
           <listitem>
-            <para>The content of the file specifies the machine identification &lt;MACHINE-ID>.</para>
+            <para>The content of the file specifies the machine identification <replaceable>MACHINE-ID</replaceable>.</para>
           </listitem>
       </varlistentry>
       <varlistentry>
@@ -148,7 +167,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           <filename>/etc/os-release</filename>
         </term>
           <listitem>
-            <para>The content of the file specifies the operating system id &lt;OS-ID>.</para>
+            <para>The content of the file specifies the operating system id <replaceable>OS-ID</replaceable>.</para>
           </listitem>
       </varlistentry>
     </variablelist>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 06c0af0bf7..42634febac 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -129,7 +129,7 @@
                 <example>
                         <title>German locale with English messages</title>
 
-                        <para><filename>/etc/locale.conf:</filename></para>
+                        <para><filename>/etc/locale.conf</filename>:</para>
 
                         <programlisting>LANG=de_DE.UTF-8
 LC_MESSAGES=C</programlisting>
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index cac275b453..876ebfa3cc 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -168,7 +168,7 @@
                 <example>
                         <title>Invoke a program</title>
 
-                        <para>This calls <filename>/bin/ls</filename>
+                        <para>This calls <filename noindex='true'>/bin/ls</filename>
                         with STDOUT/STDERR connected to the
                         journal:</para>
 
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index a80cec4e6c..e7c859d11d 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -360,7 +360,7 @@
 # systemd-nspawn -bD /srv/mycontainer</programlisting>
 
                 <para>This installs a minimal Fedora distribution into
-                the directory <filename>/srv/mycontainer/</filename> and
+                the directory <filename noindex='true'>/srv/mycontainer/</filename> and
                 then boots an OS in a namespace container in
                 it.</para>
         </refsect1>
diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
index 9fe953e8c6..cf04713a00 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -70,7 +70,7 @@
                 <filename>/usr</filename> and the virtual kernel API
                 file systems such as <filename>/proc</filename>,
                 <filename>/sys</filename> or
-                <filename>/dev/</filename>. This service executes no
+                <filename>/dev</filename>. This service executes no
                 operation if <filename>/etc/fstab</filename> does not
                 exist or lists no entries for the mentioned file
                 systems.</para>
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index f0a4293dea..e01cac7bc2 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -70,7 +70,7 @@
 
                 <para>Automount units must be named after the
                 automount directories they control. Example: the
-                automount point <filename>/home/lennart</filename>
+                automount point <filename noindex='true'>/home/lennart</filename>
                 must be configured in a unit file
                 <filename>home-lennart.automount</filename>. For
                 details about the escaping logic used to convert a
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 3f6d012c11..7dffa236cf 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -80,7 +80,7 @@
                 <para>Device units are named after the
                 <filename>/sys</filename> and
                 <filename>/dev</filename> paths they control. Example:
-                the device <filename>/dev/sda5</filename> is exposed
+                the device <filename noindex='true'>/dev/sda5</filename> is exposed
                 in systemd as <filename>dev-sda5.device</filename>. For
                 details about the escaping logic used to convert a
                 file system path to a unit name see
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index c25d96e9fd..b3e0287d72 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -799,10 +799,10 @@
                                 space-separated list of cgroup
                                 identifiers. A cgroup identifier is
                                 formatted like
-                                <filename>cpu:/foo/bar</filename>,
+                                <filename noindex='true'>cpu:/foo/bar</filename>,
                                 where "cpu" indicates the kernel
                                 control group controller used, and
-                                <filename>/foo/bar</filename> is the
+                                <filename noindex='true'>/foo/bar</filename> is the
                                 control group path. The controller
                                 name and ":" may be omitted in which
                                 case the named systemd control group
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 23e1e6c28e..21177a2623 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -86,7 +86,7 @@
 
                 <para>Mount units must be named after the mount point
                 directories they control. Example: the mount point
-                <filename>/home/lennart</filename> must be configured
+                <filename noindex='true'>/home/lennart</filename> must be configured
                 in a unit file
                 <filename>home-lennart.mount</filename>. For details
                 about the escaping logic used to convert a file system
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 78b04f58d9..8268e6164d 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -79,7 +79,7 @@
 
                 <para>Swap units must be named after the devices
                 or files they control. Example: the swap device
-                <filename>/dev/sda5</filename> must be configured in a
+                <filename noindex='true'>/dev/sda5</filename> must be configured in a
                 unit file <filename>dev-sda5.swap</filename>. For
                 details about the escaping logic used to convert a
                 file system path to a unit name see
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index f924ef69dd..2f2d1a1d4a 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -197,7 +197,7 @@
                 <para>Some unit names reflect paths existing in the
                 file system name space. Example: a device unit
                 <filename>dev-sda.device</filename> refers to a device
-                with the device node <filename>/dev/sda</filename> in
+                with the device node <filename noindex='true'>/dev/sda</filename> in
                 the file system namespace. If this applies a special
                 way to escape the path name is used, so that the
                 result is usable as part of a file name. Basically,
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index f60b571b72..09a4776705 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -124,7 +124,7 @@
                 <example>
                         <title>German keyboard and console</title>
 
-                        <para><filename>/etc/vconsole.conf:</filename></para>
+                        <para><filename>/etc/vconsole.conf</filename>:</para>
 
                         <programlisting>KEYMAP=de-latin1
 FONT=latarcyrheb-sun16</programlisting>