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
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 4072 db0cec748ec0
child 5815 e077a012aa70 
--- a/components/openstack/swift/patches/manpages.patch	Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/swift/patches/manpages.patch	Fri May 20 17:42:29 2016 -0400
@@ -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.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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -33,8 +33,8 @@
  .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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -50,7 +50,7 @@
  
  
  
-@@ -279,11 +279,11 @@ Maximum amount of time to spend syncing
+@@ -283,11 +283,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.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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -107,8 +107,8 @@
 +.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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -139,8 +139,8 @@
 -.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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -170,8 +170,8 @@
  .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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -200,8 +200,8 @@
  .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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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.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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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.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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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.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
+--- 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
 @@ -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 (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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -743,8 +743,8 @@
 -.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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -776,8 +776,8 @@
 -.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
+--- 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
 @@ -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.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
+--- 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
 @@ -15,22 +15,54 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
@@ -903,8 +903,8 @@
 +.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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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.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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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.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
+--- 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
 @@ -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 (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
+--- 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
 @@ -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
-@@ -104,7 +104,7 @@ cronjob to run the swift-recon-cron scri
+@@ -108,7 +108,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
-@@ -112,6 +112,6 @@ Also more specific documentation about s
+@@ -116,6 +116,6 @@ Also more specific documentation about s
  
  
  .SH "SEE ALSO"
@@ -1312,8 +1312,8 @@
 +.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
+--- 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
 @@ -15,12 +15,12 @@
  .\" See the License for the specific language governing permissions and
  .\" limitations under the License.
upstream/oracle/userland-gate