diff --git a/ChangeLog b/ChangeLog
index 8405b88c..18ca24e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2013-08-22  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/chage.1.xml: Add a non breaking space between options and
+	their parameter because xml2po removes those spaces. Alioth#314401
+	* man/chfn.1.xml: Likewise.
+	* man/chgpasswd.8.xml: Likewise.
+	* man/chpasswd.8.xml: Likewise.
+	* man/chsh.1.xml: Likewise.
+	* man/faillog.8.xml: Likewise.
+	* man/gpasswd.1.xml: Likewise.
+	* man/groupadd.8.xml: Likewise.
+	* man/groupdel.8.xml: Likewise.
+	* man/groupmems.8.xml: Likewise.
+	* man/groupmod.8.xml: Likewise.
+	* man/grpck.8.xml: Likewise.
+	* man/lastlog.8.xml: Likewise.
+	* man/newusers.8.xml: Likewise.
+	* man/passwd.1.xml: Likewise.
+	* man/pwck.8.xml: Likewise.
+	* man/pwconv.8.xml: Likewise.
+	* man/su.1.xml: Likewise.
+	* man/useradd.8.xml: Likewise.
+	* man/userdel.8.xml: Likewise.
+	* man/usermod.8.xml: Likewise.
+	* man/vipw.8.xml: Likewise.
+
 2013-08-22  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/po/shadow-man-pages.pot: Regenerated.
diff --git a/man/chage.1.xml b/man/chage.1.xml
index 84b0b9cc..d05617d3 100644
--- a/man/chage.1.xml
+++ b/man/chage.1.xml
@@ -95,7 +95,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-d</option>, <option>--lastday</option> <replaceable>LAST_DAY</replaceable>
+	  <option>-d</option>, <option>--lastday</option>&nbsp;<replaceable>LAST_DAY</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -107,7 +107,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-E</option>, <option>--expiredate</option> <replaceable>EXPIRE_DATE</replaceable>
+	  <option>-E</option>, <option>--expiredate</option>&nbsp;<replaceable>EXPIRE_DATE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -133,7 +133,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-I</option>, <option>--inactive</option> <replaceable>INACTIVE</replaceable>
+	  <option>-I</option>, <option>--inactive</option>&nbsp;<replaceable>INACTIVE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -162,7 +162,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-m</option>, <option>--mindays</option> <replaceable>MIN_DAYS</replaceable>
+	  <option>-m</option>, <option>--mindays</option>&nbsp;<replaceable>MIN_DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -174,7 +174,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-M</option>, <option>--maxdays</option> <replaceable>MAX_DAYS</replaceable>
+	  <option>-M</option>, <option>--maxdays</option>&nbsp;<replaceable>MAX_DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -195,8 +195,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -208,7 +207,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-W</option>, <option>--warndays</option> <replaceable>WARN_DAYS</replaceable>
+	  <option>-W</option>, <option>--warndays</option>&nbsp;<replaceable>WARN_DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/chfn.1.xml b/man/chfn.1.xml
index 466b5126..153d67e7 100644
--- a/man/chfn.1.xml
+++ b/man/chfn.1.xml
@@ -115,7 +115,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-f</option>, <option>--full-name</option> <replaceable>FULL_NAME</replaceable>
+	  <option>-f</option>, <option>--full-name</option>&nbsp;<replaceable>FULL_NAME</replaceable>
 	</term>
 	<listitem>
 	  <para>Change the user's full name.</para>
@@ -123,7 +123,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-h</option>, <option>--home-phone</option> <replaceable>HOME_PHONE</replaceable>
+	  <option>-h</option>, <option>--home-phone</option>&nbsp;<replaceable>HOME_PHONE</replaceable>
 	</term>
 	<listitem>
 	  <para>Change the user's home phone number.</para>
