components/openstack/swift/patches/manpages.patch
author Danek Duvall <danek.duvall@oracle.com>
Tue, 07 Apr 2015 13:31:20 -0700
branchs11-update
changeset 4072 db0cec748ec0
parent 3178 77584387a894
child 5448 56f4540f741d
permissions -rw-r--r--
PSARC 2015/110 OpenStack service updates for Juno PSARC 2014/302 oslo.messaging - OpenStack RPC and notifications PSARC 2014/303 concurrent.futures - high-level Python interface for asynchronous execution PSARC 2014/304 networkx - Python module for complex networks PSARC 2014/305 taskflow - Python module for task execution PSARC 2014/329 pycadf - Python interface for CADF (cloud auditing) PSARC 2014/330 posix_ipc - POSIX IPC primitives for Python PSARC 2014/331 oauthlib - Python implementation of OAuth request-signing logic PSARC 2015/058 oslo - OpenStack common libraries (context, db, i18n, middleware, serialization, utils, vmware) PSARC 2015/059 glance_store - Glance storage library PSARC 2015/060 ipaddr - an IPv4/IPv6 manipulation library in Python PSARC 2015/061 simplegeneric - single-dispatch generic Python functions PSARC 2015/062 wsme - Web Services Made Easy PSARC 2015/063 retrying - General purpose Python retrying library PSARC 2015/065 osprofiler - an OpenStack cross-project profiling library PSARC 2015/066 OpenStack client for Sahara (Hadoop as a Service) PSARC 2015/067 keystonemiddleware - Middleware for OpenStack Identity PSARC 2015/068 pyScss - Compiler for the SCSS flavor of the Sass language PSARC 2015/069 django-pyscss - pyScss support for Django PSARC 2015/073 barbicanclient - OpenStack client for Barbican (Key Management) PSARC 2015/074 pysendfile - Python interface to sendfile PSARC 2015/097 ldappool - a connection pool for python-ldap PSARC 2015/098 rfc3986 - URI reference validation module for Python PSARC 2015/102 iniparse - python .ini file parsing module 20667775 OpenStack service updates for Juno (Umbrella) 17511386 sqlalchemy-migrate should lose its bypass-gen tags once sqlalchemy is in the CBE 18293987 /usr/bin/alembic should be shipped 18293992 boto's demo scripts aren't delivered executable 18377642 py.test has a requirement on py 18615101 Horizon should prevent network, subnet, and port names with hyphens in them 18772068 instance failed to launch with NoValidHost but no reason 18887457 openstack shouldn't deliver .po files 18905324 hostname.xml should set config/ignore_dhcp_hostname = true 18961031 Duplicate names for role-create and user-create are allowed 19015363 Users should not be allowed to attempt to create volumes when quota exceed 19044301 boto's dependencies need work 19050335 user appears logged in but unauthorised after horizon reboot 19065699 cinderclient-34 lost in recent upgrade 19131218 solaris.css: 'Delete Interface' button in Router pop-up menu broken 19131507 solaris.css: 'Project Limits' section of Launch Instance pop-up menu broken 19144215 Instance manipulation buttons greyed out after all instances terminated 19249066 heat stack-preview doesn't appear to do anything 19313272 Need bottom slidebar in horizon for small browser windows 19439030 'nova migration-list' returns python error 19462265 The Python module oslo.messaging should be added to Userland 19462397 The Python module futures should be added to Userland 19476604 The Python module networkx should be added to Userland 19476953 The Python module taskflow should be added to Userland 19519227 The Python module pycadf should be added to Userland 19582394 The Python module posix_ipc should be added to Userland 19596691 instance failed to launch, cinder hit resource busy in stmfadm 19598430 The Python module oauthlib should be added to Userland 19649055 FC connection fails when the target_lun is assigned 0 19815780 nova package should have dependencies on brand-solaris and brand-solaris-kz 19883623 Image snapshots are missing 'instance_uuid' property 19887874 horizon should set up apache log rotation 19888859 six should enable its tests now. 19987962 Cinder lists additional volumes attached to instance with linuxy device names 20027791 horizon should be migrated to Apache 2.4 20046570 rabbitmq & rad-evs-controller should be added to group package 20052466 remove _ai_health_check() from driver.py now that 18857274 is integrated 20164815 The Python module django-pyscss should be added to Userland 20173049 The Python module retrying should be added to Userland 20174489 The Python module WSME should be added to Userland 20176001 The Python module keystonemiddleware should be added to Userland 20182039 The Python module pysendfile should be added to Userland 20200162 The Python module pyScss should be added to Userland 20222184 horizon doesn't send start request on shutdown instance 20312312 The Python module python-saharaclient should be added to Userland 20388250 problem in SERVICE/GLANCE 20433402 The fix for 20388250 is incomplete 20514287 wrong vnic label name used for dhcp vnic in evs 20596802 The Python module oslo.middleware should be added to Userland 20596803 The Python module barbicanclient should be added to Userland 20596804 The Python module oslo.context should be added to Userland 20596805 The Python module iniparse should be added to Userland 20596806 The Python module oslo.vmware should be added to Userland 20596807 The Python module osprofiler should be added to Userland 20596808 The Python module oslo.i18n should be added to Userland 20596809 The Python module oslo.utils should be added to Userland 20596811 The Python module ipaddr should be added to Userland 20596812 The Python module glance_store should be added to Userland 20596813 The Python module oslo.serialization should be added to Userland 20596814 The Python module oslo.db should be added to Userland 20596815 The Python module simplegeneric should be added to Userland 20602690 The Python module ldappool should be added to Userland 20602722 The Python module rfc3986 should be added to Userland 20638369 compilemessages.py requires GNU msgfmt without calling gmsgfmt 20715741 cinder 2014.2.2 20715742 glance 2014.2.2 20715743 heat 2014.2.2 20715744 horizon 2014.2.2 20715745 keystone 2014.2.2 20715746 neutron 2014.2.2 20715747 nova 2014.2.2 20715748 swift 2.2.2 20715749 alembic 0.7.4 20715750 amqp 1.4.6 20715751 boto 2.34.0 20715752 ceilometerclient 1.0.12 20715753 cinderclient 1.1.1 20715754 cliff 1.9.0 20715756 django 1.4.19 20739229 Update django to 1.4.20 20715757 django_compressor 1.4 20715758 django_openstack_auth 1.1.9 20715759 eventlet 0.15.2 20715761 glanceclient 0.15.0 20715762 greenlet 0.4.5 20715763 heatclient 0.2.12 20715764 keystoneclient 1.0.0 20715765 kombu 3.0.7 20715766 mysql 1.2.5 20715767 netaddr 0.7.13 20715769 netifaces 0.10.4 20715770 neutronclient 2.3.10 20715771 novaclient 2.20.0 20715772 oslo.config 1.6.0 20715773 py 1.4.26 20715774 pyflakes 0.8.1 20715775 pytest 2.6.4 20715776 pytz 2014.10 20715777 requests 2.6.0 20715778 simplejson 3.6.5 20715779 six 1.9.0 20715780 sqlalchemy-migrate 0.9.1 20715781 sqlalchemy 0.9.8 20715782 stevedore 1.2.0 20715783 swiftclient 2.3.1 20715784 tox 1.8.1 20715785 troveclient 1.0.8 20715786 virtualenv 12.0.7 20715787 websockify 0.6.0 20739215 problem in PYTHON-MOD/DJANGO 20739295 problem in PYTHON-MOD/DJANGO 20816861 zone-vnc-console instance goes in to maintenance 20829672 support flat network type in neutron

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.

