--- a/components/openstack/swift/patches/manpages.patch Wed Apr 20 08:07:53 2016 -0700
+++ b/components/openstack/swift/patches/manpages.patch Wed Apr 20 08:42:55 2016 -0700
@@ -229,7 +229,7 @@
+
+.LP
+The account auditor should be enabled and disabled using the Solaris
-+Service Management Facility, \fBsmf\fR(5). The service FMRI for the
++Service Management Facility, \fBsmf\fR(7). The service FMRI for the
+account auditor is:
+.sp
+.in +2
@@ -249,7 +249,7 @@
.SH "SEE ALSO"
-.BR account-server.conf(5)
+.BR account-server.conf (4),
-+.BR smf (5)
++.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
@@ -14,12 +14,12 @@
@@ -312,7 +312,7 @@
-
+.LP
+The account reaper should be enabled and disabled using the Solaris Service
-+Management Facility, \fBsmf\fR(5). The service FMRI for the account reaper
++Management Facility, \fBsmf\fR(7). The service FMRI for the account reaper
+is:
+.sp
+.in +2
@@ -334,7 +334,7 @@
.SH "SEE ALSO"
-.BR account-server.conf(5)
+.BR account-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -364,7 +364,7 @@
-
+.LP
+The account replicator should be enabled and disabled using the Solaris
-+Service Management Facility, \fBsmf\fR(5). The service FMRI for the
++Service Management Facility, \fBsmf\fR(7). The service FMRI for the
+account replicator is:
+.sp
+.in +2
@@ -385,7 +385,7 @@
.SH "SEE ALSO"
-.BR account-server.conf(5)
+.BR account-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -414,7 +414,7 @@
+.LP
+The account server should be enabled and disabled using the Solaris Service
-+Management Facility, \fBsmf\fR(5). The service FMRI for the account server
++Management Facility, \fBsmf\fR(7). The service FMRI for the account server
+is:
+.sp
+.in +2
@@ -437,7 +437,7 @@
.SH "SEE ALSO"
-.BR account-server.conf(5)
+.BR account-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -469,7 +469,7 @@
+
+.LP
+The container auditor should be enabled and disabled using the Solaris
-+Service Management Facility, \fBsmf\fR(5). The service FMRI for the
++Service Management Facility, \fBsmf\fR(7). The service FMRI for the
+container auditor is:
+.sp
+.in +2
@@ -490,7 +490,7 @@
.SH "SEE ALSO"
-.BR container-server.conf(5)
+.BR container-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,12 +15,12 @@
@@ -550,7 +550,7 @@
+
+.LP
+The container replicator should be enabled and disabled using the Solaris
-+Service Management Facility, \fBsmf\fR(5). The service FMRI for the
++Service Management Facility, \fBsmf\fR(7). The service FMRI for the
+container replicator is:
+.sp
+.in +2
@@ -572,7 +572,7 @@
.SH "SEE ALSO"
-.BR container-server.conf(5)
+.BR container-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -601,7 +601,7 @@
+.LP
+The container server should be enabled and disabled using the Solaris
-+Service Management Facility, \fBsmf\fR(5). The service FMRI for the
++Service Management Facility, \fBsmf\fR(7). The service FMRI for the
+container server is:
+.sp
+.in +2
@@ -625,7 +625,7 @@
.SH "SEE ALSO"
-.BR container-server.conf(5)
+.BR container-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,12 +15,12 @@
@@ -688,7 +688,7 @@
+
+.LP
+The container updater should be enabled and disabled using the Solaris
-+Service Management Facility, \fBsmf\fR(5). The service FMRI for the
++Service Management Facility, \fBsmf\fR(7). The service FMRI for the
+container updater is:
+.sp
+.in +2
@@ -709,7 +709,7 @@
.SH "SEE ALSO"
-.BR container-server.conf(5)
+.BR container-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,12 +15,12 @@
@@ -838,7 +838,7 @@
.SH DESCRIPTION
.PP
+The suite of servers implementing OpenStack Swift should be managed using
-+the Solaris Service Management Facility, \fBsmf\fR(5). There are sixteen
++the Solaris Service Management Facility, \fBsmf\fR(7). There are sixteen
+services:
+.sp
+.in +2
@@ -902,7 +902,7 @@
+.BR swift-object-updater (1),
+.BR swift-proxy-server (1),
+.BR swift-replicator-rsync (1),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -934,7 +934,7 @@
+
+.LP
+The object auditor should be enabled and disabled using the Solaris Service
-+Management Facility, \fBsmf\fR(5). The service FMRI for the object auditor
++Management Facility, \fBsmf\fR(7). The service FMRI for the object auditor
+is:
+.sp
+.in +2
@@ -955,7 +955,7 @@
.SH "SEE ALSO"
-.BR object-server.conf(5)
+.BR object-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -987,7 +987,7 @@
+
+.LP
+The object expirer should be enabled and disabled using the Solaris Service
-+Management Facility, \fBsmf\fR(5). The service FMRI for the object expirer
++Management Facility, \fBsmf\fR(7). The service FMRI for the object expirer
+is:
+.sp
+.in +2
@@ -1011,7 +1011,7 @@
-.BR object-expirer.conf(5)
-
+.BR object-expirer.conf (4),
-+.BR smf (5)
++.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
@@ -15,12 +15,12 @@
@@ -1076,7 +1076,7 @@
+
+.LP
+The object replicator should be enabled and disabled using the Solaris
-+Service Management Facility, \fBsmf\fR(5). The service FMRI for the object
++Service Management Facility, \fBsmf\fR(7). The service FMRI for the object
+replicator is:
+.sp
+.in +2
@@ -1097,7 +1097,7 @@
.SH "SEE ALSO"
-.BR object-server.conf(5)
+.BR object-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -1126,7 +1126,7 @@
+.LP
+The object server should be enabled and disabled using the Solaris Service
-+Management Facility, \fBsmf\fR(5). The service FMRI for the object server
++Management Facility, \fBsmf\fR(7). The service FMRI for the object server
+is:
+.sp
+.in +2
@@ -1149,7 +1149,7 @@
.SH "SEE ALSO"
-.BR object-server.conf(5)
+.BR object-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,16 +15,16 @@
@@ -1181,7 +1181,7 @@
+
+.LP
+The object updater should be enabled and disabled using the Solaris Service
-+Management Facility, \fBsmf\fR(5). The service FMRI for the object updater
++Management Facility, \fBsmf\fR(7). The service FMRI for the object updater
+is:
+.sp
+.in +2
@@ -1202,7 +1202,7 @@
.SH "SEE ALSO"
-.BR object-server.conf(5)
+.BR object-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,12 +15,12 @@
@@ -1256,7 +1256,7 @@
+.LP
+The proxy server should be enabled and disabled using the Solaris Service
-+Management Facility, \fBsmf\fR(5). The service FMRI for the proxy server
++Management Facility, \fBsmf\fR(7). The service FMRI for the proxy server
+is:
+.sp
+.in +2
@@ -1277,7 +1277,7 @@
.SH "SEE ALSO"
-.BR proxy-server.conf(5)
+.BR proxy-server.conf (4),
-+.BR smf (5)
++.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
@@ -15,12 +15,12 @@