@@ -131,7 +131,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-o</option>, <option>--other</option> <replaceable>OTHER</replaceable>
+	  <option>-o</option>, <option>--other</option>&nbsp;<replaceable>OTHER</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -143,7 +143,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-r</option>, <option>--room</option> <replaceable>ROOM_NUMBER</replaceable>
+	  <option>-r</option>, <option>--room</option>&nbsp;<replaceable>ROOM_NUMBER</replaceable>
 	</term>
 	<listitem>
 	  <para>Change the user's room number.</para>
@@ -151,8 +151,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -172,7 +171,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-w</option>, <option>--work-phone</option> <replaceable>WORK_PHONE</replaceable>
+	  <option>-w</option>, <option>--work-phone</option>&nbsp;<replaceable>WORK_PHONE</replaceable>
 	</term>
 	<listitem>
 	  <para>Change the user's office phone number.</para>
diff --git a/man/chgpasswd.8.xml b/man/chgpasswd.8.xml
index e9a7f15d..88a64095 100644
--- a/man/chgpasswd.8.xml
+++ b/man/chgpasswd.8.xml
@@ -144,8 +144,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml
index 81eaf6ab..31238d97 100644
--- a/man/chpasswd.8.xml
+++ b/man/chpasswd.8.xml
@@ -135,8 +135,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-c</option>, <option>--crypt-method</option>
-	  <replaceable>METHOD</replaceable>
+	  <option>-c</option>, <option>--crypt-method</option>&nbsp;<replaceable>METHOD</replaceable>
 	</term>
 	<listitem>
 	  <para>Use the specified method to encrypt the passwords.</para>
@@ -187,8 +186,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -200,8 +198,7 @@
       </varlistentry>
       <varlistentry condition="sha_crypt">
 	<term>
-	  <option>-s</option>, <option>--sha-rounds</option>
-	  <replaceable>ROUNDS</replaceable>
+	  <option>-s</option>, <option>--sha-rounds</option>&nbsp;<replaceable>ROUNDS</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/chsh.1.xml b/man/chsh.1.xml
index d29fe0d7..2c853be4 100644
--- a/man/chsh.1.xml
+++ b/man/chsh.1.xml
@@ -105,8 +105,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -118,7 +117,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-s</option>, <option>--shell</option> <replaceable>SHELL</replaceable>
+	  <option>-s</option>, <option>--shell</option>&nbsp;<replaceable>SHELL</replaceable>
 	</term>
         <listitem>                                                                                                                   
 	  <para>
diff --git a/man/faillog.8.xml b/man/faillog.8.xml
index 8c4386cf..a9132a8f 100644
--- a/man/faillog.8.xml
+++ b/man/faillog.8.xml
@@ -126,8 +126,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-l</option>, <option>--lock-secs</option>
-	  <replaceable>SEC</replaceable>
+	  <option>-l</option>, <option>--lock-secs</option>&nbsp;<replaceable>SEC</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -142,8 +141,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-m</option>, <option>--maximum</option>
-	  <replaceable>MAX</replaceable>
+	  <option>-m</option>, <option>--maximum</option>&nbsp;<replaceable>MAX</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -180,8 +178,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -192,8 +189,7 @@
 	</listitem>
       </varlistentry>
       <varlistentry>
-	<term><option>-t</option>, <option>--time</option>
-	<replaceable>DAYS</replaceable>
+	<term><option>-t</option>, <option>--time</option>&nbsp;<replaceable>DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -204,8 +200,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-u</option>, <option>--user</option>
-	  <replaceable>LOGIN</replaceable>|<replaceable>RANGE</replaceable>
+	  <option>-u</option>, <option>--user</option>&nbsp;<replaceable>LOGIN</replaceable>|<replaceable>RANGE</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/gpasswd.1.xml b/man/gpasswd.1.xml
index 7c041040..ebd1b419 100644
--- a/man/gpasswd.1.xml
+++ b/man/gpasswd.1.xml
@@ -145,7 +145,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-a</option>, <option>--add</option> <replaceable>user</replaceable>
+	  <option>-a</option>, <option>--add</option>&nbsp;<replaceable>user</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -158,7 +158,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-d</option>, <option>--delete</option> <replaceable>user</replaceable>
+	  <option>-d</option>, <option>--delete</option>&nbsp;<replaceable>user</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -179,8 +179,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-Q</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-Q</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -226,7 +225,7 @@
     <variablelist remap='IP' condition="gshadow">
       <varlistentry>
 	<term>
