Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openstack/swift/patches/manpages.patch
changeset 6853 cf1567491b1b
parent 5815 e077a012aa70 
--- a/components/openstack/swift/patches/manpages.patch	Wed Sep 07 14:48:42 2016 -0700
+++ b/components/openstack/swift/patches/manpages.patch	Wed Sep 07 14:48:42 2016 -0700
@@ -2,8 +2,8 @@
 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.3.0/doc/manpages/account-server.conf.5.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/account-server.conf.5	2016-02-07 23:36:11.482101790 -0800
+--- swift-2.7.0/doc/manpages/account-server.conf.5.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/account-server.conf.5	2016-08-08 19:02:27.970894135 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -19,7 +19,7 @@
  
  
  
-@@ -254,11 +254,11 @@ Connection timeout to external services.
+@@ -346,11 +346,11 @@ requested by delay_reaping.
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-account-server and
@@ -33,8 +33,8 @@
  .SH "SEE ALSO"
 -.BR swift-account-server(1),
 +.BR swift-account-server (1)
---- swift-2.3.0/doc/manpages/container-server.conf.5.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/container-server.conf.5	2016-02-07 23:36:11.482749481 -0800
+--- swift-2.7.0/doc/manpages/container-server.conf.5.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/container-server.conf.5	2016-08-08 19:02:27.971606335 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -50,7 +50,7 @@
  
  
  
-@@ -283,11 +283,11 @@ Internal client config file path.
+@@ -379,11 +379,11 @@ Internal client config file path.
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-container-server and
@@ -64,8 +64,8 @@
  .SH "SEE ALSO"
 -.BR swift-container-server(1)
 +.BR swift-container-server (1)
---- swift-2.3.0/doc/manpages/dispersion.conf.5.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/dispersion.conf.5	2016-02-07 23:36:11.483318879 -0800
+--- swift-2.7.0/doc/manpages/dispersion.conf.5.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/dispersion.conf.5	2016-08-08 19:02:27.972256225 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -81,16 +81,16 @@
  
  .SH SYNOPSIS
  .LP
-@@ -45,7 +45,7 @@ Authentication system account/user name
- .IP "\fBauth_key\fR"
- Authentication system account/user password 
+@@ -55,7 +55,7 @@ The default is 'publicURL'.
+ .IP "\fBkeystone_api_insecure\fR"
+ The default is false.
  .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
+@@ -100,13 +100,13 @@ Whether to run the object report. The de
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-dispersion utilities and
@@ -107,8 +107,8 @@
 +.BR swift-dispersion-report (1),
 +.BR swift-dispersion-populate (1)
  
---- swift-2.3.0/doc/manpages/object-expirer.conf.5.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/object-expirer.conf.5	2016-02-07 23:36:11.483836544 -0800
+--- swift-2.7.0/doc/manpages/object-expirer.conf.5.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/object-expirer.conf.5	2016-08-08 19:02:27.972835975 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -124,7 +124,7 @@
  
  
  
-@@ -133,12 +133,12 @@ The default is \fBegg:swift#catch_errors
+@@ -206,12 +206,12 @@ Path to recon cache directory. The defau
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-object-expirer and
@@ -139,8 +139,8 @@
 -.BR swift-proxy-server.conf(5),
 +.BR proxy-server.conf (4)
  
---- swift-2.3.0/doc/manpages/object-server.conf.5.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/object-server.conf.5	2016-02-07 23:36:11.484380639 -0800
+--- swift-2.7.0/doc/manpages/object-server.conf.5.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/object-server.conf.5	2016-08-08 19:02:27.973565170 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -156,7 +156,7 @@
  
  
  
-@@ -273,11 +273,11 @@ The default is 50.
+@@ -510,11 +510,11 @@ will try to use object-replicator's rsyn
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-object-server and
@@ -170,8 +170,8 @@
  .SH "SEE ALSO"
 -.BR swift-object-server(1),
 +.BR swift-object-server (1)
---- swift-2.3.0/doc/manpages/proxy-server.conf.5.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/proxy-server.conf.5	2016-02-07 23:36:11.485027685 -0800
+--- swift-2.7.0/doc/manpages/proxy-server.conf.5.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/proxy-server.conf.5	2016-08-08 19:02:27.974300095 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -187,7 +187,7 @@
  
  
  
-@@ -547,10 +547,10 @@ per second.  The default is 1.
+@@ -1036,10 +1036,10 @@ The default is 'x-container-read, x-cont
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-proxy-server and
@@ -200,8 +200,8 @@
  .SH "SEE ALSO"
 -.BR swift-proxy-server(1)
 +.BR swift-proxy-server (1)
