Section renumbering and more consistent use of .BR.  Add language

describing use of SMF.  Fix a few small errors.  Some of this is obviously

Solaris-specific, but the rest could be submitted upstream.

diff --git a/doc/manpages/account-server.conf.5 b/doc/manpages/account-server.conf.5

--- a/doc/manpages/account-server.conf.5

+++ b/doc/manpages/account-server.conf.5

@@ -15,12 +15,12 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"

-.TH account-server.conf 5 "8/26/2011" "Linux" "OpenStack Swift"

+.TH account-server.conf 4 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME

 .LP

 .B account-server.conf

-\- configuration file for the openstack-swift account server

+\- configuration file for the OpenStack Swift account server

@@ -245,13 +245,13 @@ Connection timeout to external services.

 .SH DOCUMENTATION

 .LP

 More in depth documentation about the swift-account-server and

-also Openstack-Swift as a whole can be found at

+also OpenStack Swift as a whole can be found at

 .BI http://swift.openstack.org/admin_guide.html

 and

 .BI http://swift.openstack.org

 .SH "SEE ALSO"

-.BR swift-account-server(1),

+.BR swift-account-server (1)

diff --git a/doc/manpages/container-server.conf.5 b/doc/manpages/container-server.conf.5

--- a/doc/manpages/container-server.conf.5

+++ b/doc/manpages/container-server.conf.5

@@ -15,12 +15,12 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"

-.TH container-server.conf 5 "8/26/2011" "Linux" "OpenStack Swift"

+.TH container-server.conf 4 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME

 .LP

 .B container-server.conf

-\- configuration file for the openstack-swift container server

+\- configuration file for the OpenStack Swift container server

@@ -270,13 +270,13 @@ Maximum amount of time to spend syncing 

 .SH DOCUMENTATION

 .LP

 More in depth documentation about the swift-container-server and

-also Openstack-Swift as a whole can be found at

+also OpenStack Swift as a whole can be found at

 .BI http://swift.openstack.org/admin_guide.html

 and

 .BI http://swift.openstack.org

 .SH "SEE ALSO"

-.BR swift-container-server(1),

+.BR swift-container-server (1)

diff --git a/doc/manpages/dispersion.conf.5 b/doc/manpages/dispersion.conf.5

--- a/doc/manpages/dispersion.conf.5

+++ b/doc/manpages/dispersion.conf.5

@@ -15,12 +15,12 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH dispersion.conf 5 "8/26/2011" "Linux" "OpenStack Swift"

+.TH dispersion.conf 4 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B dispersion.conf

-\- configuration file for the openstack-swift dispersion tools 

+\- configuration file for the OpenStack Swift dispersion tools 

 .SH SYNOPSIS

 .LP

@@ -43,7 +43,7 @@ Authentication system account/user name

 .IP "\fBauth_key\fR"

 Authentication system account/user password 

 .IP "\fBswift_dir\fR"

-Location of openstack-swift configuration and ring files

+Location of OpenStack Swift configuration and ring files

 .IP "\fBdispersion_coverage\fR"

 Percentage of partition coverage to use. The default is 1.

 .IP "\fBretries\fR"

@@ -80,13 +80,13 @@ Whether to run the object report. The de

 .SH DOCUMENTATION

 .LP

 More in depth documentation about the swift-dispersion utilities and

-also Openstack-Swift as a whole can be found at 

+also OpenStack Swift as a whole can be found at 

 .BI http://swift.openstack.org/admin_guide.html#cluster-health

 and 

 .BI http://swift.openstack.org

 .SH "SEE ALSO"

-.BR swift-dispersion-report(1),

-.BR swift-dispersion-populate(1)

+.BR swift-dispersion-report (1),

+.BR swift-dispersion-populate (1)

diff --git a/doc/manpages/object-expirer.conf.5 b/doc/manpages/object-expirer.conf.5

--- a/doc/manpages/object-expirer.conf.5

+++ b/doc/manpages/object-expirer.conf.5