-	  <option>-A</option>, <option>--administrators</option> <replaceable>user</replaceable>,...
+	  <option>-A</option>, <option>--administrators</option>&nbsp;<replaceable>user</replaceable>,...
 	</term>
 	<listitem>
 	  <para>
@@ -238,7 +237,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-M</option>, <option>--members</option> <replaceable>user</replaceable>,...
+	  <option>-M</option>, <option>--members</option>&nbsp;<replaceable>user</replaceable>,...
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 064d688f..93d8b6f7 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -112,7 +112,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-g</option>, <option>--gid</option> <replaceable>GID</replaceable>
+	  <option>-g</option>, <option>--gid</option>&nbsp;<replaceable>GID</replaceable>
 	</term>
 	<listitem>
 	  <para>The numerical value of the group's ID. This value must be
@@ -135,7 +135,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-K</option>, <option>--key</option> <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>
+	  <option>-K</option>, <option>--key</option>&nbsp;<replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -144,12 +144,11 @@
 	    <option>-K</option> options can be specified.
 	  </para>
 	  <para>
-	     Example: <option>-K </option><replaceable>GID_MIN</replaceable>=<replaceable>100</replaceable>
-	    <option>-K </option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
+	     Example: <option>-K</option>&nbsp;<replaceable>GID_MIN</replaceable>=<replaceable>100</replaceable>&nbsp;
+	    <option>-K</option>&nbsp;<replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
 	  </para>
 	  <para>
-	    Note: <option>-K </option>
-	    <replaceable>GID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
+	    Note: <option>-K</option>&nbsp;<replaceable>GID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
 	    doesn't work yet.
 	  </para>
 	</listitem>
@@ -166,8 +165,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-p</option>, <option>--password</option>
-	  <replaceable>PASSWORD</replaceable>
+	  <option>-p</option>, <option>--password</option>&nbsp;<replaceable>PASSWORD</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -204,8 +202,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/groupdel.8.xml b/man/groupdel.8.xml
index f6a2c337..438e9e54 100644
--- a/man/groupdel.8.xml
+++ b/man/groupdel.8.xml
@@ -99,8 +99,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/groupmems.8.xml b/man/groupmems.8.xml
index ac000d35..2afdbd84 100644
--- a/man/groupmems.8.xml
+++ b/man/groupmems.8.xml
@@ -104,7 +104,7 @@
     </para>
     <variablelist remap='IP'>
       <varlistentry>
-	<term><option>-a</option>, <option>--add</option> <replaceable>user_name</replaceable></term>
+	<term><option>-a</option>, <option>--add</option>&nbsp;<replaceable>user_name</replaceable></term>
 	<listitem>
 	  <para>Add an user to the group membership list.</para>
 	  <para condition="gshadow">
@@ -115,7 +115,7 @@
 	</listitem>
       </varlistentry>
       <varlistentry>
-	<term><option>-d</option>, <option>--delete</option> <replaceable>user_name</replaceable></term>
+	<term><option>-d</option>, <option>--delete</option>&nbsp;<replaceable>user_name</replaceable></term>
 	<listitem>
 	  <para>Delete a user from the group membership list.</para>
 	  <para condition="gshadow">
@@ -131,7 +131,7 @@
 	</listitem>
       </varlistentry>
       <varlistentry>
-	<term><option>-g</option>, <option>--group</option> <replaceable>group_name</replaceable></term>
+	<term><option>-g</option>, <option>--group</option>&nbsp;<replaceable>group_name</replaceable></term>
 	<listitem>
 	  <para>The superuser can specify which group membership
 	    list to modify.