--- swift-2.2.2/doc/manpages/account-server.conf.5.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/account-server.conf.5	2015-02-26 16:13:29.119848756 -0800
@@ -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
 
 
 
@@ -254,11 +254,11 @@ 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)
--- swift-2.2.2/doc/manpages/container-server.conf.5.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/container-server.conf.5	2015-02-26 16:13:29.120133142 -0800
@@ -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
 
 
 
@@ -279,11 +279,11 @@ 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)
--- swift-2.2.2/doc/manpages/dispersion.conf.5.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/dispersion.conf.5	2015-02-26 16:13:29.120357358 -0800
@@ -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
@@ -45,7 +45,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.0.
 .IP "\fBretries\fR"
@@ -83,13 +83,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)
 
--- swift-2.2.2/doc/manpages/object-expirer.conf.5.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/object-expirer.conf.5	2015-02-26 16:13:29.120567301 -0800
@@ -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)
 
--- swift-2.2.2/doc/manpages/object-server.conf.5.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/object-server.conf.5	2015-02-26 16:13:29.120792824 -0800
@@ -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
 
 
 
@@ -273,11 +273,11 @@ 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)
--- swift-2.2.2/doc/manpages/proxy-server.conf.5.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/proxy-server.conf.5	2015-02-26 16:13:29.121104217 -0800
@@ -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
 
 
 
