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

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

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

     4 

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

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

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

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

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

    10  .\" limitations under the License.

    11  .\"

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

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

    14  

    15  .SH NAME

    16  .LP

    17  .B account-server.conf

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

    19 +\- configuration file for the OpenStack Swift account server

    20  

    21  

    22  

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

    24  .SH DOCUMENTATION

    25  .LP

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

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

    28 +also OpenStack Swift as a whole can be found at

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

    30  and

    31  .BI http://swift.openstack.org

    32  

    33  

    34  .SH "SEE ALSO"

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

    36 +.BR swift-account-server (1)

    37  

    38  

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

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

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

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

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

    44  .\" limitations under the License.

    45  .\"

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

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

    48  

    49  .SH NAME

    50  .LP

    51  .B container-server.conf

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

    53 +\- configuration file for the OpenStack Swift container server

    54  

    55  

    56  

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

    58  .SH DOCUMENTATION

    59  .LP

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

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

    62 +also OpenStack Swift as a whole can be found at

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

    64  and

    65  .BI http://swift.openstack.org

    66  

    67  

    68  .SH "SEE ALSO"

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

    70 +.BR swift-container-server (1)

    71  

    72  

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

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

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

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

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

    78  .\" limitations under the License.

    79  .\"  

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

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

    82  

    83  .SH NAME 

    84  .LP

    85  .B dispersion.conf

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

    87 +\- configuration file for the OpenStack Swift dispersion tools 

    88  

    89  .SH SYNOPSIS

    90  .LP

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

    92  .IP "\fBauth_key\fR"

    93  Authentication system account/user password 

    94  .IP "\fBswift_dir\fR"

    95 -Location of openstack-swift configuration and ring files

    96 +Location of OpenStack Swift configuration and ring files

    97  .IP "\fBdispersion_coverage\fR"

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

    99  .IP "\fBretries\fR"

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

   101  .SH DOCUMENTATION

   102  .LP

   103  More in depth documentation about the swift-dispersion utilities and

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

   105 +also OpenStack Swift as a whole can be found at 

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

   107  and 

   108  .BI http://swift.openstack.org

   109  

   110  

   111  .SH "SEE ALSO"

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

   113 -.BR swift-dispersion-populate(1)

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

   115 +.BR swift-dispersion-populate (1)

   116  

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

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

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

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

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

   122  .\" limitations under the License.

   123  .\"  

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

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

   126  

   127  .SH NAME 

   128  .LP

   129  .B object-expirer.conf

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

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

   132  

   133  

   134  

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

   136  .SH DOCUMENTATION

   137  .LP

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

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

   140 +also OpenStack Swift as a whole can be found at 

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

   142  and 

   143  .BI http://swift.openstack.org

   144  

   145  

   146  .SH "SEE ALSO"

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

   148 +.BR proxy-server.conf (4)

   149  

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

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

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

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

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

   155  .\" limitations under the License.

   156  .\"

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

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

   159  

   160  .SH NAME

   161  .LP

   162  .B object-server.conf

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

   164 +\- configuration file for the OpenStack Swift object server

   165  

   166  

   167  

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

   169  .SH DOCUMENTATION

   170  .LP

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

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

   173 +also OpenStack Swift as a whole can be found at

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

   175  and

   176  .BI http://swift.openstack.org

   177  

   178  

   179  .SH "SEE ALSO"

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

   181 +.BR swift-object-server (1)

   182  

   183  

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

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

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

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

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

   189  .\" limitations under the License.

   190  .\"

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

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

   193  

   194  .SH NAME

   195  .LP

   196  .B proxy-server.conf

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

   198 +\- configuration file for the OpenStack Swift proxy server

   199  

   200  

   201  

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

   203  .SH DOCUMENTATION

   204  .LP

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

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

   207 +also OpenStack Swift as a whole can be found at

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

   209  and

   210  .BI http://swift.openstack.org

   211  

   212  .SH "SEE ALSO"

   213 -.BR swift-proxy-server(1)

   214 +.BR swift-proxy-server (1)

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

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

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

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

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

   220  .\" limitations under the License.

   221  .\"  

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

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

   224  

   225  .SH NAME 

   226  .LP

   227  .B swift-account-auditor 

   228 -\- Openstack-swift account auditor

   229 +\- OpenStack Swift account auditor

   230  

   231  .SH SYNOPSIS

   232  .LP

   233 -.B swift-account-auditor 

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

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

   236  

   237  .SH DESCRIPTION 

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

   239  .RE

   240  .PD

   241  .RE

   242 +

   243 +.LP

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

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

   246 +account auditor is:

   247 +.sp

   248 +.in +2

   249 +.nf

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

   251 +.fi

   252 +.in -2

   253      

   254  .SH DOCUMENTATION

   255  .LP

   256  More in depth documentation in regards to 

   257  .BI swift-account-auditor 

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

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

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

   261  

   262  .SH "SEE ALSO"

   263 -.BR account-server.conf(5)

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

   265 +.BR smf (5)

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

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

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

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

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

   271  .\" limitations under the License.

   272  .\"  

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

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

   275  

   276  .SH NAME 

   277  .LP

   278  .B swift-account-reaper

   279 -\- Openstack-swift account reaper

   280 +\- OpenStack Swift account reaper

   281  

   282  .SH SYNOPSIS

   283  .LP

   284 -.B swift-account-reaper 

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

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

   287  

   288  .SH DESCRIPTION 

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

   290  .PD

   291  .RE

   292  

   293 -    

   294 +.LP

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

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

   297 +is:

   298 +.sp

   299 +.in +2

   300 +.nf

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

   302 +.fi

   303 +.in -2

   304 +

   305  .SH DOCUMENTATION

   306  .LP

   307  More in depth documentation in regards to 

   308 -.BI swift-object-auditor 

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

   310 +.BI swift-account-reaper 

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

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

   313  

   314  

   315  .SH "SEE ALSO"

   316 -.BR account-server.conf(5)

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

   318 +.BR smf (5)

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

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

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

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

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

   324  .\" limitations under the License.

   325  .\"  

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

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

   328  

   329  .SH NAME 

   330  .LP

   331  .B swift-account-replicator 

   332 -\- Openstack-swift account replicator

   333 +\- OpenStack Swift account replicator

   334  

   335  .SH SYNOPSIS

   336  .LP

   337 -.B swift-account-replicator 

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

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

   340  

   341  .SH DESCRIPTION 

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

   343  .PD 

   344  .RE

   345      

   346 -   

   347 +.LP

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

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

   350 +account replicator is:

   351 +.sp

   352 +.in +2

   353 +.nf

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

   355 +.fi

   356 +.in -2

   357 +    

   358  .SH DOCUMENTATION

   359  .LP

   360  More in depth documentation in regards to 

   361  .BI swift-account-replicator

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

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

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

   365  

   366  

   367  .SH "SEE ALSO"

   368 -.BR account-server.conf(5)

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

   370 +.BR smf (5)

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

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

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

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

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

   376  .\" limitations under the License.

   377  .\"  

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

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

   380  

   381  .SH NAME 

   382  .LP

   383  .B swift-account-server

   384 -\- Openstack-swift account server

   385 +\- OpenStack Swift account server

   386  

   387  .SH SYNOPSIS

   388  .LP

   389 -.B swift-account-server

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

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

   392  

   393  .SH DESCRIPTION 

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

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

   396  objects are. 

   397  

   398 +.LP

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

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

   401 +is:

   402 +.sp

   403 +.in +2

   404 +.nf

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

   406 +.fi

   407 +.in -2

   408 +

   409  .SH DOCUMENTATION

   410  .LP

   411  More in depth documentation in regards to 

   412  .BI swift-account-server

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

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

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

   416  and 

   417  .BI http://docs.openstack.org

   418  

   419 -

   420  .SH "SEE ALSO"

   421 -.BR account-server.conf(5)

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

   423 +.BR smf (5)

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

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

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

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

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

   429  .\" limitations under the License.

   430  .\"  

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

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

   433  

   434  .SH NAME 

   435  .LP

   436  .B swift-container-auditor 

   437 -\- Openstack-swift container auditor

   438 +\- OpenStack Swift container auditor

   439  

   440  .SH SYNOPSIS

   441  .LP

   442 -.B swift-container-auditor 

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

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

   445  

   446  .SH DESCRIPTION 

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

   448  .RE

   449  .PD

   450  .RE

   451 -     	

   452 -    

   453 +

   454 +.LP

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

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

   457 +container auditor is:

   458 +.sp

   459 +.in +2

   460 +.nf

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

   462 +.fi

   463 +.in -2

   464 +

   465  .SH DOCUMENTATION

   466  .LP

   467  More in depth documentation in regards to 

   468  .BI swift-container-auditor 

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

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

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

   472  

   473  

   474  .SH "SEE ALSO"

   475 -.BR container-server.conf(5)

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

   477 +.BR smf (5)

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

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

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

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

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

   483  .\" limitations under the License.

   484  .\"  

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

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

   487  

   488  .SH NAME 

   489  .LP

   490  .B swift-container-replicator 

   491 -\- Openstack-swift container replicator

   492 +\- OpenStack Swift container replicator

   493  

   494  .SH SYNOPSIS

   495  .LP

   496 -.B swift-container-replicator 

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

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

   499  

   500  .SH DESCRIPTION 

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

   502  .RE

   503  .PD

   504  .RE

   505 +

   506 +.LP

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

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

   509 +container replicator is:

   510 +.sp

   511 +.in +2

   512 +.nf

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

   514 +.fi

   515 +.in -2

   516      

   517 -   

   518  .SH DOCUMENTATION

   519  .LP

   520  More in depth documentation in regards to 

   521  .BI swift-container-replicator

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

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

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

   525  

   526  

   527  .SH "SEE ALSO"

   528 -.BR container-server.conf(5)

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

   530 +.BR smf (5)

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

   532 --- a/doc/manpages/swift-container-server.1

   533 +++ b/doc/manpages/swift-container-server.1

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

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

   536  .\" limitations under the License.

   537  .\"  

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

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

   540  

   541  .SH NAME 

   542  .LP

   543  .B swift-container-server

   544 -\- Openstack-swift container server

   545 +\- OpenStack Swift container server

   546  

   547  .SH SYNOPSIS

   548  .LP

   549 -.B swift-container-server

   550 +.B /usr/lib/swift/swift-container-server

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

   552  

   553  .SH DESCRIPTION 

   554 @@ -35,11 +35,22 @@ are stored as sqlite database files, and

   555  objects are. Statistics are also tracked that include the total number of objects, and 

   556  total storage usage for that container.

   557  

   558 +.LP

   559 +The container server should be enabled and disabled using the Solaris

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

   561 +container server is:

   562 +.sp

   563 +.in +2

   564 +.nf

   565 +svc:/application/openstack/swift/swift-container-server

   566 +.fi

   567 +.in -2

   568 +    

   569  .SH DOCUMENTATION

   570  .LP

   571  More in depth documentation in regards to 

   572  .BI swift-container-server

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

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

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

   576  and 

   577  .BI http://docs.openstack.org

   578 @@ -47,4 +58,5 @@ and

   579  .LP 

   580  

   581  .SH "SEE ALSO"

   582 -.BR container-server.conf(5)

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

   584 +.BR smf (5)

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

   586 --- a/doc/manpages/swift-container-sync.1

   587 +++ b/doc/manpages/swift-container-sync.1

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

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

   590  .\" limitations under the License.

   591  .\"  

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

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

   594  

   595  .SH NAME 

   596  .LP

   597  .B swift-container-sync

   598 -\- Openstack-swift container sync

   599 +\- OpenStack Swift container sync

   600  

   601  .SH SYNOPSIS

   602  .LP

   603 @@ -44,7 +44,7 @@ newer rows since the last sync will trig

   604  .LP

   605  More in depth documentation in regards to 

   606  .BI swift-container-sync

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

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

   609  .BI http://swift.openstack.org/overview_container_sync.html

   610  and 

   611  .BI http://docs.openstack.org

   612 @@ -52,4 +52,4 @@ and

   613  .LP 

   614  

   615  .SH "SEE ALSO"

   616 -.BR container-server.conf(5)

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

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

   619 --- a/doc/manpages/swift-container-updater.1

   620 +++ b/doc/manpages/swift-container-updater.1

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

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

   623  .\" limitations under the License.

   624  .\"  

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

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

   627  

   628  .SH NAME 

   629  .LP

   630  .B swift-container-updater

   631 -\- Openstack-swift container updater

   632 +\- OpenStack Swift container updater

   633  

   634  .SH SYNOPSIS

   635  .LP

   636 -.B swift-container-updater 

   637 +.B /usr/lib/swift/swift-container-updater

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

   639  

   640  .SH DESCRIPTION 

   641 @@ -59,14 +59,26 @@ The options are as follows:

   642  .RE

   643  .PD

   644  .RE

   645 -       

   646 +

   647 +.LP

   648 +The container updater should be enabled and disabled using the Solaris

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

   650 +container updater is:

   651 +.sp

   652 +.in +2

   653 +.nf

   654 +svc:/application/openstack/swift/swift-container-updater

   655 +.fi

   656 +.in -2

   657 +

   658  .SH DOCUMENTATION

   659  .LP

   660  More in depth documentation in regards to 

   661  .BI swift-container-updater

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

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

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

   665  

   666  

   667  .SH "SEE ALSO"

   668 -.BR container-server.conf(5)

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

   670 +.BR smf (5)

   671 diff --git a/doc/manpages/swift-dispersion-populate.1 b/doc/manpages/swift-dispersion-populate.1

   672 --- a/doc/manpages/swift-dispersion-populate.1

   673 +++ b/doc/manpages/swift-dispersion-populate.1

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

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

   676  .\" limitations under the License.

   677  .\"  

   678 -.TH swift-dispersion-populate 1 "8/26/2011" "Linux" "OpenStack Swift"

   679 +.TH swift-dispersion-populate 1 "8/26/2011" "OpenStack" "OpenStack Swift"

   680  

   681  .SH NAME 

   682  .LP

   683  .B swift-dispersion-populate

   684 -\- Openstack-swift dispersion populate 

   685 +\- OpenStack Swift dispersion populate 

   686  

   687  .SH SYNOPSIS

   688  .LP

   689 @@ -88,12 +88,12 @@ Example \fI/etc/swift/dispersion.conf\fR

   690  .SH DOCUMENTATION

   691  .LP

   692  More in depth documentation about the swift-dispersion utilities and

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

   694 +also OpenStack Swift as a whole can be found at 

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

   696  and 

   697  .BI http://swift.openstack.org

   698  

   699  

   700  .SH "SEE ALSO"

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

   702 -.BR dispersion.conf (5)

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

   704 +.BR dispersion.conf (4)

   705 diff --git a/doc/manpages/swift-dispersion-report.1 b/doc/manpages/swift-dispersion-report.1

   706 --- a/doc/manpages/swift-dispersion-report.1

   707 +++ b/doc/manpages/swift-dispersion-report.1

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

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

   710  .\" limitations under the License.

   711  .\"  

   712 -.TH swift-dispersion-report 1 "8/26/2011" "Linux" "OpenStack Swift"

   713 +.TH swift-dispersion-report 1 "8/26/2011" "OpenStack" "OpenStack Swift"

   714  

   715  .SH NAME 

   716  .LP

   717  .B swift-dispersion-report

   718 -\- Openstack-swift dispersion report 

   719 +\- OpenStack Swift dispersion report 

   720  

   721  .SH SYNOPSIS

   722  .LP

   723 @@ -124,12 +124,12 @@ Example \fI/etc/swift/dispersion.conf\fR

   724  .SH DOCUMENTATION

   725  .LP

   726  More in depth documentation about the swift-dispersion utilities and

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

   728 +also OpenStack Swift as a whole can be found at 

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

   730  and 

   731  .BI http://swift.openstack.org

   732  

   733  

   734  .SH "SEE ALSO"

   735 -.BR swift-dispersion-populate(1),

   736 -.BR dispersion.conf (5)

   737 +.BR swift-dispersion-populate (1),

   738 +.BR dispersion.conf (4)

   739 diff --git a/doc/manpages/swift-get-nodes.1 b/doc/manpages/swift-get-nodes.1

   740 --- a/doc/manpages/swift-get-nodes.1

   741 +++ b/doc/manpages/swift-get-nodes.1

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

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

   744  .\" limitations under the License.

   745  .\"  

   746 -.TH swift-get-nodes 1 "8/26/2011" "Linux" "OpenStack Swift"

   747 +.TH swift-get-nodes 1 "8/26/2011" "OpenStack" "OpenStack Swift"

   748  

   749  .SH NAME 

   750  .LP

   751  .B swift-get-nodes

   752 -\- Openstack-swift get-nodes tool

   753 +\- OpenStack Swift get-nodes tool

   754  

   755  .SH SYNOPSIS

   756  .LP

   757 @@ -72,11 +72,11 @@ where the container resides by using the

   758  

   759  .SH DOCUMENTATION

   760  .LP

   761 -More documentation about Openstack-Swift can be found at 

   762 +More documentation about OpenStack Swift can be found at 

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

   764  

   765  

   766  

   767  .SH "SEE ALSO"

   768 -.BR swift-object-info(1),

   769 -.BR swift-ring-builder(1)

   770 +.BR swift-object-info (1),

   771 +.BR swift-ring-builder (1)

   772 diff --git a/doc/manpages/swift-init.1 b/doc/manpages/swift-init.1

   773 --- a/doc/manpages/swift-init.1

   774 +++ b/doc/manpages/swift-init.1

   775 @@ -15,22 +15,54 @@

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

   777  .\" limitations under the License.

   778  .\"  

   779 -.TH swift-init 1 "8/26/2011" "Linux" "OpenStack Swift"

   780 +.TH swift-init 1 "8/26/2011" "OpenStack" "OpenStack Swift"

   781  

   782  .SH NAME 

   783  .LP

   784  .B swift-init

   785 -\- Openstack-swift swift-init tool

   786 +\- Openstack Swift swift-init tool

   787  

   788  .SH SYNOPSIS

   789  .LP

   790 -.B swift-init

   791 - <server> [<server> ...] <command> [options]

   792 +.B /usr/lib/swift/swift-init

   793 +<server> [<server> ...] <command> [options]

   794   

   795  .SH DESCRIPTION 

   796  .PP

   797 +The suite of servers implementing OpenStack Swift should be managed using

   798 +the Solaris Service Management Facility, \fBsmf\fR(5).  There are sixteen

   799 +services:

   800 +.sp

   801 +.in +2

   802 +.nf

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

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

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

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

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

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

   809 +svc:/application/openstack/swift/swift-container-server

   810 +svc:/application/openstack/swift/swift-container-sync

   811 +svc:/application/openstack/swift/swift-container-updater

   812 +svc:/application/openstack/swift/swift-object-auditor

   813 +svc:/application/openstack/swift/swift-object-expirer

   814 +svc:/application/openstack/swift/swift-object-replicator

   815 +svc:/application/openstack/swift/swift-object-server

   816 +svc:/application/openstack/swift/swift-object-updater

   817 +svc:/application/openstack/swift/swift-proxy-server

   818 +svc:/application/openstack/swift/swift-replicator-rsync

   819 +.fi

   820 +.in -2

   821 +.LP

   822 +Each service is described more completely in its corresponding manual page.

   823 +Note that there are no dependencies between the services, although most of

   824 +them should be started in groups, even if the entire suite isn't necessary.

   825 +.LP

   826 +Although the \fBswift-init\fR tool can be used to manage the services,

   827 +doing so is not supported on Solaris.

   828 +.LP

   829  The swift-init tool can be used to initialize all swift daemons available as part of

   830 -openstack-swift. Instead of calling individual init scripts for each 

   831 +OpenStack Swift. Instead of calling individual init scripts for each 

   832  swift daemon, one can just use swift-init. With swift-init you can initialize 

   833  just one swift service, such as the "proxy", or a combination of them. The tool also 

   834  allows one to use the keywords such as "all", "main" and "rest" for the <server> argument.

   835 @@ -116,8 +148,26 @@ allows one to use the keywords such as "

   836  

   837  .SH DOCUMENTATION

   838  .LP

   839 -More documentation about Openstack-Swift can be found at 

   840 +More documentation about OpenStack Swift can be found at 

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

   842  

   843  

   844  

   845 +.SH SEE ALSO

   846 +.BR swift-account-auditor (1),

   847 +.BR swift-account-reaper (1),

   848 +.BR swift-account-replicator (1),

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

   850 +.BR swift-container-auditor (1),

   851 +.BR swift-container-replicator (1),

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

   853 +.BR swift-container-sync (1),

   854 +.BR swift-container-updater

   855 +.BR swift-object-auditor (1),

   856 +.BR swift-object-expirer (1),

   857 +.BR swift-object-replicator (1),

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

   859 +.BR swift-object-updater (1),

   860 +.BR swift-proxy-server (1),

   861 +.BR swift-replicator-rsync (1),

   862 +.BR smf (5)

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

   864 --- a/doc/manpages/swift-object-auditor.1

   865 +++ b/doc/manpages/swift-object-auditor.1

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

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

   868  .\" limitations under the License.

   869  .\"  

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

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

   872  

   873  .SH NAME 

   874  .LP

   875  .B swift-object-auditor 

   876 -\- Openstack-swift object auditor

   877 +\- OpenStack Swift object auditor

   878  

   879  .SH SYNOPSIS

   880  .LP

   881 -.B swift-object-auditor 

   882 +.B /usr/lib/swift/swift-object-auditor

   883  [CONFIG] [-h|--help] [-v|--verbose] [-o|--once] [-z|--zero_byte_fps]

   884  

   885  .SH DESCRIPTION 

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

   887  .RE

   888  .PD

   889  .RE

   890 -    

   891 -    

   892 +

   893 +.LP

   894 +The object auditor should be enabled and disabled using the Solaris Service

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

   896 +is:

   897 +.sp

   898 +.in +2

   899 +.nf

   900 +svc:/application/openstack/swift/swift-object-auditor

   901 +.fi

   902 +.in -2

   903 +

   904  .SH DOCUMENTATION

   905  .LP

   906  More in depth documentation in regards to 

   907  .BI swift-object-auditor 

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

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

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

   911  

   912  

   913  .SH "SEE ALSO"

   914 -.BR object-server.conf(5)

   915 +.BR object-server.conf (4),

   916 +.BR smf (5)

   917 diff --git a/doc/manpages/swift-object-expirer.1 b/doc/manpages/swift-object-expirer.1

   918 --- a/doc/manpages/swift-object-expirer.1

   919 +++ b/doc/manpages/swift-object-expirer.1

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

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

   922  .\" limitations under the License.

   923  .\"  

   924 -.TH swift-object-expirer 1 "3/15/2012" "Linux" "OpenStack Swift"

   925 +.TH swift-object-expirer 1 "3/15/2012" "OpenStack" "OpenStack Swift"

   926  

   927  .SH NAME 

   928  .LP

   929  .B swift-object-expirer

   930 -\- Openstack-swift object expirer

   931 +\- OpenStack Swift object expirer

   932  

   933  .SH SYNOPSIS

   934  .LP

   935 -.B swift-object-expirer 

   936 +.B /usr/lib/swift/swift-object-expirer

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

   938  

   939  .SH DESCRIPTION 

   940 @@ -57,18 +57,28 @@ The options are as follows:

   941  .RE

   942  .PD

   943  .RE

   944 -    

   945 -   

   946 +

   947 +.LP

   948 +The object expirer should be enabled and disabled using the Solaris Service

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

   950 +is:

   951 +.sp

   952 +.in +2

   953 +.nf

   954 +svc:/application/openstack/swift/swift-object-expirer

   955 +.fi

   956 +.in -2

   957 +

   958  .SH DOCUMENTATION

   959  .LP

   960  More in depth documentation in regards to 

   961  .BI swift-object-expirer

   962  can be foud at 

   963  .BI http://swift.openstack.org/overview_expiring_objects.html

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

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

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

   967  

   968  

   969  .SH "SEE ALSO"

   970 -.BR object-expirer.conf(5)

   971 -

   972 +.BR object-expirer.conf (4),

   973 +.BR smf (5)

   974 diff --git a/doc/manpages/swift-object-info.1 b/doc/manpages/swift-object-info.1

   975 --- a/doc/manpages/swift-object-info.1

   976 +++ b/doc/manpages/swift-object-info.1

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

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

   979  .\" limitations under the License.

   980  .\"  

   981 -.TH swift-object-info 1 "8/26/2011" "Linux" "OpenStack Swift"

   982 +.TH swift-object-info 1 "8/26/2011" "OpenStack" "OpenStack Swift"

   983  

   984  .SH NAME 

   985  .LP

   986  .B swift-object-info

   987 -\- Openstack-swift object-info tool

   988 +\- OpenStack Swift object-info tool

   989  

   990  .SH SYNOPSIS

   991  .LP

   992 @@ -48,8 +48,8 @@ It will then return several information 

   993      

   994  .SH DOCUMENTATION

   995  .LP

   996 -More documentation about Openstack-Swift can be found at 

   997 +More documentation about OpenStack Swift can be found at 

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

   999  

  1000  .SH "SEE ALSO"

  1001 -.BR swift-get-nodes(1),

  1002 +.BR swift-get-nodes (1)

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

  1004 --- a/doc/manpages/swift-object-replicator.1

  1005 +++ b/doc/manpages/swift-object-replicator.1

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

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

  1008  .\" limitations under the License.

  1009  .\"  

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

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

  1012  

  1013  .SH NAME 

  1014  .LP

  1015  .B swift-object-replicator 

  1016 -\- Openstack-swift object replicator

  1017 +\- OpenStack Swift object replicator

  1018  

  1019  .SH SYNOPSIS

  1020  .LP

  1021 -.B swift-object-replicator 

  1022 +.B /usr/lib/swift/swift-object-replicator 

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

  1024  

  1025  .SH DESCRIPTION 

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

  1027  .RE

  1028  .PD

  1029  .RE

  1030 -    

  1031 -   

  1032 +

  1033 +.LP

  1034 +The object replicator should be enabled and disabled using the Solaris

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

  1036 +replicator is:

  1037 +.sp

  1038 +.in +2

  1039 +.nf

  1040 +svc:/application/openstack/swift/swift-object-replicator

  1041 +.fi

  1042 +.in -2

  1043 +

  1044  .SH DOCUMENTATION

  1045  .LP

  1046  More in depth documentation in regards to 

  1047  .BI swift-object-replicator

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

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

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

  1051  

  1052  

  1053  .SH "SEE ALSO"

  1054 -.BR object-server.conf(5)

  1055 +.BR object-server.conf (4),

  1056 +.BR smf (5)

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

  1058 --- a/doc/manpages/swift-object-server.1

  1059 +++ b/doc/manpages/swift-object-server.1

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

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

  1062  .\" limitations under the License.

  1063  .\"  

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

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

  1066  

  1067  .SH NAME 

  1068  .LP

  1069  .B swift-object-server

  1070 -\- Openstack-swift object server.

  1071 +\- OpenStack Swift object server.

  1072  

  1073  .SH SYNOPSIS

  1074  .LP

  1075 -.B swift-object-server

  1076 +.B /usr/lib/swift/swift-object-server

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

  1078  

  1079  .SH DESCRIPTION 

  1080 @@ -40,15 +40,27 @@ served. A deletion is also treated as a 

  1081  ".ts", which stands for tombstone). This ensures that deleted files are replicated 

  1082  correctly and older versions don't magically reappear due to failure scenarios.

  1083  

  1084 +.LP

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

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

  1087 +is:

  1088 +.sp

  1089 +.in +2

  1090 +.nf

  1091 +svc:/application/openstack/swift/swift-object-server

  1092 +.fi

  1093 +.in -2

  1094 +

  1095  .SH DOCUMENTATION

  1096  .LP

  1097  More in depth documentation in regards to 

  1098  .BI swift-object-server

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

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

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

  1102  and 

  1103  .BI http://docs.openstack.org

  1104  

  1105  

  1106  .SH "SEE ALSO"

  1107 -.BR object-server.conf(5)

  1108 +.BR object-server.conf (4),

  1109 +.BR smf (5)

  1110 diff --git a/doc/manpages/swift-object-updater.1 b/doc/manpages/swift-object-updater.1

  1111 --- a/doc/manpages/swift-object-updater.1

  1112 +++ b/doc/manpages/swift-object-updater.1

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

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

  1115  .\" limitations under the License.

  1116  .\"  

  1117 -.TH swift-object-updater 1 "8/26/2011" "Linux" "OpenStack Swift"

  1118 +.TH swift-object-updater 1 "8/26/2011" "OpenStack" "OpenStack Swift"

  1119  

  1120  .SH NAME 

  1121  .LP

  1122  .B swift-object-updater

  1123 -\- Openstack-swift object updater

  1124 +\- OpenStack Swift object updater

  1125  

  1126  .SH SYNOPSIS

  1127  .LP

  1128 -.B swift-object-updater

  1129 +.B /usr/lib/swift/swift-object-updater

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

  1131  

  1132  .SH DESCRIPTION 

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

  1134  .RE

  1135  .PD