@@ -163,8 +163,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/groupmod.8.xml b/man/groupmod.8.xml
index cd99c612..46666252 100644
--- a/man/groupmod.8.xml
+++ b/man/groupmod.8.xml
@@ -94,7 +94,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-g</option>, <option>--gid</option> <replaceable>GID</replaceable>
+	  <option>-g</option>, <option>--gid</option>&nbsp;<replaceable>GID</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -133,8 +133,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-n</option>, <option>--new-name</option>
-	  <replaceable>NEW_GROUP</replaceable>
+	  <option>-n</option>, <option>--new-name</option>&nbsp;<replaceable>NEW_GROUP</replaceable>
 	</term>
 	<listitem>
 	  <para> 
@@ -156,8 +155,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-p</option>, <option>--password</option>
-	  <replaceable>PASSWORD</replaceable>
+	  <option>-p</option>, <option>--password</option>&nbsp;<replaceable>PASSWORD</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -178,8 +176,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/grpck.8.xml b/man/grpck.8.xml
index a1073d59..77c4bd86 100644
--- a/man/grpck.8.xml
+++ b/man/grpck.8.xml
@@ -171,8 +171,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/lastlog.8.xml b/man/lastlog.8.xml
index 4f22b04f..191b74ba 100644
--- a/man/lastlog.8.xml
+++ b/man/lastlog.8.xml
@@ -95,7 +95,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-b</option>, <option>--before</option> <replaceable>DAYS</replaceable>
+	  <option>-b</option>, <option>--before</option>&nbsp;<replaceable>DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -113,8 +113,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -126,8 +125,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-t</option>, <option>--time</option>
-	  <replaceable>DAYS</replaceable>
+	  <option>-t</option>, <option>--time</option>&nbsp;<replaceable>DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -138,8 +136,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-u</option>, <option>--user</option>
-	  <replaceable>LOGIN</replaceable>|<replaceable>RANGE</replaceable>
+	  <option>-u</option>, <option>--user</option>&nbsp;<replaceable>LOGIN</replaceable>|<replaceable>RANGE</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/newusers.8.xml b/man/newusers.8.xml
index db501eaf..c906175d 100644
--- a/man/newusers.8.xml
+++ b/man/newusers.8.xml
@@ -306,8 +306,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/passwd.1.xml b/man/passwd.1.xml
index 7144d776..eece5e90 100644
--- a/man/passwd.1.xml
+++ b/man/passwd.1.xml
@@ -218,7 +218,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-i</option>, <option>--inactive</option> <replaceable>INACTIVE</replaceable>
+	  <option>-i</option>, <option>--inactive</option>&nbsp;<replaceable>INACTIVE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -267,7 +267,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-n</option>, <option>--mindays</option> <replaceable>MIN_DAYS</replaceable>
+	  <option>-n</option>, <option>--mindays</option>&nbsp;<replaceable>MIN_DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -289,7 +289,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-r</option>, <option>--repository</option> <replaceable>REPOSITORY</replaceable>
+	  <option>-r</option>, <option>--repository</option>&nbsp;<replaceable>REPOSITORY</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -299,8 +299,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -343,7 +342,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-w</option>, <option>--warndays</option> <replaceable>WARN_DAYS</replaceable>
+	  <option>-w</option>, <option>--warndays</option>&nbsp;<replaceable>WARN_DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -356,7 +355,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-x</option>, <option>--maxdays</option> <replaceable>MAX_DAYS</replaceable>
+	  <option>-x</option>, <option>--maxdays</option>&nbsp;<replaceable>MAX_DAYS</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/pwck.8.xml b/man/pwck.8.xml
index d1e5ddd8..fbe4cd7c 100644
--- a/man/pwck.8.xml
+++ b/man/pwck.8.xml
@@ -207,8 +207,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/pwconv.8.xml b/man/pwconv.8.xml
index 0b0b6952..3e26498c 100644
--- a/man/pwconv.8.xml
+++ b/man/pwconv.8.xml
@@ -199,8 +199,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/su.1.xml b/man/su.1.xml
index b950148a..917c2835 100644
--- a/man/su.1.xml
+++ b/man/su.1.xml
@@ -148,8 +148,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-c</option>, <option>--command</option>
-	  <replaceable>COMMAND</replaceable>
+	  <option>-c</option>, <option>--command</option>&nbsp;<replaceable>COMMAND</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -186,8 +185,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-s</option>, <option>--shell</option>
-	  <replaceable>SHELL</replaceable>
+	  <option>-s</option>, <option>--shell</option>&nbsp;<replaceable>SHELL</replaceable>
 	</term>
 	<listitem>
 	  <para>The shell that will be invoked.</para>
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 34b2c158..d697d487 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -127,13 +127,11 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-b</option>, <option>--base-dir</option>
-	  <replaceable>BASE_DIR</replaceable>
+	  <option>-b</option>, <option>--base-dir</option>&nbsp;<replaceable>BASE_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
-	    The default base directory for the system if <option>-d</option>
-	    <replaceable>HOME_DIR</replaceable> is not specified.
+	    The default base directory for the system if <option>-d</option>&nbsp;<replaceable>HOME_DIR</replaceable> is not specified.
 	    <replaceable>BASE_DIR</replaceable> is
 	    concatenated with the account name to define the home directory. 
 	    If the <option>-m</option> option is not used,