---- swift-2.3.0/doc/manpages/swift-account-auditor.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-account-auditor.1	2016-02-07 23:36:11.485555356 -0800
+--- swift-2.7.0/doc/manpages/swift-account-auditor.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-account-auditor.1	2016-08-08 19:02:27.974810365 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -250,8 +250,8 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-account-info.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-account-info.1	2016-02-07 23:36:11.486089148 -0800
+--- swift-2.7.0/doc/manpages/swift-account-info.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-account-info.1	2016-08-08 19:02:27.975290530 -0700
 @@ -14,12 +14,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -283,8 +283,8 @@
 +.BR swift-container-info (1),
 +.BR swift-get-nodes (1),
 +.BR swift-object-info (1)
---- swift-2.3.0/doc/manpages/swift-account-reaper.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-account-reaper.1	2016-02-07 23:36:11.486663893 -0800
+--- swift-2.7.0/doc/manpages/swift-account-reaper.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-account-reaper.1	2016-08-08 19:02:27.975805060 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -335,8 +335,8 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-account-replicator.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-account-replicator.1	2016-02-07 23:36:11.487188226 -0800
+--- swift-2.7.0/doc/manpages/swift-account-replicator.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-account-replicator.1	2016-08-08 19:02:27.976300255 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -386,8 +386,8 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-account-server.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-account-server.1	2016-02-07 23:36:11.487720472 -0800
+--- swift-2.7.0/doc/manpages/swift-account-server.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-account-server.1	2016-08-08 19:02:27.976796260 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -438,8 +438,8 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-container-auditor.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-container-auditor.1	2016-02-07 23:36:11.488238332 -0800
+--- swift-2.7.0/doc/manpages/swift-container-auditor.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-container-auditor.1	2016-08-08 19:02:27.977281630 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -491,8 +491,8 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-container-info.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-container-info.1	2016-02-07 23:36:11.488748194 -0800
+--- swift-2.7.0/doc/manpages/swift-container-info.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-container-info.1	2016-08-08 19:02:27.977764165 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -521,8 +521,8 @@
 -.BR swift-object-info(1)
 +.BR swift-get-nodes (1),
 +.BR swift-object-info (1)
---- swift-2.3.0/doc/manpages/swift-container-replicator.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-container-replicator.1	2016-02-07 23:36:11.489262124 -0800
+--- swift-2.7.0/doc/manpages/swift-container-replicator.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-container-replicator.1	2016-08-08 19:02:27.978254170 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -573,8 +573,8 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-container-server.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-container-server.1	2016-02-07 23:36:11.489822556 -0800
+--- swift-2.7.0/doc/manpages/swift-container-server.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-container-server.1	2016-08-08 19:02:27.978779845 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -626,8 +626,8 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-container-sync.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-container-sync.1	2016-02-07 23:36:11.490362130 -0800
+--- swift-2.7.0/doc/manpages/swift-container-sync.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-container-sync.1	2016-08-08 19:02:27.979295920 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -658,8 +658,8 @@
  .SH "SEE ALSO"
 -.BR container-server.conf(5)
 +.BR container-server.conf (4)
---- swift-2.3.0/doc/manpages/swift-container-updater.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-container-updater.1	2016-02-07 23:36:11.490895992 -0800
+--- swift-2.7.0/doc/manpages/swift-container-updater.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-container-updater.1	2016-08-08 19:02:27.979802740 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -710,8 +710,8 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-dispersion-populate.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-dispersion-populate.1	2016-02-07 23:36:11.491414678 -0800
+--- swift-2.7.0/doc/manpages/swift-dispersion-populate.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-dispersion-populate.1	2016-08-08 19:02:27.980351620 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -727,7 +727,7 @@
  
  .SH SYNOPSIS
  .LP
-@@ -107,12 +107,12 @@ $ swift-dispersion-populate
+@@ -110,12 +110,12 @@ $ swift-dispersion-populate
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-dispersion utilities and
@@ -743,8 +743,8 @@
 -.BR dispersion.conf (5)
 +.BR swift-dispersion-report (1),
 +.BR dispersion.conf (4)
---- swift-2.3.0/doc/manpages/swift-dispersion-report.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-dispersion-report.1	2016-02-07 23:36:11.491947359 -0800
+--- swift-2.7.0/doc/manpages/swift-dispersion-report.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-dispersion-report.1	2016-08-08 19:02:27.980871430 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -760,7 +760,7 @@
  
  .SH SYNOPSIS
  .LP
-@@ -131,12 +131,12 @@ $ swift-dispersion-report
+@@ -134,12 +134,12 @@ $ swift-dispersion-report
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-dispersion utilities and
@@ -776,8 +776,8 @@
 -.BR dispersion.conf (5)
 +.BR swift-dispersion-populate (1),
 +.BR dispersion.conf (4)
---- swift-2.3.0/doc/manpages/swift-get-nodes.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-get-nodes.1	2016-02-07 23:36:11.492460076 -0800
+--- swift-2.7.0/doc/manpages/swift-get-nodes.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-get-nodes.1	2016-08-08 19:02:27.981361915 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -813,8 +813,8 @@
 +.BR swift-container-info (1),
 +.BR swift-object-info (1),
 +.BR swift-ring-builder (1)
