doc: made format of man page option lists consistent

1 files changed, 70 insertions, 36 deletions

diff --git a/man/bcfg2-server.8 b/man/bcfg2-server.8
index 7bbfb87c3..2a34ede70 100644
--- a/man/bcfg2-server.8
+++ b/man/bcfg2-server.8
@@ -1,48 +1,82 @@
+.TH "BCFG2-SERVER" "8" "November 07, 2012" "1.3" "Bcfg2"
+.SH NAME
+bcfg2-server \- Server for client configuration specifications
 .
-.TH "BCFG2\-SERVER" "8" "September 2012" "" ""
+.nr rst2man-indent-level 0
 .
-.SH "NAME"
-\fBbcfg2\-server\fR \- Server for client configuration specifications
-.
-.SH "SYNOPSIS"
-\fBbcfg2\-server\fR [\-d] [\-v] [\-C \fIconfigfile\fR] [\-D \fIpidfile\fR] [\-E \fIencoding\fR] [\-Q \fIrepo path\fR] [\-S \fIserver url\fR] [\-o \fIlogfile\fR] [\-x \fIpassword\fR] [\-\-ssl\-key=\fIssl key\fR]
-.
-.SH "DESCRIPTION"
-\fBbcfg2\-server\fR is the daemon component of Bcfg2 which serves configurations to clients based on the data in its repository\.
-.
-.SH "OPTIONS"
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" Man page generated from reStructeredText.
 .
+.SH SYNOPSIS
+.sp
+\fBbcfg2\-server\fP [\-d] [\-v] [\-C \fIconfigfile\fP] [\-D \fIpidfile\fP] [\-E
+\fIencoding\fP] [\-Q \fIrepo path\fP] [\-S \fIserver url\fP] [\-o \fIlogfile\fP] [\-x
+\fIpassword\fP] [\-\-ssl\-key=\fIssl key\fP]
+.SH DESCRIPTION
+.sp
+\fBbcfg2\-server\fP is the daemon component of Bcfg2 which serves
+configurations to clients based on the data in its repository.
+.SH OPTIONS
+.INDENT 0.0
 .TP
-\fB\-C\fR \fIconfigfile\fR
-Specify alternate bcfg2\.conf location\.
-.
+.BI \-C \ configfile
+Specify alternate bcfg2.conf location.
 .TP
-\fB\-D\fR \fIpidfile\fR
-Daemonize, placing the program pid in the specified pidfile\.
-.
+.BI \-D \ pidfile
+Daemonize, placing the program pid in the specified
+pidfile.
 .TP
-\fB\-E\fR \fIencoding\fR
-Specify alternate encoding (default is UTF\-8)\.
-.
+.BI \-E \ encoding
+Specify the encoding of config files.
 .TP
-\fB\-Q\fR \fIrepo path\fR
-Set repository path\.
-.
+.BI \-Q \ path
+Specify the path to the server repository.
 .TP
-\fB\-S\fR \fIserver url\fR
-Set server address\.
-.
+.BI \-S \ server
+Manually specify the server location (as opposed to
+using the value in bcfg2.conf). This should be in
+the format "\fI\%https://server:port\fP"
 .TP
-\fB\-d\fR
-Run \fBbcfg2\-server\fR in debug mode\.
-.
+.B \-d
+Enable debugging output.
 .TP
-\fB\-v\fR
-Run \fBbcfg2\-server\fR in verbose mode\.
-.
+.B \-v
+Run in verbose mode.
+.TP
+.B \-h
+Print usage information.
 .TP
-\fB\-\-ssl\-key=\fR\fIssl key\fR
-Set path to SSL key\.
+.BI \-\-ssl\-key\fB= key
+Specify the path to the SSL key.
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fIbcfg2(1)\fP, \fIbcfg2\-lint(8)\fP
+.SH COPYRIGHT
+2009-2012, Narayan Desai
+.\" Generated by docutils manpage writer.
+.\" 
 .
-.SH "SEE ALSO"
-bcfg2(1), bcfg2\-lint(8)