@@ -150,8 +148,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-c</option>, <option>--comment</option>
-	  <replaceable>COMMENT</replaceable>
+	  <option>-c</option>, <option>--comment</option>&nbsp;<replaceable>COMMENT</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -163,8 +160,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-d</option>, <option>--home-dir</option>
-	  <replaceable>HOME_DIR</replaceable>
+	  <option>-d</option>, <option>--home-dir</option>&nbsp;<replaceable>HOME_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -190,8 +186,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-e</option>, <option>--expiredate</option>
-	  <replaceable>EXPIRE_DATE</replaceable>
+	  <option>-e</option>, <option>--expiredate</option>&nbsp;<replaceable>EXPIRE_DATE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -208,8 +203,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-f</option>, <option>--inactive</option>
-	  <replaceable>INACTIVE</replaceable>
+	  <option>-f</option>, <option>--inactive</option>&nbsp;<replaceable>INACTIVE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -228,8 +222,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-g</option>, <option>--gid</option>
-	  <replaceable>GROUP</replaceable>
+	  <option>-g</option>, <option>--gid</option>&nbsp;<replaceable>GROUP</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -256,8 +249,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-G</option>, <option>--groups</option>
-	  <replaceable>GROUP1</replaceable>[<emphasis remap='I'>,GROUP2,...</emphasis>[<emphasis remap='I'>,GROUPN</emphasis>]]]
+	  <option>-G</option>, <option>--groups</option>&nbsp;<replaceable>GROUP1</replaceable>[<emphasis remap='I'>,GROUP2,...</emphasis>[<emphasis remap='I'>,GROUPN</emphasis>]]]
 	</term>
 	<listitem>
 	  <para>
@@ -278,8 +270,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-k</option>, <option>--skel</option>
-	  <replaceable>SKEL_DIR</replaceable>
+	  <option>-k</option>, <option>--skel</option>&nbsp;<replaceable>SKEL_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -304,8 +295,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-K</option>, <option>--key</option>
-	  <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>
+	  <option>-K</option>, <option>--key</option>&nbsp;<replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -315,18 +305,15 @@
 	    and others).
 	  <para>
 	  </para>
-	    Example: <option>-K </option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</replaceable>
+	    Example: <option>-K</option>&nbsp;<replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</replaceable>
 	    can be used when creating system account to turn off password
 	    ageing, even though system account has no password at all.
 	    Multiple <option>-K</option> options can be specified, e.g.:
-	    <option>-K </option>
-	    <replaceable>UID_MIN</replaceable>=<replaceable>100</replaceable>
-	    <option>-K </option>
-	    <replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
+	    <option>-K</option>&nbsp;<replaceable>UID_MIN</replaceable>=<replaceable>100</replaceable>&nbsp;
+	    <option>-K</option>&nbsp;<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
 	  </para>
 	  <!--para>