@@ -547,10 +547,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)
--- swift-2.2.2/doc/manpages/swift-account-auditor.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-account-auditor.1	2015-02-26 16:13:29.121313974 -0800
@@ -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)
--- swift-2.2.2/doc/manpages/swift-account-info.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-account-info.1	2015-02-26 16:13:29.121513953 -0800
@@ -14,12 +14,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-account-info 1 "3/22/2014" "Linux" "OpenStack Swift"
+.TH swift-account-info 1 "3/22/2014" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-account-info
-\- Openstack-swift account-info tool
+\- Openstack Swift account-info tool
 
 .SH SYNOPSIS
 .LP
@@ -50,11 +50,11 @@ It will then return several information
     
 .SH DOCUMENTATION
 .LP
-More documentation about Openstack-Swift can be found at 
+More documentation about Openstack Swift can be found at 
 .BI http://swift.openstack.org/index.html
 
 .SH "SEE ALSO"
 
-.BR swift-container-info(1),
-.BR swift-get-nodes(1),
-.BR swift-object-info(1)
+.BR swift-container-info (1),
+.BR swift-get-nodes (1),
+.BR swift-object-info (1)
--- swift-2.2.2/doc/manpages/swift-account-reaper.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-account-reaper.1	2015-02-26 16:13:29.121726101 -0800
@@ -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)
--- swift-2.2.2/doc/manpages/swift-account-replicator.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-account-replicator.1	2015-02-26 16:13:29.121955499 -0800
@@ -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)
--- swift-2.2.2/doc/manpages/swift-account-server.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-account-server.1	2015-02-26 16:13:29.122165290 -0800
@@ -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)
--- swift-2.2.2/doc/manpages/swift-container-auditor.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-container-auditor.1	2015-02-26 16:13:29.141897463 -0800
@@ -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)
--- swift-2.2.2/doc/manpages/swift-container-info.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-container-info.1	2015-02-26 16:13:29.142103981 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-container-info 1 "3/20/2013" "Linux" "OpenStack Swift"
+.TH swift-container-info 1 "3/20/2013" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-container-info
-\- Openstack-swift container-info tool
+\- Openstack Swift container-info tool
 
 .SH SYNOPSIS
 .LP
@@ -57,9 +57,9 @@ It will then return several information
     
 .SH DOCUMENTATION
 .LP
-More documentation about Openstack-Swift can be found at 
+More documentation about Openstack Swift can be found at 
 .BI http://swift.openstack.org/index.html
 
 .SH "SEE ALSO"
-.BR swift-get-nodes(1),
-.BR swift-object-info(1)
+.BR swift-get-nodes (1),
+.BR swift-object-info (1)
--- swift-2.2.2/doc/manpages/swift-container-replicator.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-container-replicator.1	2015-02-26 16:13:29.142311525 -0800
@@ -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),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-container-server.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-container-server.1	2015-02-26 16:13:29.142536566 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-container-server 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-container-server 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-container-server
-\- Openstack-swift container server
+\- OpenStack Swift container server
 
 .SH SYNOPSIS
 .LP
-.B swift-container-server
+.B /usr/lib/swift/swift-container-server
 [CONFIG] [-h|--help] [-v|--verbose]
 
 .SH DESCRIPTION 
@@ -35,11 +35,22 @@ are stored as sqlite database files, and
 objects are. Statistics are also tracked that include the total number of objects, and 
 total storage usage for that container.
 
+.LP
+The container server should be enabled and disabled using the Solaris
+Service Management Facility, \fBsmf\fR(5).  The service FMRI for the
+container server is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-container-server
+.fi
+.in -2
+    
 .SH DOCUMENTATION
 .LP
 More in depth documentation in regards to 
 .BI swift-container-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
@@ -47,4 +58,5 @@ and
 .LP 
 
 .SH "SEE ALSO"