---- swift-2.3.0/doc/manpages/swift-init.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-init.1	2016-02-07 23:36:11.493003288 -0800
+--- swift-2.7.0/doc/manpages/swift-init.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-init.1	2016-08-08 19:02:27.981914380 -0700
 @@ -15,22 +15,54 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -875,7 +875,7 @@
  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 "
+@@ -119,8 +151,26 @@ allows one to use the keywords such as "
  
  .SH DOCUMENTATION
  .LP
@@ -903,8 +903,8 @@
 +.BR swift-proxy-server (1),
 +.BR swift-replicator-rsync (1),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-object-auditor.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-object-auditor.1	2016-02-07 23:36:11.493520910 -0800
+--- swift-2.7.0/doc/manpages/swift-object-auditor.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-object-auditor.1	2016-08-08 19:02:27.982404670 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -956,8 +956,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-object-expirer.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-object-expirer.1	2016-02-07 23:36:11.494051119 -0800
+--- swift-2.7.0/doc/manpages/swift-object-expirer.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-object-expirer.1	2016-08-08 19:02:27.982889395 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1012,8 +1012,8 @@
 -
 +.BR object-expirer.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-object-info.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-object-info.1	2016-02-07 23:36:11.494560238 -0800
+--- swift-2.7.0/doc/manpages/swift-object-info.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-object-info.1	2016-08-08 19:02:27.983363875 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1045,8 +1045,8 @@
 +.BR swift-account-info (1),
 +.BR swift-container-info (1),
 +.BR swift-get-nodes (1)
---- swift-2.3.0/doc/manpages/swift-object-replicator.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-object-replicator.1	2016-02-07 23:36:11.495086872 -0800
+--- swift-2.7.0/doc/manpages/swift-object-replicator.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-object-replicator.1	2016-08-08 19:02:27.983847760 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1098,8 +1098,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-object-server.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-object-server.1	2016-02-07 23:36:11.495607099 -0800
+--- swift-2.7.0/doc/manpages/swift-object-server.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-object-server.1	2016-08-08 19:02:27.984336625 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1150,8 +1150,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-object-updater.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-object-updater.1	2016-02-07 23:36:11.496138018 -0800
+--- swift-2.7.0/doc/manpages/swift-object-updater.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-object-updater.1	2016-08-08 19:02:27.984816205 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1203,8 +1203,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-orphans.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-orphans.1	2016-02-07 23:36:11.496660523 -0800
+--- swift-2.7.0/doc/manpages/swift-orphans.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-orphans.1	2016-08-08 19:02:27.985268230 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1228,8 +1228,8 @@
 +More documentation about OpenStack Swift can be found at
  .BI http://swift.openstack.org/index.html
  
---- swift-2.3.0/doc/manpages/swift-proxy-server.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-proxy-server.1	2016-02-07 23:36:11.497176572 -0800
+--- swift-2.7.0/doc/manpages/swift-proxy-server.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-proxy-server.1	2016-08-08 19:02:27.985740415 -0700
 @@ -15,16 +15,16 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1278,8 +1278,8 @@
 -.BR proxy-server.conf(5)
 +.BR proxy-server.conf (4),
 +.BR smf (7)
---- swift-2.3.0/doc/manpages/swift-recon.1.~1~	2015-04-30 06:57:49.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-recon.1	2016-02-07 23:36:11.497732841 -0800
+--- swift-2.7.0/doc/manpages/swift-recon.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-recon.1	2016-08-08 19:02:27.986285440 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -1295,7 +1295,7 @@
  
  .SH SYNOPSIS
  .LP
-@@ -108,7 +108,7 @@ cronjob to run the swift-recon-cron scri
+@@ -124,7 +124,7 @@ cronjob to run the swift-recon-cron scri
  
  .SH DOCUMENTATION
  .LP
@@ -1304,7 +1304,7 @@
  .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
-@@ -116,6 +116,6 @@ Also more specific documentation about s
+@@ -132,6 +132,6 @@ Also more specific documentation about s
  
  
  .SH "SEE ALSO"
@@ -1312,8 +1312,8 @@
 +.BR object-server.conf (4)
  
  
---- swift-2.3.0/doc/manpages/swift-ring-builder.1.~1~	2015-04-30 06:57:42.000000000 -0700
-+++ swift-2.3.0/doc/manpages/swift-ring-builder.1	2016-02-07 23:36:11.498256500 -0800
+--- swift-2.7.0/doc/manpages/swift-ring-builder.1.~1~	2016-03-25 02:42:55.000000000 -0700
++++ swift-2.7.0/doc/manpages/swift-ring-builder.1	2016-08-08 19:02:27.986766640 -0700
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
upstream/oracle/userland-gate