@@ -15,12 +15,12 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH object-expirer.conf 5 "03/15/2012" "Linux" "OpenStack Swift"

+.TH object-expirer.conf 4 "03/15/2012" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B object-expirer.conf

-\- configuration file for the openstack-swift object exprier daemon  

+\- configuration file for the OpenStack Swift object exprier daemon  

@@ -133,12 +133,12 @@ The default is \fBegg:swift#catch_errors

 .SH DOCUMENTATION

 .LP

 More in depth documentation about the swift-object-expirer and

-also Openstack-Swift as a whole can be found at 

+also OpenStack Swift as a whole can be found at 

 .BI http://swift.openstack.org/admin_guide.html 

 and 

 .BI http://swift.openstack.org

 .SH "SEE ALSO"

-.BR swift-proxy-server.conf(5),

+.BR proxy-server.conf (4)

diff --git a/doc/manpages/object-server.conf.5 b/doc/manpages/object-server.conf.5

--- a/doc/manpages/object-server.conf.5

+++ b/doc/manpages/object-server.conf.5

@@ -15,12 +15,12 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"

-.TH object-server.conf 5 "8/26/2011" "Linux" "OpenStack Swift"

+.TH object-server.conf 4 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME

 .LP

 .B object-server.conf

-\- configuration file for the openstack-swift object server

+\- configuration file for the OpenStack Swift object server

@@ -262,13 +262,13 @@ The default is 50.

 .SH DOCUMENTATION

 .LP

 More in depth documentation about the swift-object-server and

-also Openstack-Swift as a whole can be found at

+also OpenStack Swift as a whole can be found at

 .BI http://swift.openstack.org/admin_guide.html

 and

 .BI http://swift.openstack.org

 .SH "SEE ALSO"

-.BR swift-object-server(1),

+.BR swift-object-server (1)

diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5

--- a/doc/manpages/proxy-server.conf.5

+++ b/doc/manpages/proxy-server.conf.5

@@ -15,12 +15,12 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"

-.TH proxy-server.conf 5 "8/26/2011" "Linux" "OpenStack Swift"

+.TH proxy-server.conf 4 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME

 .LP

 .B proxy-server.conf

-\- configuration file for the openstack-swift proxy server

+\- configuration file for the OpenStack Swift proxy server

@@ -539,10 +539,10 @@ per second.  The default is 1.

 .SH DOCUMENTATION

 .LP

 More in depth documentation about the swift-proxy-server and

-also Openstack-Swift as a whole can be found at

+also OpenStack Swift as a whole can be found at

 .BI http://swift.openstack.org/admin_guide.html

 and

 .BI http://swift.openstack.org

 .SH "SEE ALSO"

-.BR swift-proxy-server(1)

+.BR swift-proxy-server (1)

diff --git a/doc/manpages/swift-account-auditor.1 b/doc/manpages/swift-account-auditor.1

--- a/doc/manpages/swift-account-auditor.1

+++ b/doc/manpages/swift-account-auditor.1

@@ -15,16 +15,16 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH swift-account-auditor 1 "8/26/2011" "Linux" "OpenStack Swift"

+.TH swift-account-auditor 1 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B swift-account-auditor 

-\- Openstack-swift account auditor

+\- OpenStack Swift account auditor

 .SH SYNOPSIS

 .LP

-.B swift-account-auditor 

+.B /usr/lib/swift/swift-account-auditor

 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]

 .SH DESCRIPTION 

@@ -50,13 +50,25 @@ The options are as follows:

 .RE

 .PD

 .RE

+

+.LP

+The account auditor should be enabled and disabled using the Solaris

+Service Management Facility, \fBsmf\fR(5).  The service FMRI for the

+account auditor is:

+.sp

+.in +2

+.nf

+svc:/application/openstack/swift/swift-account-auditor

+.fi

+.in -2

 .SH DOCUMENTATION

 .LP

 More in depth documentation in regards to 

 .BI swift-account-auditor 

-and also about Openstack-Swift as a whole can be found at 