-.BR container-server.conf(5)
+.BR container-server.conf (4),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-container-sync.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-container-sync.1	2015-02-26 16:13:29.142760939 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-container-sync 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-container-sync 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-container-sync
-\- Openstack-swift container sync
+\- OpenStack Swift container sync
 
 .SH SYNOPSIS
 .LP
@@ -44,7 +44,7 @@ newer rows since the last sync will trig
 .LP
 More in depth documentation in regards to 
 .BI swift-container-sync
-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/overview_container_sync.html
 and 
 .BI http://docs.openstack.org
@@ -52,4 +52,4 @@ and
 .LP 
 
 .SH "SEE ALSO"
-.BR container-server.conf(5)
+.BR container-server.conf (4)
--- swift-2.2.2/doc/manpages/swift-container-updater.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-container-updater.1	2015-02-26 16:13:29.142985262 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-container-updater 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-container-updater 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-container-updater
-\- Openstack-swift container updater
+\- OpenStack Swift container updater
 
 .SH SYNOPSIS
 .LP
-.B swift-container-updater 
+.B /usr/lib/swift/swift-container-updater
 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]
 
 .SH DESCRIPTION 
@@ -59,14 +59,26 @@ The options are as follows:
 .RE
 .PD
 .RE
-       
+
+.LP
+The container updater should be enabled and disabled using the Solaris
+Service Management Facility, \fBsmf\fR(5).  The service FMRI for the
+container updater is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-container-updater
+.fi
+.in -2
+
 .SH DOCUMENTATION
 .LP
 More in depth documentation in regards to 
 .BI swift-container-updater
-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)
--- swift-2.2.2/doc/manpages/swift-dispersion-populate.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-dispersion-populate.1	2015-02-26 16:13:29.143196250 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-dispersion-populate 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-dispersion-populate 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-dispersion-populate
-\- Openstack-swift dispersion populate 
+\- OpenStack Swift dispersion populate 
 
 .SH SYNOPSIS
 .LP
@@ -107,12 +107,12 @@ $ swift-dispersion-populate
 .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 dispersion.conf (5)
+.BR swift-dispersion-report (1),
+.BR dispersion.conf (4)
--- swift-2.2.2/doc/manpages/swift-dispersion-report.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-dispersion-report.1	2015-02-26 16:13:29.143403911 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-dispersion-report 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-dispersion-report 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-dispersion-report
-\- Openstack-swift dispersion report 
+\- OpenStack Swift dispersion report 
 
 .SH SYNOPSIS
 .LP
@@ -131,12 +131,12 @@ $ swift-dispersion-report
 .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-populate(1),
-.BR dispersion.conf (5)
+.BR swift-dispersion-populate (1),
+.BR dispersion.conf (4)
--- swift-2.2.2/doc/manpages/swift-get-nodes.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-get-nodes.1	2015-02-26 16:13:29.143614157 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-get-nodes 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-get-nodes 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-get-nodes
-\- Openstack-swift get-nodes tool
+\- OpenStack Swift get-nodes tool
 
 .SH SYNOPSIS
 .LP
@@ -72,14 +72,14 @@ where the container resides by using the
 
 .SH DOCUMENTATION
 .LP
-More documentation about Openstack-Swift can be found at 
+More documentation about Openstack Swift can be found at 
 .BI http://swift.openstack.org/index.html
 
 
 
 .SH "SEE ALSO"
 
-.BR swift-account-info(1),
-.BR swift-container-info(1),
-.BR swift-object-info(1),
-.BR swift-ring-builder(1)
+.BR swift-account-info (1),
+.BR swift-container-info (1),
+.BR swift-object-info (1),
+.BR swift-ring-builder (1)
--- swift-2.2.2/doc/manpages/swift-init.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-init.1	2015-02-26 16:13:29.143864952 -0800
@@ -15,22 +15,54 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-init 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-init 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-init
-\- Openstack-swift swift-init tool
+\- Openstack Swift swift-init tool
 
 .SH SYNOPSIS
 .LP
-.B swift-init
- <server> [<server> ...] <command> [options]
+.B /usr/lib/swift/swift-init
+<server> [<server> ...] <command> [options]
  
 .SH DESCRIPTION 
 .PP