-	    Note: <option>-K </option>
-	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
+	    Note: <option>-K</option>&nbsp;<replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
 	    doesn't work yet.
 	  </para-->
 	</listitem>
@@ -408,8 +395,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-p</option>, <option>--password</option>
-	  <replaceable>PASSWORD</replaceable>
+	  <option>-p</option>, <option>--password</option>&nbsp;<replaceable>PASSWORD</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -457,8 +443,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -470,8 +455,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-s</option>, <option>--shell</option>
-	  <replaceable>SHELL</replaceable>
+	  <option>-s</option>, <option>--shell</option>&nbsp;<replaceable>SHELL</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -485,8 +469,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-u</option>, <option>--uid</option>
-	  <replaceable>UID</replaceable>
+	  <option>-u</option>, <option>--uid</option>&nbsp;<replaceable>UID</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -521,8 +504,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-Z</option>, <option>--selinux-user</option>
-	  <replaceable>SEUSER</replaceable>
+	  <option>-Z</option>, <option>--selinux-user</option>&nbsp;<replaceable>SEUSER</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -546,8 +528,7 @@
       <variablelist remap='IP'>
 	<varlistentry>
 	  <term>
-	    <option>-b</option>, <option>--base-dir</option>
-	    <replaceable>BASE_DIR</replaceable>
+	    <option>-b</option>, <option>--base-dir</option>&nbsp;<replaceable>BASE_DIR</replaceable>
 	  </term>
 	  <listitem>
 	    <para>
@@ -565,8 +546,7 @@
 	</varlistentry>
 	<varlistentry>
 	  <term>
-	    <option>-e</option>, <option>--expiredate</option>
-	    <replaceable>EXPIRE_DATE</replaceable>
+	    <option>-e</option>, <option>--expiredate</option>&nbsp;<replaceable>EXPIRE_DATE</replaceable>
 	  </term>
 	  <listitem>
 	    <para>The date on which the user account is disabled.</para>
@@ -578,8 +558,7 @@
 	</varlistentry>
 	<varlistentry>
 	  <term>
-	    <option>-f</option>, <option>--inactive</option>
-	    <replaceable>INACTIVE</replaceable>
+	    <option>-f</option>, <option>--inactive</option>&nbsp;<replaceable>INACTIVE</replaceable>
 	  </term>
 	  <listitem>
 	    <para>
@@ -594,8 +573,7 @@
 	</varlistentry>
 	<varlistentry>
 	  <term>
-	    <option>-g</option>, <option>--gid</option>
-	    <replaceable>GROUP</replaceable>
+	    <option>-g</option>, <option>--gid</option>&nbsp;<replaceable>GROUP</replaceable>
 	  </term>
 	  <listitem>
 	    <para>
@@ -615,8 +593,7 @@
 	</varlistentry>
 	<varlistentry>
 	  <term>
-	    <option>-s</option>, <option>--shell</option>
-	    <replaceable>SHELL</replaceable>
+	    <option>-s</option>, <option>--shell</option>&nbsp;<replaceable>SHELL</replaceable>
 	  </term>
 	  <listitem>
 	    <para>