+and also about OpenStack Swift as a whole can be found at 

 .BI http://swift.openstack.org/index.html

 .SH "SEE ALSO"

-.BR account-server.conf(5)

+.BR account-server.conf (4),

+.BR smf (5)

diff --git a/doc/manpages/swift-account-reaper.1 b/doc/manpages/swift-account-reaper.1

--- a/doc/manpages/swift-account-reaper.1

+++ b/doc/manpages/swift-account-reaper.1

@@ -15,16 +15,16 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH swift-account-reaper 1 "8/26/2011" "Linux" "OpenStack Swift"

+.TH swift-account-reaper 1 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B swift-account-reaper

-\- Openstack-swift account reaper

+\- OpenStack Swift account reaper

 .SH SYNOPSIS

 .LP

-.B swift-account-reaper 

+.B /usr/lib/swift/swift-account-reaper

 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]

 .SH DESCRIPTION 

@@ -56,14 +56,25 @@ The options are as follows:

 .PD

 .RE

-    

+.LP

+The account reaper should be enabled and disabled using the Solaris Service

+Management Facility, \fBsmf\fR(5).  The service FMRI for the account reaper

+is:

+.sp

+.in +2

+.nf

+svc:/application/openstack/swift/swift-account-reaper

+.fi

+.in -2

+

 .SH DOCUMENTATION

 .LP

 More in depth documentation in regards to 

-.BI swift-object-auditor 

-and also about Openstack-Swift as a whole can be found at 

+.BI swift-account-reaper 

+and also about OpenStack Swift as a whole can be found at 

 .BI http://swift.openstack.org/index.html

 .SH "SEE ALSO"

-.BR account-server.conf(5)

+.BR account-server.conf (4),

+.BR smf (5)

diff --git a/doc/manpages/swift-account-replicator.1 b/doc/manpages/swift-account-replicator.1

--- a/doc/manpages/swift-account-replicator.1

+++ b/doc/manpages/swift-account-replicator.1

@@ -15,16 +15,16 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH swift-account-replicator 1 "8/26/2011" "Linux" "OpenStack Swift"

+.TH swift-account-replicator 1 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B swift-account-replicator 

-\- Openstack-swift account replicator

+\- OpenStack Swift account replicator

 .SH SYNOPSIS

 .LP

-.B swift-account-replicator 

+.B /usr/lib/swift/swift-account-replicator

 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]

 .SH DESCRIPTION 

@@ -58,14 +58,25 @@ The options are as follows:

 .PD 

 .RE

-   

+.LP

+The account replicator should be enabled and disabled using the Solaris

+Service Management Facility, \fBsmf\fR(5).  The service FMRI for the

+account replicator is:

+.sp

+.in +2

+.nf

+svc:/application/openstack/swift/swift-account-replicator

+.fi

+.in -2

+    

 .SH DOCUMENTATION

 .LP

 More in depth documentation in regards to 

 .BI swift-account-replicator

-and also about Openstack-Swift as a whole can be found at 

+and also about OpenStack Swift as a whole can be found at 

 .BI http://swift.openstack.org/index.html

 .SH "SEE ALSO"

-.BR account-server.conf(5)

+.BR account-server.conf (4),

+.BR smf (5)

diff --git a/doc/manpages/swift-account-server.1 b/doc/manpages/swift-account-server.1

--- a/doc/manpages/swift-account-server.1

+++ b/doc/manpages/swift-account-server.1

@@ -15,16 +15,16 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH swift-account-server 1 "8/26/2011" "Linux" "OpenStack Swift"

+.TH swift-account-server 1 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B swift-account-server

-\- Openstack-swift account server

+\- OpenStack Swift account server

 .SH SYNOPSIS

 .LP

-.B swift-account-server

+.B /usr/lib/swift/swift-account-server

 [CONFIG] [-h|--help] [-v|--verbose]

 .SH DESCRIPTION 

