diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index bf2e38b4c4d..47dd09158e9 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -206,7 +206,7 @@
   <variablelist>
    <varlistentry>
     <term>
-     <varname>types.enum</varname><replaceable>l</replaceable>
+     <varname>types.enum</varname> <replaceable>l</replaceable>
     </term>
     <listitem>
      <para>
@@ -218,7 +218,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.separatedString</varname><replaceable>sep</replaceable>
+     <varname>types.separatedString</varname> <replaceable>sep</replaceable>
     </term>
     <listitem>
      <para>
@@ -229,7 +229,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.ints.between</varname><replaceable>lowest</replaceable><replaceable>highest</replaceable>
+     <varname>types.ints.between</varname> <replaceable>lowest</replaceable> <replaceable>highest</replaceable>
     </term>
     <listitem>
      <para>
@@ -241,7 +241,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.submodule</varname><replaceable>o</replaceable>
+     <varname>types.submodule</varname> <replaceable>o</replaceable>
     </term>
     <listitem>
      <para>
@@ -269,7 +269,7 @@
   <variablelist>
    <varlistentry>
     <term>
-     <varname>types.listOf</varname><replaceable>t</replaceable>
+     <varname>types.listOf</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -280,7 +280,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.attrsOf</varname><replaceable>t</replaceable>
+     <varname>types.attrsOf</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -292,7 +292,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.loaOf</varname><replaceable>t</replaceable>
+     <varname>types.loaOf</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -303,7 +303,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.nullOr</varname><replaceable>t</replaceable>
+     <varname>types.nullOr</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -314,7 +314,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.uniq</varname><replaceable>t</replaceable>
+     <varname>types.uniq</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -325,7 +325,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.either</varname><replaceable>t1</replaceable><replaceable>t2</replaceable>
+     <varname>types.either</varname> <replaceable>t1</replaceable> <replaceable>t2</replaceable>
     </term>
     <listitem>
      <para>
@@ -337,7 +337,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.coercedTo</varname><replaceable>from</replaceable><replaceable>f</replaceable><replaceable>to</replaceable>
+     <varname>types.coercedTo</varname> <replaceable>from</replaceable> <replaceable>f</replaceable> <replaceable>to</replaceable>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 34b3eef8b21..25f4f40613a 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -62,15 +62,15 @@
     <arg choice='plain'>
      <option>-j</option>
     </arg>
-     </group><replaceable>number</replaceable>
+     </group> <replaceable>number</replaceable>
    </arg>
     
    <arg>
-    <option>--cores</option><replaceable>number</replaceable>
+    <option>--cores</option> <replaceable>number</replaceable>
    </arg>
     
    <arg>
-    <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+    <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
    </arg>
     
    <arg>
@@ -213,7 +213,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+     <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index e087a18eba8..d436cce742a 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -15,7 +15,7 @@
   <cmdsynopsis>
    <command>nixos-option</command> 
    <arg>
-    <option>-I</option><replaceable>path</replaceable>
+    <option>-I</option> <replaceable>path</replaceable>
    </arg>
     
    <arg>
@@ -51,7 +51,7 @@
   <variablelist>
    <varlistentry>
     <term>
-     <option>-I</option><replaceable>path</replaceable>
+     <option>-I</option> <replaceable>path</replaceable>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index 1dbcfd329bc..551a65f5e96 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -76,7 +76,7 @@
     <arg choice='plain'>
      <option>-p</option>
     </arg>
-     </group><replaceable>name</replaceable>
+     </group> <replaceable>name</replaceable>
    </arg>
    <sbr />
    <arg>