man: Remove whitespace from --os-variant list

Author: crobinso

man/en/virt-install.1

@@ -383,111 +383,62 @@ If the special value 'none' is passed, no os variant is recorded and
 .Sp
 Values for some recent \s-1OS\s0 options are:
 .RS 2
-.IP "windows" 4
-.IX Item "windows"
-.RS 4
+.IP "win7                 : Microsoft Windows 7" 2
+.IX Item "win7                 : Microsoft Windows 7"
 .PD 0
-.IP "win7" 4
-.IX Item "win7"
-.PD
-Microsoft Windows 7
-.IP "vista" 4
-.IX Item "vista"
-Microsoft Windows Vista
-.IP "winxp64" 4
-.IX Item "winxp64"
-Microsoft Windows \s-1XP\s0 (x86_64)
-.IP "winxp" 4
-.IX Item "winxp"
-Microsoft Windows \s-1XP\s0
-.IP "win2k8" 4
-.IX Item "win2k8"
-Microsoft Windows Server 2008
-.RE
-.RS 4
-.RE
-.IP "unix" 4
-.IX Item "unix"
-.RS 4
-.PD 0
-.IP "freebsd8" 4
-.IX Item "freebsd8"
-.PD
-FreeBSD 8.x
-.RE
-.RS 4
-.RE
-.IP "other" 4
-.IX Item "other"
-.RS 4
-.PD 0
-.IP "generic" 4
-.IX Item "generic"
-.PD
-Generic
+.IP "vista                : Microsoft Windows Vista" 2
+.IX Item "vista                : Microsoft Windows Vista"
+.IP "winxp64              : Microsoft Windows \s-1XP\s0 (x86_64)" 2
+.IX Item "winxp64              : Microsoft Windows XP (x86_64)"
+.IP "winxp                : Microsoft Windows \s-1XP\s0" 2
+.IX Item "winxp                : Microsoft Windows XP"
+.IP "win2k8               : Microsoft Windows Server 2008" 2
+.IX Item "win2k8               : Microsoft Windows Server 2008"
+.IP "freebsd8             : FreeBSD 8.x" 2
+.IX Item "freebsd8             : FreeBSD 8.x"
+.IP "generic              : Generic" 2
+.IX Item "generic              : Generic"
+.IP "debiansqueeze        : Debian Squeeze" 2
+.IX Item "debiansqueeze        : Debian Squeeze"
+.IP "debianlenny          : Debian Lenny" 2
+.IX Item "debianlenny          : Debian Lenny"
+.IP "fedora16             : Fedora 16" 2
+.IX Item "fedora16             : Fedora 16"
+.IP "fedora15             : Fedora 15" 2
+.IX Item "fedora15             : Fedora 15"
+.IP "fedora14             : Fedora 14" 2
+.IX Item "fedora14             : Fedora 14"
+.IP "mes5.1               : Mandriva Enterprise Server 5.1 and later" 2
+.IX Item "mes5.1               : Mandriva Enterprise Server 5.1 and later"
+.IP "mandriva2010         : Mandriva Linux 2010 and later" 2
+.IX Item "mandriva2010         : Mandriva Linux 2010 and later"
+.IP "rhel6                : Red Hat Enterprise Linux 6" 2
+.IX Item "rhel6                : Red Hat Enterprise Linux 6"
+.IP "rhel5.4              : Red Hat Enterprise Linux 5.4 or later" 2
+.IX Item "rhel5.4              : Red Hat Enterprise Linux 5.4 or later"
+.IP "rhel4                : Red Hat Enterprise Linux 4" 2
+.IX Item "rhel4                : Red Hat Enterprise Linux 4"
+.IP "sles11               : Suse Linux Enterprise Server 11" 2
+.IX Item "sles11               : Suse Linux Enterprise Server 11"
+.IP "sles10               : Suse Linux Enterprise Server" 2
+.IX Item "sles10               : Suse Linux Enterprise Server"
+.IP "ubuntuoneiric        : Ubuntu 11.10 (Oneiric Ocelot)" 2
+.IX Item "ubuntuoneiric        : Ubuntu 11.10 (Oneiric Ocelot)"
+.IP "ubuntunatty          : Ubuntu 11.04 (Natty Narwhal)" 2
+.IX Item "ubuntunatty          : Ubuntu 11.04 (Natty Narwhal)"
+.IP "ubuntumaverick       : Ubuntu 10.10 (Maverick Meerkat)" 2
+.IX Item "ubuntumaverick       : Ubuntu 10.10 (Maverick Meerkat)"
+.IP "ubuntulucid          : Ubuntu 10.04 (Lucid Lynx)" 2
+.IX Item "ubuntulucid          : Ubuntu 10.04 (Lucid Lynx)"
+.IP "ubuntuhardy          : Ubuntu 8.04 \s-1LTS\s0 (Hardy Heron)" 2
+.IX Item "ubuntuhardy          : Ubuntu 8.04 LTS (Hardy Heron)"
 .RE
-.RS 4
-.RE
-.IP "linux" 4
-.IX Item "linux"
-.RS 4
-.PD 0
-.IP "debiansqueeze" 4
-.IX Item "debiansqueeze"
+.RS 2
 .PD