+The suite of servers implementing OpenStack Swift should be managed using
+the Solaris Service Management Facility, \fBsmf\fR(5).  There are sixteen
+services:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-account-auditor
+svc:/application/openstack/swift/swift-account-reaper
+svc:/application/openstack/swift/swift-account-replicator
+svc:/application/openstack/swift/swift-account-server
+svc:/application/openstack/swift/swift-container-auditor
+svc:/application/openstack/swift/swift-container-replicator
+svc:/application/openstack/swift/swift-container-server
+svc:/application/openstack/swift/swift-container-sync
+svc:/application/openstack/swift/swift-container-updater
+svc:/application/openstack/swift/swift-object-auditor
+svc:/application/openstack/swift/swift-object-expirer
+svc:/application/openstack/swift/swift-object-replicator
+svc:/application/openstack/swift/swift-object-server
+svc:/application/openstack/swift/swift-object-updater
+svc:/application/openstack/swift/swift-proxy-server
+svc:/application/openstack/swift/swift-replicator-rsync
+.fi
+.in -2
+.LP
+Each service is described more completely in its corresponding manual page.
+Note that there are no dependencies between the services, although most of
+them should be started in groups, even if the entire suite isn't necessary.
+.LP
+Although the \fBswift-init\fR tool can be used to manage the services,
+doing so is not supported on Solaris.
+.LP
 The swift-init tool can be used to initialize all swift daemons available as part of
-openstack-swift. Instead of calling individual init scripts for each 
+OpenStack Swift. Instead of calling individual init scripts for each 
 swift daemon, one can just use swift-init. With swift-init you can initialize 
 just one swift service, such as the "proxy", or a combination of them. The tool also 
 allows one to use the keywords such as "all", "main" and "rest" for the <server> argument.
@@ -116,8 +148,26 @@ allows one to use the keywords such as "
 
 .SH DOCUMENTATION
 .LP
-More documentation about Openstack-Swift can be found at 
+More documentation about OpenStack Swift can be found at 
 .BI http://swift.openstack.org/index.html
 
 
 
+.SH SEE ALSO
+.BR swift-account-auditor (1),
+.BR swift-account-reaper (1),
+.BR swift-account-replicator (1),
+.BR swift-account-server (1),
+.BR swift-container-auditor (1),
+.BR swift-container-replicator (1),
+.BR swift-container-server (1),
+.BR swift-container-sync (1),
+.BR swift-container-updater
+.BR swift-object-auditor (1),
+.BR swift-object-expirer (1),
+.BR swift-object-replicator (1),
+.BR swift-object-server (1),
+.BR swift-object-updater (1),
+.BR swift-proxy-server (1),
+.BR swift-replicator-rsync (1),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-object-auditor.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-object-auditor.1	2015-02-26 16:13:29.144069821 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-object-auditor 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-object-auditor 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-object-auditor 
-\- Openstack-swift object auditor
+\- OpenStack Swift object auditor
 
 .SH SYNOPSIS
 .LP
-.B swift-object-auditor 
+.B /usr/lib/swift/swift-object-auditor
 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once] [-z|--zero_byte_fps]
 
 .SH DESCRIPTION 
@@ -56,15 +56,26 @@ The options are as follows:
 .RE
 .PD
 .RE
-    
-    
+
+.LP
+The object auditor should be enabled and disabled using the Solaris Service
+Management Facility, \fBsmf\fR(5).  The service FMRI for the object auditor
+is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-object-auditor
+.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 
+and also about OpenStack Swift as a whole can be found at 
 .BI http://swift.openstack.org/index.html
 
 
 .SH "SEE ALSO"
-.BR object-server.conf(5)
+.BR object-server.conf (4),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-object-expirer.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-object-expirer.1	2015-02-26 16:13:29.144285407 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-object-expirer 1 "3/15/2012" "Linux" "OpenStack Swift"
+.TH swift-object-expirer 1 "3/15/2012" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-object-expirer
-\- Openstack-swift object expirer
+\- OpenStack Swift object expirer
 
 .SH SYNOPSIS
 .LP
-.B swift-object-expirer 
+.B /usr/lib/swift/swift-object-expirer
 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]
 
 .SH DESCRIPTION 
@@ -57,18 +57,28 @@ The options are as follows:
 .RE
 .PD
 .RE
