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
branchs11u2-sru
changeset 4156 4b1def16fe9b
parent 3178 77584387a894
child 5448 56f4540f741d 
--- a/components/openstack/swift/patches/manpages.patch	Thu Apr 16 01:36:32 2015 -0700
+++ b/components/openstack/swift/patches/manpages.patch	Mon Apr 20 12:35:51 2015 -0700
@@ -2,9 +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.
 
-diff --git a/doc/manpages/account-server.conf.5 b/doc/manpages/account-server.conf.5
---- a/doc/manpages/account-server.conf.5
-+++ b/doc/manpages/account-server.conf.5
+--- 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.
@@ -34,9 +33,8 @@
  .SH "SEE ALSO"
 -.BR swift-account-server(1),
 +.BR swift-account-server (1)
-diff --git a/doc/manpages/container-server.conf.5 b/doc/manpages/container-server.conf.5
---- a/doc/manpages/container-server.conf.5
-+++ b/doc/manpages/container-server.conf.5
+--- 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.
@@ -52,7 +50,7 @@
  
  
  
-@@ -279,11 +279,11 @@ Maximum amount of time to spend syncing 
+@@ -279,11 +279,11 @@ Maximum amount of time to spend syncing
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-container-server and
@@ -66,9 +64,8 @@
  .SH "SEE ALSO"
 -.BR swift-container-server(1)
 +.BR swift-container-server (1)
-diff --git a/doc/manpages/dispersion.conf.5 b/doc/manpages/dispersion.conf.5
---- a/doc/manpages/dispersion.conf.5
-+++ b/doc/manpages/dispersion.conf.5
+--- 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.
@@ -110,9 +107,8 @@
 +.BR swift-dispersion-report (1),
 +.BR swift-dispersion-populate (1)
  
-diff --git a/doc/manpages/object-expirer.conf.5 b/doc/manpages/object-expirer.conf.5
---- a/doc/manpages/object-expirer.conf.5
-+++ b/doc/manpages/object-expirer.conf.5
+--- 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.
@@ -143,9 +139,8 @@
 -.BR swift-proxy-server.conf(5),
 +.BR proxy-server.conf (4)
  
-diff --git a/doc/manpages/object-server.conf.5 b/doc/manpages/object-server.conf.5
---- a/doc/manpages/object-server.conf.5
-+++ b/doc/manpages/object-server.conf.5
+--- 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.
@@ -175,9 +170,8 @@
  .SH "SEE ALSO"
 -.BR swift-object-server(1),
 +.BR swift-object-server (1)
-diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5
---- a/doc/manpages/proxy-server.conf.5
-+++ b/doc/manpages/proxy-server.conf.5
+--- 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.
@@ -193,7 +187,7 @@
  
  
  
-@@ -552,10 +552,10 @@ per second.  The default is 1.
+@@ -547,10 +547,10 @@ per second.  The default is 1.
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-proxy-server and
@@ -206,9 +200,8 @@
  .SH "SEE ALSO"
 -.BR swift-proxy-server(1)
 +.BR swift-proxy-server (1)
-diff --git a/doc/manpages/swift-account-auditor.1 b/doc/manpages/swift-account-auditor.1
---- a/doc/manpages/swift-account-auditor.1
-+++ b/doc/manpages/swift-account-auditor.1
+--- 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.
@@ -257,9 +250,41 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-account-reaper.1 b/doc/manpages/swift-account-reaper.1
---- a/doc/manpages/swift-account-reaper.1
-+++ b/doc/manpages/swift-account-reaper.1
+--- 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.
@@ -310,9 +335,8 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-account-replicator.1 b/doc/manpages/swift-account-replicator.1
---- a/doc/manpages/swift-account-replicator.1
-+++ b/doc/manpages/swift-account-replicator.1
+--- 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.
@@ -362,9 +386,8 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-account-server.1 b/doc/manpages/swift-account-server.1
---- a/doc/manpages/swift-account-server.1
-+++ b/doc/manpages/swift-account-server.1
+--- 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.
@@ -415,9 +438,8 @@
 -.BR account-server.conf(5)
 +.BR account-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-container-auditor.1 b/doc/manpages/swift-container-auditor.1
---- a/doc/manpages/swift-container-auditor.1
-+++ b/doc/manpages/swift-container-auditor.1
+--- 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.
@@ -469,9 +491,38 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-container-replicator.1 b/doc/manpages/swift-container-replicator.1
---- a/doc/manpages/swift-container-replicator.1
-+++ b/doc/manpages/swift-container-replicator.1
+--- 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.
@@ -522,9 +573,8 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-container-server.1 b/doc/manpages/swift-container-server.1
---- a/doc/manpages/swift-container-server.1
-+++ b/doc/manpages/swift-container-server.1
+--- 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.
@@ -576,9 +626,8 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-container-sync.1 b/doc/manpages/swift-container-sync.1
---- a/doc/manpages/swift-container-sync.1
-+++ b/doc/manpages/swift-container-sync.1
+--- 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.
@@ -609,9 +658,8 @@
  .SH "SEE ALSO"
 -.BR container-server.conf(5)
 +.BR container-server.conf (4)
-diff --git a/doc/manpages/swift-container-updater.1 b/doc/manpages/swift-container-updater.1
---- a/doc/manpages/swift-container-updater.1
-+++ b/doc/manpages/swift-container-updater.1
+--- 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.
@@ -662,9 +710,8 @@
 -.BR container-server.conf(5)
 +.BR container-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-dispersion-populate.1 b/doc/manpages/swift-dispersion-populate.1
