[Hostname-devel] [SCM] Git repository for hostname branch, master, updated. debian/3.10-4-g3ef07de

[Michael Meskes]

The following commit has been merged in the master branch:
commit bf6f7216ec75585fa1740f69c7d377af37e24d43
Author: Michael Meskes <meskes at debian.org>
Date:   Thu Feb 16 16:00:30 2012 +0100

    Combine options in manpage.

diff --git a/hostname.1 b/hostname.1
index 95eb824..e290668 100644
--- a/hostname.1
+++ b/hostname.1
@@ -15,39 +15,25 @@ dnsdomainname \- show the system's DNS domain name
 .SH SYNOPSIS
 .B hostname
 .RB [ \-v ]
-.RB [ \-a ]
-.RB [ \-\-alias ]
-.RB [ \-d ]
-.RB [ \-\-domain ]
-.RB [ \-f ]
-.RB [ \-\-fqdn ]
-.RB [ \-A ]
-.RB [ \-\-all-fqdns ]
-.RB [ \-i ]
-.RB [ \-\-ip-address ]
-.RB [ \-I ]
-.RB [ \-\-all-ip-addresses ]
-.RB [ \-\-long ]
-.RB [ \-s ]
-.RB [ \-\-short ]
-.RB [ \-y ]
-.RB [ \-\-yp ]
-.RB [ \-\-nis ]
+.RB [ \-a|\-\-alias ]
+.RB [ \-d|\-\-domain ]
+.RB [ \-f|\-\-fqdn|\-\-long ]
+.RB [ \-A|\-\-all-fqdns ]
+.RB [ \-i|\-\-ip-address ]
+.RB [ \-I|\-\-all-ip-addresses ]
+.RB [ \-s|\-\-short ]
+.RB [ \-y|\-\-yp|\-\-nis ]
 .br
 .B hostname
 .RB [ \-v ]
-.RB [ \-b ]
-.RB [ \-\-boot ]
-.RB [ \-F\ filename ]
-.RB [ \-\-file\ filename ]
+.RB [ \-b|\-\-boot ]
+.RB [ \-F|\-\-file\ filename ]
 .RB [ hostname ]
 .br
 .B hostname
 .RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-\-help ]
-.RB [ \-V ]
-.RB [ \-\-version ]
+.RB [ \-h|\-\-help ]
+.RB [ \-V|\-\-version ]
 .PP
 .B domainname
 .RB [ nisdomain ]

-- 
Git repository for hostname