-    
-   
+
+.LP
+The object expirer should be enabled and disabled using the Solaris Service
+Management Facility, \fBsmf\fR(5).  The service FMRI for the object expirer
+is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-object-expirer
+.fi
+.in -2
+
 .SH DOCUMENTATION
 .LP
 More in depth documentation in regards to 
 .BI swift-object-expirer
 can be foud at 
 .BI http://swift.openstack.org/overview_expiring_objects.html
-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 object-expirer.conf(5)
-
+.BR object-expirer.conf (4),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-object-info.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-object-info.1	2015-02-26 16:13:29.160574201 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-object-info 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-object-info 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-object-info
-\- Openstack-swift object-info tool
+\- OpenStack Swift object-info tool
 
 .SH SYNOPSIS
 .LP
@@ -48,11 +48,11 @@ It will then return several information
     
 .SH DOCUMENTATION
 .LP
-More documentation about Openstack-Swift can be found at 
+More documentation about Openstack Swift can be found at 
 .BI http://swift.openstack.org/index.html
 
 .SH "SEE ALSO"
 
-.BR swift-account-info(1),
-.BR swift-container-info(1),
-.BR swift-get-nodes(1)
+.BR swift-account-info (1),
+.BR swift-container-info (1),
+.BR swift-get-nodes (1)
--- swift-2.2.2/doc/manpages/swift-object-replicator.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-object-replicator.1	2015-02-26 16:13:29.160790039 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-object-replicator 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-object-replicator 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-object-replicator 
-\- Openstack-swift object replicator
+\- OpenStack Swift object replicator
 
 .SH SYNOPSIS
 .LP
-.B swift-object-replicator 
+.B /usr/lib/swift/swift-object-replicator 
 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]
 
 .SH DESCRIPTION 
@@ -57,15 +57,26 @@ The options are as follows:
 .RE
 .PD
 .RE
-    
-   
+
+.LP
+The object replicator should be enabled and disabled using the Solaris
+Service Management Facility, \fBsmf\fR(5).  The service FMRI for the object
+replicator is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-object-replicator
+.fi
+.in -2
+
 .SH DOCUMENTATION
 .LP
 More in depth documentation in regards to 
 .BI swift-object-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 object-server.conf(5)
+.BR object-server.conf (4),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-object-server.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-object-server.1	2015-02-26 16:13:29.160992717 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-object-server 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-object-server 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-object-server
-\- Openstack-swift object server.
+\- OpenStack Swift object server.
 
 .SH SYNOPSIS
 .LP
-.B swift-object-server
+.B /usr/lib/swift/swift-object-server
 [CONFIG] [-h|--help] [-v|--verbose]
 
 .SH DESCRIPTION 
@@ -40,15 +40,27 @@ served. A deletion is also treated as a
 ".ts", which stands for tombstone). This ensures that deleted files are replicated 
 correctly and older versions don't magically reappear due to failure scenarios.
 
+.LP
+The object server should be enabled and disabled using the Solaris Service
+Management Facility, \fBsmf\fR(5).  The service FMRI for the object server
+is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-object-server
+.fi
+.in -2
+
 .SH DOCUMENTATION
 .LP
 More in depth documentation in regards to 
 .BI swift-object-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 object-server.conf(5)
+.BR object-server.conf (4),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-object-updater.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-object-updater.1	2015-02-26 16:13:29.161205584 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-object-updater 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-object-updater 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-object-updater
-\- Openstack-swift object updater
+\- OpenStack Swift object updater
 
 .SH SYNOPSIS
 .LP
-.B swift-object-updater
+.B /usr/lib/swift/swift-object-updater
 [CONFIG] [-h|--help] [-v|--verbose] [-o|--once]
 
 .SH DESCRIPTION 
@@ -64,15 +64,26 @@ The options are as follows:
 .RE
 .PD 
 .RE
-    
-    
+
+.LP
+The object updater should be enabled and disabled using the Solaris Service
+Management Facility, \fBsmf\fR(5).  The service FMRI for the object updater
+is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-object-updater
+.fi
+.in -2
+
 .SH DOCUMENTATION
 .LP
 More in depth documentation in regards to 
 .BI swift-object-updater