diff --git a/man/userdel.8.xml b/man/userdel.8.xml
index 589701ac..3f95a8d9 100644
--- a/man/userdel.8.xml
+++ b/man/userdel.8.xml
@@ -144,8 +144,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/usermod.8.xml b/man/usermod.8.xml
index c3b78619..e1ffdfb7 100644
--- a/man/usermod.8.xml
+++ b/man/usermod.8.xml
@@ -109,8 +109,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-c</option>, <option>--comment</option>
-	  <replaceable>COMMENT</replaceable>
+	  <option>-c</option>, <option>--comment</option>&nbsp;<replaceable>COMMENT</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -123,8 +122,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-d</option>, <option>--home</option>
-	  <replaceable>HOME_DIR</replaceable>
+	  <option>-d</option>, <option>--home</option>&nbsp;<replaceable>HOME_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -140,8 +138,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-e</option>, <option>--expiredate</option>
-	  <replaceable>EXPIRE_DATE</replaceable>
+	  <option>-e</option>, <option>--expiredate</option>&nbsp;<replaceable>EXPIRE_DATE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -161,8 +158,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-f</option>, <option>--inactive</option>
-	  <replaceable>INACTIVE</replaceable>
+	  <option>-f</option>, <option>--inactive</option>&nbsp;<replaceable>INACTIVE</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -183,8 +179,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-g</option>, <option>--gid</option>
-	  <replaceable>GROUP</replaceable>
+	  <option>-g</option>, <option>--gid</option>&nbsp;<replaceable>GROUP</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -203,8 +198,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-G</option>, <option>--groups</option>
-	  <replaceable>GROUP1</replaceable>[<emphasis remap='I'>,GROUP2,...</emphasis>[<emphasis remap='I'>,GROUPN</emphasis>]]]
+	  <option>-G</option>, <option>--groups</option>&nbsp;<replaceable>GROUP1</replaceable>[<emphasis remap='I'>,GROUP2,...</emphasis>[<emphasis remap='I'>,GROUPN</emphasis>]]]
 	</term>
 	<listitem>
 	  <para>
@@ -224,8 +218,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-l</option>, <option>--login</option>
-	  <replaceable>NEW_LOGIN</replaceable>
+	  <option>-l</option>, <option>--login</option>&nbsp;<replaceable>NEW_LOGIN</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -289,8 +282,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-p</option>, <option>--password</option>
-	  <replaceable>PASSWORD</replaceable>
+	  <option>-p</option>, <option>--password</option>&nbsp;<replaceable>PASSWORD</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -317,8 +309,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -330,8 +321,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-s</option>, <option>--shell</option>
-	  <replaceable>SHELL</replaceable>
+	  <option>-s</option>, <option>--shell</option>&nbsp;<replaceable>SHELL</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -342,8 +332,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-u</option>, <option>--uid</option>
-	  <replaceable>UID</replaceable>
+	  <option>-u</option>, <option>--uid</option>&nbsp;<replaceable>UID</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -393,8 +382,7 @@
       </varlistentry>
       <varlistentry condition="subids">
 	<term>
-	  <option>-v</option>, <option>--add-sub-uids</option>
-	  <replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
+	  <option>-v</option>, <option>--add-sub-uids</option>&nbsp;<replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -412,8 +400,7 @@
       </varlistentry>
       <varlistentry condition="subids">
 	<term>
-	  <option>-V</option>, <option>--del-sub-uids</option>
-	  <replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
+	  <option>-V</option>, <option>--del-sub-uids</option>&nbsp;<replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -433,8 +420,7 @@
       </varlistentry>
       <varlistentry condition="subids">
 	<term>
-	  <option>-w</option>, <option>--add-sub-gids</option>
-	  <replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
+	  <option>-w</option>, <option>--add-sub-gids</option>&nbsp;<replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -452,8 +438,7 @@
       </varlistentry>
       <varlistentry condition="subids">
 	<term>
-	  <option>-W</option>, <option>--del-sub-gids</option>
-	  <replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
+	  <option>-W</option>, <option>--del-sub-gids</option>&nbsp;<replaceable>FIRST</replaceable>-<replaceable>LAST</replaceable>
 	</term>
 	<listitem>
 	  <para>
@@ -473,8 +458,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-Z</option>, <option>--selinux-user</option>
-	  <replaceable>SEUSER</replaceable>
+	  <option>-Z</option>, <option>--selinux-user</option>&nbsp;<replaceable>SEUSER</replaceable>
 	</term>
 	<listitem>
 	  <para>
diff --git a/man/vipw.8.xml b/man/vipw.8.xml
index b04147a8..810ef597 100644
--- a/man/vipw.8.xml
+++ b/man/vipw.8.xml
@@ -136,8 +136,7 @@
       </varlistentry>
       <varlistentry>
 	<term>
-	  <option>-R</option>, <option>--root</option>
-	  <replaceable>CHROOT_DIR</replaceable>
+	  <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
 	</term>
 	<listitem>
 	  <para>