---- a/doc/manpages/swift-dispersion-populate.1
-+++ b/doc/manpages/swift-dispersion-populate.1
+--- 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.
@@ -680,7 +727,7 @@
  
  .SH SYNOPSIS
  .LP
-@@ -95,12 +95,12 @@ Example \fI/etc/swift/dispersion.conf\fR
+@@ -107,12 +107,12 @@ $ swift-dispersion-populate
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-dispersion utilities and
@@ -696,9 +743,8 @@
 -.BR dispersion.conf (5)
 +.BR swift-dispersion-report (1),
 +.BR dispersion.conf (4)
-diff --git a/doc/manpages/swift-dispersion-report.1 b/doc/manpages/swift-dispersion-report.1
---- a/doc/manpages/swift-dispersion-report.1
-+++ b/doc/manpages/swift-dispersion-report.1
+--- 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.
@@ -714,7 +760,7 @@
  
  .SH SYNOPSIS
  .LP
-@@ -131,12 +131,12 @@ Example \fI/etc/swift/dispersion.conf\fR
+@@ -131,12 +131,12 @@ $ swift-dispersion-report
  .SH DOCUMENTATION
  .LP
  More in depth documentation about the swift-dispersion utilities and
@@ -730,9 +776,8 @@
 -.BR dispersion.conf (5)
 +.BR swift-dispersion-populate (1),
 +.BR dispersion.conf (4)
-diff --git a/doc/manpages/swift-get-nodes.1 b/doc/manpages/swift-get-nodes.1
---- a/doc/manpages/swift-get-nodes.1
-+++ b/doc/manpages/swift-get-nodes.1
+--- 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.
@@ -748,24 +793,28 @@
  
  .SH SYNOPSIS
  .LP
-@@ -72,11 +72,11 @@ where the container resides by using the
+@@ -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 
++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)
-diff --git a/doc/manpages/swift-init.1 b/doc/manpages/swift-init.1
---- a/doc/manpages/swift-init.1
-+++ b/doc/manpages/swift-init.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.
@@ -854,9 +903,8 @@
 +.BR swift-proxy-server (1),
 +.BR swift-replicator-rsync (1),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-object-auditor.1 b/doc/manpages/swift-object-auditor.1
---- a/doc/manpages/swift-object-auditor.1
-+++ b/doc/manpages/swift-object-auditor.1
+--- 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.
@@ -908,9 +956,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-object-expirer.1 b/doc/manpages/swift-object-expirer.1
---- a/doc/manpages/swift-object-expirer.1
-+++ b/doc/manpages/swift-object-expirer.1
+--- 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.
@@ -965,9 +1012,8 @@
 -
 +.BR object-expirer.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-object-info.1 b/doc/manpages/swift-object-info.1
---- a/doc/manpages/swift-object-info.1
-+++ b/doc/manpages/swift-object-info.1
+--- 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.
@@ -983,20 +1029,24 @@
  
  .SH SYNOPSIS
  .LP
-@@ -48,8 +48,8 @@ It will then return several information 
+@@ -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 
++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-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)
-diff --git a/doc/manpages/swift-object-replicator.1 b/doc/manpages/swift-object-replicator.1
---- a/doc/manpages/swift-object-replicator.1
-+++ b/doc/manpages/swift-object-replicator.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.
@@ -1048,9 +1098,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-object-server.1 b/doc/manpages/swift-object-server.1
---- a/doc/manpages/swift-object-server.1
-+++ b/doc/manpages/swift-object-server.1
+--- 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.
@@ -1071,7 +1120,7 @@
  [CONFIG] [-h|--help] [-v|--verbose]
  
  .SH DESCRIPTION 
-@@ -40,15 +40,27 @@ served. A deletion is also treated as a 
+@@ -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.
  
@@ -1101,9 +1150,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-object-updater.1 b/doc/manpages/swift-object-updater.1
---- a/doc/manpages/swift-object-updater.1
-+++ b/doc/manpages/swift-object-updater.1
+--- 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.
@@ -1155,9 +1203,8 @@
 -.BR object-server.conf(5)
 +.BR object-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-orphans.1 b/doc/manpages/swift-orphans.1
---- a/doc/manpages/swift-orphans.1
-+++ b/doc/manpages/swift-orphans.1
+--- 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.
@@ -1181,9 +1228,8 @@
 +More documentation about OpenStack Swift can be found at
  .BI http://swift.openstack.org/index.html
  
-diff --git a/doc/manpages/swift-proxy-server.1 b/doc/manpages/swift-proxy-server.1
---- a/doc/manpages/swift-proxy-server.1
-+++ b/doc/manpages/swift-proxy-server.1
+--- 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.
@@ -1232,9 +1278,8 @@
 -.BR proxy-server.conf(5)
 +.BR proxy-server.conf (4),
 +.BR smf (5)
-diff --git a/doc/manpages/swift-recon.1 b/doc/manpages/swift-recon.1
---- a/doc/manpages/swift-recon.1
-+++ b/doc/manpages/swift-recon.1
+--- 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.
@@ -1267,9 +1312,8 @@
 +.BR object-server.conf (4)
  
  
-diff --git a/doc/manpages/swift-ring-builder.1 b/doc/manpages/swift-ring-builder.1
---- a/doc/manpages/swift-ring-builder.1
-+++ b/doc/manpages/swift-ring-builder.1
+--- 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.
upstream/oracle/userland-gate