@@ -33,15 +33,26 @@ The Account Server's primary job is to h

 are stored as sqlite database files, and replicated across the cluster similar to how

 objects are. 

+.LP

+The account server should be enabled and disabled using the Solaris Service

+Management Facility, \fBsmf\fR(5).  The service FMRI for the account server

+is:

+.sp

+.in +2

+.nf

+svc:/application/openstack/swift/swift-account-server

+.fi

+.in -2

+

 .SH DOCUMENTATION

 .LP

 More in depth documentation in regards to 

 .BI swift-account-server

-and also about Openstack-Swift as a whole can be found at 

+and also about Openstack Swift as a whole can be found at 

 .BI http://swift.openstack.org/index.html

 and 

 .BI http://docs.openstack.org

-

 .SH "SEE ALSO"

-.BR account-server.conf(5)

+.BR account-server.conf (4),

+.BR smf (5)

diff --git a/doc/manpages/swift-container-auditor.1 b/doc/manpages/swift-container-auditor.1

--- a/doc/manpages/swift-container-auditor.1

+++ b/doc/manpages/swift-container-auditor.1

@@ -15,16 +15,16 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH swift-container-auditor 1 "8/26/2011" "Linux" "OpenStack Swift"

+.TH swift-container-auditor 1 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B swift-container-auditor 

-\- Openstack-swift container auditor

+\- OpenStack Swift container auditor

 .SH SYNOPSIS

 .LP

-.B swift-container-auditor 

+.B /usr/lib/swift/swift-container-auditor

 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]

 .SH DESCRIPTION 

@@ -50,15 +50,26 @@ The options are as follows:

 .RE

 .PD

 .RE

-     	

-    

+

+.LP

+The container auditor should be enabled and disabled using the Solaris

+Service Management Facility, \fBsmf\fR(5).  The service FMRI for the

+container auditor is:

+.sp

+.in +2

+.nf

+svc:/application/openstack/swift/swift-container-auditor

+.fi

+.in -2

+

 .SH DOCUMENTATION

 .LP

 More in depth documentation in regards to 

 .BI swift-container-auditor 

-and also about Openstack-Swift as a whole can be found at 

+and also about OpenStack Swift as a whole can be found at 

 .BI http://swift.openstack.org/index.html

 .SH "SEE ALSO"

-.BR container-server.conf(5)

+.BR container-server.conf (4),

+.BR smf (5)

diff --git a/doc/manpages/swift-container-replicator.1 b/doc/manpages/swift-container-replicator.1

--- a/doc/manpages/swift-container-replicator.1

+++ b/doc/manpages/swift-container-replicator.1

@@ -15,16 +15,16 @@

 .\" See the License for the specific language governing permissions and

 .\" limitations under the License.

 .\"  

-.TH swift-container-replicator 1 "8/26/2011" "Linux" "OpenStack Swift"

+.TH swift-container-replicator 1 "8/26/2011" "OpenStack" "OpenStack Swift"

 .SH NAME 

 .LP

 .B swift-container-replicator 

-\- Openstack-swift container replicator

+\- OpenStack Swift container replicator

 .SH SYNOPSIS

 .LP

-.B swift-container-replicator 

+.B /usr/lib/swift/swift-container-replicator

 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]

 .SH DESCRIPTION 

@@ -57,15 +57,26 @@ The options are as follows:

 .RE

 .PD

 .RE

+

+.LP

+The container replicator should be enabled and disabled using the Solaris

+Service Management Facility, \fBsmf\fR(5).  The service FMRI for the

+container replicator is:

+.sp

+.in +2

+.nf

+svc:/application/openstack/swift/swift-container-replicator

+.fi

+.in -2

-   

 .SH DOCUMENTATION

 .LP

 More in depth documentation in regards to 

 .BI swift-container-replicator

-and also about Openstack-Swift as a whole can be found at 

+and also about OpenStack Swift as a whole can be found at 

 .BI http://swift.openstack.org/index.html

 .SH "SEE ALSO"

-.BR container-server.conf(5)

+.BR container-server.conf (4),