-Debian Squeeze
-.IP "debianlenny" 4
-.IX Item "debianlenny"
-Debian Lenny
-.IP "fedora16" 4
-.IX Item "fedora16"
-Fedora 16
-.IP "fedora15" 4
-.IX Item "fedora15"
-Fedora 15
-.IP "fedora14" 4
-.IX Item "fedora14"
-Fedora 14
-.IP "mes5.1" 4
-.IX Item "mes5.1"
-Mandriva Enterprise Server 5.1 and later
-.IP "mandriva2010" 4
-.IX Item "mandriva2010"
-Mandriva Linux 2010 and later
-.IP "rhel6" 4
-.IX Item "rhel6"
-Red Hat Enterprise Linux 6
-.IP "rhel5.4" 4
-.IX Item "rhel5.4"
-Red Hat Enterprise Linux 5.4 or later
-.IP "rhel4" 4
-.IX Item "rhel4"
-Red Hat Enterprise Linux 4
-.IP "sles11" 4
-.IX Item "sles11"
-Suse Linux Enterprise Server 11
-.IP "sles10" 4
-.IX Item "sles10"
-Suse Linux Enterprise Server
-.IP "ubuntuoneiric" 4
-.IX Item "ubuntuoneiric"
-Ubuntu 11.10 (Oneiric Ocelot)
-.IP "ubuntunatty" 4
-.IX Item "ubuntunatty"
-Ubuntu 11.04 (Natty Narwhal)
-.IP "ubuntumaverick" 4
-.IX Item "ubuntumaverick"
-Ubuntu 10.10 (Maverick Meerkat)
-.IP "ubuntulucid" 4
-.IX Item "ubuntulucid"
-Ubuntu 10.04 (Lucid Lynx)
-.IP "ubuntuhardy" 4
-.IX Item "ubuntuhardy"
-Ubuntu 8.04 \s-1LTS\s0 (Hardy Heron)
-.RE
-.RS 4
+.Sp
+Use '\-\-os\-variant list' to see the full \s-1OS\s0 list
 .RE
-.IP "\-\-boot=BOOTOPTS" 4
+.IP "\-\-boot=BOOTOPTS" 2
 .IX Item "--boot=BOOTOPTS"
 Optionally specify the post-install \s-1VM\s0 boot configuration. This option allows
 specifying a boot device order, permanently booting off kernel/initrd with
@@ -500,7 +451,7 @@ the latter case, behavior is similar to the \-\-import install option: there
 is no 'install' phase, the guest is just created and launched as specified.
 .Sp
 Some examples:
-.RS 4
+.RS 2
 .IP "\fB\-\-boot cdrom,fd,hd,network,menu=on\fR" 2
 .IX Item "--boot cdrom,fd,hd,network,menu=on"
 Set the boot device priority as first cdrom, first floppy, first harddisk,
@@ -511,9 +462,6 @@ network \s-1PXE\s0 boot. Additionally enable \s-1BIOS\s0 boot menu prompt.
 Have guest permanently boot off a local kernel/initrd pair, with the
 specified kernel options.
 .RE
-.RS 4
-.RE
-.RE
 .RS 2
 .RE
 .SS "Storage Configuration"
@@ -1300,9 +1248,3 @@ is \s-1NO\s0 \s-1WARRANTY\s0, to the extent permitted by law.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\f(CWvirsh(1)\fR, \f(CW\*(C`virt\-clone(1)\*(C'\fR, \f(CW\*(C`virt\-manager(1)\*(C'\fR, the project website \f(CW\*(C`http://virt\-manager.org\*(C'\fR
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 469:" 4
-.IX Item "Around line 469:"
-You forgot a '=back' before '=head2'

man/en/virt-install.pod.in

@@ -310,6 +310,8 @@ Values for some recent OS options are:
 
 ::VARIANT VALUES::
 
+Use '--os-variant list' to see the full OS list
+
 =item --boot=BOOTOPTS
 
 Optionally specify the post-install VM boot configuration. This option allows

setup.py

@@ -257,28 +257,20 @@ def _update_manpages(self):
         import virtinst.osdict as osdict
 
         # Build list first
-        typelist = []
+        ret = []
         for t in osdict.sort_helper(osdict.OS_TYPES):
-            varlist = []
             for v in osdict.sort_helper(osdict.OS_TYPES[t]["variants"]):
                 label = osdict.OS_TYPES[t]["variants"][v]["label"]
                 if osdict.lookup_osdict_key(None, None, t, v, "supported"):
-                    varlist.append((v, label))
-            if varlist:
-                typelist.append((t, varlist))
+                    ret.append((v, label))
 
         output = ""
-        output += "=over 4\n\n"
+        output += "=over 2\n\n"
 
-        for t, vlist in typelist:
-            output += "=item %s\n\n" % t
-            output += "=over 4\n\n"
+        for v, label in ret:
+            output += "=item %-20s : %s\n\n" % (v, label)
 
-            for v, label in vlist:
-                output += "=item %s\n\n" % v
-                output += label + "\n\n"
-
-            output += "=back\n\n"
+        output += "=back\n\n"
 
         infile = "man/en/virt-install.pod.in"
         outfile = "man/en/virt-install.pod"