-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 object-server.conf(5)
+.BR object-server.conf (4),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-orphans.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-orphans.1	2015-02-26 16:13:29.161459175 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"
-.TH swift-orphans 1 "3/15/2012" "Linux" "OpenStack Swift"
+.TH swift-orphans 1 "3/15/2012" "OpenStack" "OpenStack Swift"
 
 .SH NAME
 .LP
 .B swift-orphans
-\- Openstack-swift orphans tool
+\- OpenStack Swift orphans tool
 
 .SH SYNOPSIS
 .LP
@@ -65,6 +65,6 @@ The options are as follows:
 
 .SH DOCUMENTATION
 .LP
-More documentation about Openstack-Swift can be found at
+More documentation about OpenStack Swift can be found at
 .BI http://swift.openstack.org/index.html
 
--- swift-2.2.2/doc/manpages/swift-proxy-server.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-proxy-server.1	2015-02-26 16:13:29.161663139 -0800
@@ -15,16 +15,16 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-proxy-server 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-proxy-server 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-proxy-server 
-\- Openstack-swift proxy server.
+\- OpenStack Swift proxy server.
 
 .SH SYNOPSIS
 .LP
-.B swift-proxy-server
+.B /usr/lib/swift/swift-proxy-server
 [CONFIG] [-h|--help] [-v|--verbose]
 
 .SH DESCRIPTION 
@@ -38,13 +38,25 @@ and route there instead. When objects ar
 streamed directly through the proxy server to or from the user the proxy server does 
 not spool them.
 
+.LP
+The proxy server should be enabled and disabled using the Solaris Service
+Management Facility, \fBsmf\fR(5).  The service FMRI for the proxy server
+is:
+.sp
+.in +2
+.nf
+svc:/application/openstack/swift/swift-proxy-server
+.fi
+.in -2
+
 .SH DOCUMENTATION
 .LP
 More in depth documentation in regards to 
 .BI swift-proxy-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
 
 
 .SH "SEE ALSO"
-.BR proxy-server.conf(5)
+.BR proxy-server.conf (4),
+.BR smf (5)
--- swift-2.2.2/doc/manpages/swift-recon.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-recon.1	2015-02-26 16:13:29.161870934 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"
-.TH swift-recon 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-recon 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME
 .LP
 .B swift-recon
-\- Openstack-swift recon middleware cli tool
+\- OpenStack Swift recon middleware cli tool
 
 .SH SYNOPSIS
 .LP
@@ -104,7 +104,7 @@ cronjob to run the swift-recon-cron scri
 
 .SH DOCUMENTATION
 .LP
-More documentation about Openstack-Swift can be found at
+More documentation about OpenStack Swift can be found at
 .BI http://swift.openstack.org/index.html
 Also more specific documentation about swift-recon can be found at
 .BI http://swift.openstack.org/admin_guide.html#cluster-telemetry-and-monitoring
@@ -112,6 +112,6 @@ Also more specific documentation about s
 
 
 .SH "SEE ALSO"
-.BR object-server.conf(5),
+.BR object-server.conf (4)
 
 
--- swift-2.2.2/doc/manpages/swift-ring-builder.1.~1~	2015-02-01 23:44:11.000000000 -0800
+++ swift-2.2.2/doc/manpages/swift-ring-builder.1	2015-02-26 16:13:29.162099171 -0800
@@ -15,12 +15,12 @@
 .\" See the License for the specific language governing permissions and
 .\" limitations under the License.
 .\"  
-.TH swift-ring-builder 1 "8/26/2011" "Linux" "OpenStack Swift"
+.TH swift-ring-builder 1 "8/26/2011" "OpenStack" "OpenStack Swift"
 
 .SH NAME 
 .LP
 .B swift-ring-builder
-\- Openstack-swift ring builder
+\- OpenStack Swift ring builder
 
 .SH SYNOPSIS
 .LP
@@ -210,7 +210,7 @@ calls when no rebalance is needed but yo
 
 .SH DOCUMENTATION
 .LP
-More in depth documentation about the swift ring and also Openstack-Swift as a 
+More in depth documentation about the swift ring and also OpenStack Swift as a 
 whole can be found at 
 .BI http://swift.openstack.org/overview_ring.html, 
 .BI http://swift.openstack.org/admin_guide.html#managing-the-rings