--- a/components/apache24/Solaris/apache24.1m.sunman	Fri Oct 23 05:42:31 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,416 +0,0 @@
-'\" te
-.\" Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-.TH apache24 1M "Jan 2015" "SunOS 5.12" "System Administration Commands"
-.SH NAME
-apache2 \- Apache HTTP Server Version 2.4 overview
-.SH SYNOPSIS
-.LP
-.nf
-\fBapache2\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-Apache HTTP Server Version 2.4 (Apache 2) consists of a main  server daemon,
-loadable server modules,  some additional  support utilities, configuration
-files, and documentation.
-.sp
-.LP
-Note Apache 2.4 is 64-bit only and Apache 2.2 modules are not
-binary compatible with 2.4.
-.sp
-Several Apache 2 modules are bundled in separate packages to reduce number of
-dependencies of main package. These are:
-.sp
-.in +2
-.nf
-web/server/apache-24/apache-dbd
-web/server/apache-24/apache-ldap
-web/server/apache-24/apache-lua
-web/server/apache-24/apache-ssl
-web/server/apache-24/apache-ssl-fips-140
-.fi
-.in -2
-.sp
-Apache 2 can be enabled by authorized user within the service
-management facility (SMF), using the following fault management
-resource identifier (FMRI):
-.sp
-.in +2
-.nf
-svc:/network/http:apache24
-.fi
-.in -2
-.sp
-Available SMF properties are listed in the following table:
-.sp
-.TS
-tab(^G) allbox;
-cw(2.750000i)| cw(2.750000i)
-lw(2.750000i)| lw(2.750000i).
-SMF Property Name	Value
-httpd/MPM	event (default), prefork or worker
-httpd/startup_options	valid apachectl options
-.TE
-.SH FILES
-.sp
-.LP
-The following files specify the installation locations for Apache 2:
-.LP
-Note : 
-.RS +4
-.TP
-.ie t \(bu
-.el o
-The string \fB[version]\fR should be expanded
-to \fB"MAJOR.MINOR"\fR. For example, \fB/usr/apache2/2.4/*\fR.
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-To find the current version of Apache 2 installed on your
-machine, type the following command:
-.sp
-.in +2
-.nf
-$ /usr/apache2/[version]/bin/apachectl -v
-.fi
-.in -2
-.sp
-
-.RE
-.RE
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/etc/apache2/[version]/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains server configuration files. A newly-installed server
-contains a default \fBhttpd.conf\fR file. This is the main configuration file.
-.sp
-If there is need to use different main configuration file (e.g. to run
-multiple Apache 2 instances), it's possible by providing Apache '-f'
-option via SMF property httpd/startup_options.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/etc/apache2/[version]/conf.d/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains additional server configuration files.
-.sp
-By default, server will load all the \fB\&.conf\fR files
-placed under this directory.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/etc/apache2/[version]/envvars\fR\fR
-.ad
-.sp .6
-.RS 4n
-File for specifying the environment settings which the server uses at
-startup. This is the user-editable version of the 
-/usr/apache2/[version]/bin/envvars file. 
-.sp
-Note that this is default path to envvars file only in case where main
-configuration file is in directory /etc/apache2/[version]/. If this
-is not the case Apache 2 will look for envvars file in the same
-directory where is main configuration file.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/etc/apache2/[version]/magic\fR\fR
-.ad
-.sp .6
-.RS 4n
-Magic data for \fBmod_mime_magic\fR Apache module as documented in the 
-.nf
-\fB/usr/apache2/2.2/manual/mod/mod_mime_magic.html\fR file.
-.fi
-.nf
-Editing this file is not recommended.
-.fi
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/etc/apache2/[version]/mime.types\fR\fR
-.ad
-.sp .6
-.RS 4n
-Default MIME types file. This file sets the default list of
-mappings from filename extensions to content types, changing this file is
-not recommended. Use the \fBAddType\fR directive instead.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/etc/apache2/[version]/original/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contents under this directory are delivered as-is from the
-apache distribution and these files are not meant to be read by the server.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/etc/apache2/[version]/sample-conf.d/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains sample \fB\&.conf\fR files. These are
-not included in the main configuration file. To use the sample file, copy
-the file to \fBconf.d\fR directory and modify as per the need.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/usr/apache2/[version]/bin/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains the main httpd executable as well as other utility programs.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/usr/apache2/[version]/bin/envvars\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains the default environment settings that the server uses at startup.
-.nf
-Editing this file is not recommended. 
-.fi
-Instead, user should use /etc/apache2/[version]/envvars file.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/usr/apache2/[version]/manual/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains the Apache 2 manual in HTML format.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/usr/apache2/[version]/include/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains the Apache 2 header files, which are needed for building
-various optional server extensions with \fBapxs(8)\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/usr/apache2/[version]/libexec/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains loadable modules (DSOs) supplied with the server.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/usr/apache2/[version]/man/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains man pages for the server, utility programs, and \fBmod_perl\fR.
-.sp
-Add this directory to your MANPATH to read the Apache 2 man pages. See
-Notes.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/var/apache2/[version]/cgi-bin/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Default location for the CGI scripts.
-.sp
-This can be changed by altering the \fBhttpd.conf\fR file
-and restarting the server.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/var/apache2/[version]/htdocs/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Default document root.
-.sp
-This can be changed by altering the \fBhttpd.conf\fR file
-and restarting the server.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/var/apache2/[version]/icons/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Icons used by the server.
-.sp
-This should not be changed.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/var/apache2/[version]/libexec/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Place holder for user Apache 2 modules.
-.sp
-Any modules which are added using \fBapxs(8)\fR are copied into this directory.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/var/apache2/[version]/logs/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Contains server log files.
-.sp
-The formats, names, and locations of the files in this directory can
-be altered by various configuration directives in the \fBhttpd.conf\fR file.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/var/apache2/[version]/proxy/\fR\fR
-.ad
-.sp .6
-.RS 4n
-Directory used to cache pages if  the caching feature of \fBmod_proxy\fR is enabled in the \fBhttpd.conf\fR file.
-.sp
-The location of the cache can also be changed by changing the proxy
-configuration in the \fBhttpd.conf\fR file.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB/usr/bin/\fR\fR
-.ad
-.sp .6
-.RS 4na
-Contains pkg(5) version based mediated symbolic links to the various
-Apache 2 utility programs.
-.RE
-
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRTo switch to worker MPM type
-.sp
-
-.in +2
-.nf
-# \fBsvccfg -s apache24 setprop httpd/MPM=worker\fR
-# \fBsvcadm refresh apache24\fR
-# \fBsvcadm restart apache24\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRCreate new SMF apache instance
-.sp
-.LP
-This expects that valid configuration exists in
-/var/myapache/httpd.conf and it has altered all relevant directives
-against default apache instance (e.g. PidFile, Listen, DocumentRoot,
-ErrorLog and CustomLog).
-.sp
-.in +2
-.nf
-# \fBcp /lib/svc/manifest/network/http-apache24.xml my-apache24.xml\fR
-.sp
-Edit my-apache24.xml and rename instance name to my-apache24.
-
-# \fBsvccfg import my-apache24.xml\fR
-# \fBsvccfg -s my-apache24 setprop httpd/startup_options=\\("-f" "/var/myapache/httpd.conf"\\)\fR
-# \fBsvcadm refresh my-apache24\fR
-.fi
-.in -2
-.sp
-
-.SH SEE ALSO
-.sp
-.LP
-\fBattributes(5)\fR, \fBhttpd(8)\fR, apachectl(8)
-.sp
-.LP
-http://httpd.apache.org/docs/
-.SH NOTES
-.sp
-.LP
-In addition to the documentation and man pages included with Solaris,
-more information is available at http://httpd.apache.org/\&.
-.sp
-.LP
-The Apache 2 man pages are provided with the programming modules. To
-view the manual pages for the Apache 2 modules with the man command, add \fB/usr/apache2/[version]/man\fR to the MANPATH environment variable.
-See \fBman(1)\fR for more information. Running \fBcatman(1M)\fR on
-the Apache 2 manual pages is not supported.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache24/Solaris/apache24.8.sunman	Fri Oct 23 14:22:44 2015 -0700
@@ -0,0 +1,416 @@
+'\" te
+.\" Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+.TH apache24 8 "20 Oct 2015" "SunOS 5.12" "System Administration Commands"
+.SH NAME
+apache2 \- Apache HTTP Server Version 2.4 overview
+.SH SYNOPSIS
+.LP
+.nf
+\fBapache2\fR
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+Apache HTTP Server Version 2.4 (Apache 2) consists of a main  server daemon,
+loadable server modules,  some additional  support utilities, configuration
+files, and documentation.
+.sp
+.LP
+Note Apache 2.4 is 64-bit only and Apache 2.2 modules are not
+binary compatible with 2.4.
+.sp
+Several Apache 2 modules are bundled in separate packages to reduce number of
+dependencies of main package. These are:
+.sp
+.in +2
+.nf
+web/server/apache-24/apache-dbd
+web/server/apache-24/apache-ldap
+web/server/apache-24/apache-lua
+web/server/apache-24/apache-ssl
+web/server/apache-24/apache-ssl-fips-140
+.fi
+.in -2
+.sp
+Apache 2 can be enabled by authorized user within the service
+management facility (SMF), using the following fault management
+resource identifier (FMRI):
+.sp
+.in +2
+.nf
+svc:/network/http:apache24
+.fi
+.in -2
+.sp
+Available SMF properties are listed in the following table:
+.sp
+.TS
+tab(^G) allbox;
+cw(2.750000i)| cw(2.750000i)
+lw(2.750000i)| lw(2.750000i).
+SMF Property Name	Value
+httpd/MPM	event (default), prefork or worker
+httpd/startup_options	valid apachectl options
+.TE
+.SH FILES
+.sp
+.LP
+The following files specify the installation locations for Apache 2:
+.LP
+Note : 
+.RS +4
+.TP
+.ie t \(bu
+.el o
+The string \fB[version]\fR should be expanded
+to \fB"MAJOR.MINOR"\fR. For example, \fB/usr/apache2/2.4/*\fR.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+To find the current version of Apache 2 installed on your
+machine, type the following command:
+.sp
+.in +2
+.nf
+$ /usr/apache2/[version]/bin/apachectl -v
+.fi
+.in -2
+.sp
+
+.RE
+.RE
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/etc/apache2/[version]/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains server configuration files. A newly-installed server
+contains a default \fBhttpd.conf\fR file. This is the main configuration file.
+.sp
+If there is need to use different main configuration file (e.g. to run
+multiple Apache 2 instances), it's possible by providing Apache '-f'
+option via SMF property httpd/startup_options.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/etc/apache2/[version]/conf.d/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains additional server configuration files.
+.sp
+By default, server will load all the \fB\&.conf\fR files
+placed under this directory.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/etc/apache2/[version]/envvars\fR\fR
+.ad
+.sp .6
+.RS 4n
+File for specifying the environment settings which the server uses at
+startup. This is the user-editable version of the 
+/usr/apache2/[version]/bin/envvars file. 
+.sp
+Note that this is default path to envvars file only in case where main
+configuration file is in directory /etc/apache2/[version]/. If this
+is not the case Apache 2 will look for envvars file in the same
+directory where is main configuration file.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/etc/apache2/[version]/magic\fR\fR
+.ad
+.sp .6
+.RS 4n
+Magic data for \fBmod_mime_magic\fR Apache module as documented in the 
+.nf
+\fB/usr/apache2/2.2/manual/mod/mod_mime_magic.html\fR file.
+.fi
+.nf
+Editing this file is not recommended.
+.fi
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/etc/apache2/[version]/mime.types\fR\fR
+.ad
+.sp .6
+.RS 4n
+Default MIME types file. This file sets the default list of
+mappings from filename extensions to content types, changing this file is
+not recommended. Use the \fBAddType\fR directive instead.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/etc/apache2/[version]/original/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contents under this directory are delivered as-is from the
+apache distribution and these files are not meant to be read by the server.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/etc/apache2/[version]/sample-conf.d/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains sample \fB\&.conf\fR files. These are
+not included in the main configuration file. To use the sample file, copy
+the file to \fBconf.d\fR directory and modify as per the need.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/apache2/[version]/bin/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains the main httpd executable as well as other utility programs.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/apache2/[version]/bin/envvars\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains the default environment settings that the server uses at startup.
+.nf
+Editing this file is not recommended. 
+.fi
+Instead, user should use /etc/apache2/[version]/envvars file.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/apache2/[version]/manual/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains the Apache 2 manual in HTML format.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/apache2/[version]/include/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains the Apache 2 header files, which are needed for building
+various optional server extensions with \fBapxs(1)\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/apache2/[version]/libexec/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains loadable modules (DSOs) supplied with the server.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/apache2/[version]/man/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains man pages for the server, utility programs, and \fBmod_perl\fR.
+.sp
+Add this directory to your MANPATH to read the Apache 2 man pages. See
+Notes.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/apache2/[version]/cgi-bin/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Default location for the CGI scripts.
+.sp
+This can be changed by altering the \fBhttpd.conf\fR file
+and restarting the server.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/apache2/[version]/htdocs/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Default document root.
+.sp
+This can be changed by altering the \fBhttpd.conf\fR file
+and restarting the server.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/apache2/[version]/icons/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Icons used by the server.
+.sp
+This should not be changed.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/apache2/[version]/libexec/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Place holder for user Apache 2 modules.
+.sp
+Any modules which are added using \fBapxs(1)\fR are copied into this directory.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/apache2/[version]/logs/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains server log files.
+.sp
+The formats, names, and locations of the files in this directory can
+be altered by various configuration directives in the \fBhttpd.conf\fR file.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/apache2/[version]/proxy/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Directory used to cache pages if  the caching feature of \fBmod_proxy\fR is enabled in the \fBhttpd.conf\fR file.
+.sp
+The location of the cache can also be changed by changing the proxy
+configuration in the \fBhttpd.conf\fR file.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/bin/\fR\fR
+.ad
+.sp .6
+.RS 4na
+Contains pkg(5) version based mediated symbolic links to the various
+Apache 2 utility programs.
+.RE
+
+
+.SH EXAMPLES
+.LP
+\fBExample 1 \fRTo switch to worker MPM type
+.sp
+
+.in +2
+.nf
+# \fBsvccfg -s apache24 setprop httpd/MPM=worker\fR
+# \fBsvcadm refresh apache24\fR
+# \fBsvcadm restart apache24\fR
+.fi
+.in -2
+.sp
+
+.LP
+\fBExample 2 \fRCreate new SMF apache instance
+.sp
+.LP
+This expects that valid configuration exists in
+/var/myapache/httpd.conf and it has altered all relevant directives
+against default apache instance (e.g. PidFile, Listen, DocumentRoot,
+ErrorLog and CustomLog).
+.sp
+.in +2
+.nf
+# \fBcp /lib/svc/manifest/network/http-apache24.xml my-apache24.xml\fR
+.sp
+Edit my-apache24.xml and rename instance name to my-apache24.
+
+# \fBsvccfg import my-apache24.xml\fR
+# \fBsvccfg -s my-apache24 setprop httpd/startup_options=\\("-f" "/var/myapache/httpd.conf"\\)\fR
+# \fBsvcadm refresh my-apache24\fR
+.fi
+.in -2
+.sp
+
+.SH SEE ALSO
+.sp
+.LP
+\fBattributes(7)\fR, \fBhttpd(8)\fR, apachectl(8)
+.sp
+.LP
+http://httpd.apache.org/docs/
+.SH NOTES
+.sp
+.LP
+In addition to the documentation and man pages included with Solaris,
+more information is available at http://httpd.apache.org/\&.
+.sp
+.LP
+The Apache 2 man pages are provided with the programming modules. To
+view the manual pages for the Apache 2 modules with the man command, add \fB/usr/apache2/[version]/man\fR to the MANPATH environment variable.
+See \fBman(1)\fR for more information. Running \fBcatman(8)\fR on
+the Apache 2 manual pages is not supported.

--- a/components/apache24/apache-24.p5m	Fri Oct 23 05:42:31 2015 -0700
+++ b/components/apache24/apache-24.p5m	Fri Oct 23 14:22:44 2015 -0700
@@ -1441,9 +1441,9 @@
 link path=usr/share/man/man1/logresolve.1 \
     target=../../../apache2/2.4/man/man1/logresolve.1 mediator=apache \
     mediator-version=2.4
-link path=usr/share/man/man1m/apache2.1m target=apache24.1m mediator=apache \
+link path=usr/share/man/man8/apache2.8 target=apache24.8 mediator=apache \
     mediator-version=2.4
-file Solaris/apache24.1m.sunman path=usr/share/man/man1m/apache24.1m
+file Solaris/apache24.8.sunman path=usr/share/man/man8/apache24.8
 link path=usr/share/man/man8/apachectl.8 \
     target=../../../apache2/2.4/man/man8/apachectl.8 mediator=apache \
     mediator-version=2.4

--- a/components/graphviz/graphviz.p5m	Fri Oct 23 05:42:31 2015 -0700
+++ b/components/graphviz/graphviz.p5m	Fri Oct 23 14:22:44 2015 -0700
@@ -506,7 +506,7 @@
 file path=usr/share/man/man3/pack.3
 file path=usr/share/man/man3/pathplan.3
 file path=usr/share/man/man3/xdot.3
-file usr/share/man/man7/graphviz.7 path=usr/share/man/man5/graphviz.5
+file path=usr/share/man/man7/graphviz.7
 license COPYING license=EPL1.0
 license graphviz.license.extra license="Other Notices"
 

--- a/components/memcached/Solaris/memcached.1m	Fri Oct 23 05:42:31 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,487 +0,0 @@
-'\" te
-.TH memcached 1M "March 2008" "SunOS 5.11" "Administration Commands"
-.SH NAME
-memcached \- high performance memory object caching
-system
-.SH SYNOPSIS
-.LP
-.nf
-\fBmemcached [\fB-l\fR \fI<ip-addr>\fR] [\fB-d\fR] [\fB-u\fR \fI<username>\fR]
-[\fB-m\fR \fI<num>\fR] [\fB-c\fR \fI<num>\fR] [\fB-k\fR] [\fB-L \fR]
-[\fB-p\fR \fI<num>\fR] [\fB-U\fR \fI<num>\fR] [\fB-s\fR \fI<filename>\fR]
-[\fB-a\fR \fI<perms>\fR] [\fB-M\fR] [\fB-r\fR] [\fB-b\fR]
-[\fB-f\fR \fI<factor>\fR] [\fB-n\fR \fI<size>\fR] [\fB-h\fR] [\fB-v\fR] [\fB-vv\fR] [\fB-i\fR]
-[\fB-P\fR \fI<filename>\fR] [\fB-t\fR \fI<threads>\fR] [\fB-D\fR \fI<char>\fR]\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBmemcached\fR is a flexible memory object caching daemon
-designed to alleviate database load in dynamic web applications by storing
-objects in memory.  It is based on \fBlibevent\fR to scale to
-any size needed, and is specifically optimized to avoid swapping and always
-use non-blocking I/O. This man page documents briefly the \fBmemcached\fR memory
-object caching daemon.
-.SH OPTIONS
-.sp
-.LP
-The options supported by the \fBmemcached\fR command are
-described below.
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-l\fR \fI<ip-addr>\fR\fR
-.ad
-.RS 17n
-.rt  
-Listen on \fI<ip-addr>\fR; default
-to \fBINADDR_ANY\fR. This is an important option to  consider
-as there is no other way to secure the installation. Binding to an  internal
-or fire walled network interface is suggested.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-d\fR\fR
-.ad
-.RS 17n
-.rt  
-Run memcached as a daemon.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-u\fR \fI<username>\fR\fR
-.ad
-.RS 17n
-.rt  
-Assume the identity of \fI<username>\fR only when run as a super user (root).
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-m\fR \fI<num>\fR\fR
-.ad
-.RS 17n
-.rt  
-Use the maximum \fI<num>\fR MB memory for object storage; the default is 64 MB.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-c\fR \fI<num>\fR\fR
-.ad
-.RS 17n
-.rt  
-Use the specified number of maximum simultaneous connections;
-the default is 1024.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-k\fR\fR
-.ad
-.RS 17n
-.rt  
-Lock down all paged memory.
-.sp
-Use this option with caution with large caches. For information about
-the configuration suggestions, see the README and the memcached home page.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-L\fR\fR
-.ad
-.RS 17n
-.rt  
-Preallocate memory and use large memory pages if possible.
-.sp
-This option will preallocate cache memory for object storage.
-See description of \fB-m\fR option for a specification of the size of the memory.
-If supported by the platform, large memory pages will be allocated.
-This should reduce number of TLB misses and increase performance.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-p\fR \fI<num>\fR\fR
-.ad
-.RS 17n
-.rt  
-Listen on the TCP port \fI<num>\fR\&.
-The default port is 11211. 
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-U\fR \fI<num>\fR\fR
-.ad
-.RS 17n
-.rt  
-Listen on the UDP port \fI<num>\fR\&.
-The default is 0, meaning that the UDP protocol is disabled.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-s\fR \fI<filename>\fR\fR
-.ad
-.RS 17n
-.rt  
-Unix socket path to listen on (disables listening support for TCP and UDP).
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-a\fR \fI<perms>\fR\fR
-.ad
-.RS 17n
-.rt  
-Permissions (in octal format) for Unix socket created with \fB-s\fR option.
-Default value is 0700.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-M\fR\fR
-.ad
-.RS 17n
-.rt  
-Disable automatic removal of items from the cache when out
-of memory. Additions will not be possible until adequate space is freed up.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-r\fR\fR
-.ad
-.RS 17n
-.rt  
-Raise the core file size limit to the maximum allowable.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-b\fR\fR
-.ad
-.RS 17n
-.rt  
-Run a managed instance.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-f\fR \fI<factor>\fR\fR
-.ad
-.RS 17n
-.rt  
-Use this option to specify \fI<factor>\fR as
-the multiplier for computing the sizes of memory chunks that items are stored
-in. A lower value may result in less wasted memory depending on the total
-amount of memory available and the distribution of item sizes. The default
-value is 1.25.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-n\fR \fI<size>\fR\fR
-.ad
-.RS 17n
-.rt  
-Allocate a minimum of \fI<size>\fR bytes
-for the item key, value, and flags. The default value is 48. If you have a
-lot of small keys and values, you can get a significant memory efficiency
-gain with a lower value. If you use a high chunk growth factor, that is \fB-f\fR option, you may want to increase the size to allow a bigger percentage
-of your items to fit in the most densely packed smallest chunks.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-h\fR\fR
-.ad
-.RS 17n
-.rt  
-Show the version of memcached and a summary of options.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-v\fR\fR
-.ad
-.RS 17n
-.rt  
-Be verbose during the event loop; print out errors and warnings.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-vv\fR\fR
-.ad
-.RS 17n
-.rt  
-Be even more verbose; same as \fB-v\fR option but
-also print client commands and  responses.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-i\fR\fR
-.ad
-.RS 17n
-.rt  
-Display \fBmemcached\fR and \fBlibevent\fR licenses.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-P\fR \fI<filename>\fR\fR
-.ad
-.RS 17n
-.rt  
-Print \fBpidfile\fR to the specified file.
-.LP
-Note - 
-.sp
-.RS 2
-This option can be used only when \fBmechached\fR is
-run as a daemon (\fB-d\fR option).
-.RE
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-t\fR \fI<threads>\fR\fR
-.ad
-.RS 17n
-.rt  
-Number of threads to use to process incoming requests. The default is 4.
-It is typically not useful to set this much higher than the number of CPU cores
-on the \fBmemcached\fR server.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-D\fR \fI<char>\fR\fR
-.ad
-.RS 17n
-.rt  
-Use the \fI<char>\fR as the delimiter
-between key prefixes and IDs. This is used for per-prefix statistics reporting.
-The default is \fB:\fR (colon). If this option is specified,
-statistics collection is turned on automatically; if not, then it can be turned
-on by sending the \fBstats detail on\fR command to the server.
-.RE
-
-.SH EXIT STATUS
-.sp
-.LP
-The following exit values are returned:
-.sp
-.ne 2
-.mk
-.na
-\fB\fB0\fR\fR
-.ad
-.RS 5n
-.rt  
-command executed successfully
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB1\fR\fR
-.ad
-.RS 5n
-.rt  
-error in executing the command
-.RE
-
-.SH SERVICE MANAGEMENT FACILITY
-.sp
-.LP
-\fBmemcached\fR package for Solaris (\fBservice/memcached\fR)
-includes files necessary to register with the Service Management Facility
-described in \fISMF(5)\fR. The following procedure describes the steps to automate
-the service management using memcached.
-.RS +4
-.TP
-1.
-Add other parameters to be passed to the memcached service instance.
-.sp
-example: specify the server to use 1024 MB of memory
-.sp
-.in +2
-.nf
-example% svccfg
-svc:> select memcached
-svc:/application/database/memcached> setprop memcached/options=("-m" "1024")
-svc:/application/database/memcached> quit
-example% svcadm refresh memcached
-.fi
-.in -2
-
-.LP
-Note - 
-.sp
-.RS 2
-The arguments cannot be passed as a single string because of a limitation in \fIsvccfg\fR.
-.RE
-.RE
-.RS +4
-.TP
-2.
-Enable memcached .
-.sp
-.in +2
-.nf
-example% svcadm enable memcached 
-.fi
-.in -2
-
-The state of the service instance changes to \fBonline\fR,
-and the memcached service instance must be started:
-.sp
-.in +2
-.nf
-example% svcs memcached
-STATE          STIME    FMRI
-online          1:19:15 svc:/application/database/memcached:default
-.fi
-.in -2
-.sp
-
-.RE
-.RS +4
-.TP
-3.
-To disable shutdown and automatic restart of memcached service instance,
-.sp
-.in +2
-.nf
-example% svcadm disable memcached
-.fi
-.in -2
-
-.RE
-.SH USER AUTHORIZATIONS
-.sp
-.LP
-You can use \fBRBAC(5)\fR to authorize otherwise non-privileged users to manage
-\fBmemcached\fR services.
-To let a user named \fBmyuser\fR change \fBmemcached\fR value properties and
-manage \fBmemcached\fR service states, add the following line to
-\fB/etc/user_attr\fR:
-.sp
-.in +2
-.nf
-myuser::::type=role;profiles=Memcached Administration,All
-.fi
-.in -2
-.sp
-.RE
-.SH PACKAGE CONTENTS
-.sp
-.LP
-The \fBmemcached\fR package consists of the memcached server and
-man pages for the server. 
-.sp
-.LP
-Client libraries can be made available by installing other packages.
-.sp
-.LP
-The memcached server is based on the memcached open-source software
-available from http://www.danga.com/memcached/\&.
-.SH SECURITY
-.sp
-.LP
-When the memcached server is started, it listens for network requests
-on a TCP port and/or a UDP port. It is important for the security of the network
-that you protect this port, for example, by blocking access to this port in
-a firewall. 
-.sp
-.LP
-The default TCP port number to use is 11211. 
-.sp
-.LP
-You may use the \fB-p\fR option to set another TCP port number.
-There is no default UDP port number. You can use the \fB-U\fR option
-to set a UDP port number.
-.sp
-.LP
-If you are running memcached on a server with multiple network interfaces,
-you can restrict vulnerability by binding memcached to a single interface
-by using the \fB-l\fR option.
-.LP
-Caution - 
-.sp
-.RS 2
-Note that \fBmemcached\fR was designed for speed
-and not for security. There is no authentication of requests that go in to
-the memcached servers, and communication is not encrypted. The network that
-your memcached servers and clients run within should be safe-guarded against
-network attacks.
-.RE
-.SH SEE ALSO
-.sp
-.LP
-\fBlibmemcached(3libmemcached)\fR
-.LP
-Additional documentation (FAQ) can be found at http://www.eu.socialtext.net/memcached/index.cgi\&.
-.SH NOTES
-.sp
-.LP
-LICENSE
-.sp
-.LP
-The \fBmemcached\fR daemon is copyright Danga Interactive
-and is distributed under  the BSD license. \fBmemcached\fR clients
-are licensed separately.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/memcached/Solaris/memcached.8	Fri Oct 23 14:22:44 2015 -0700
@@ -0,0 +1,487 @@
+'\" te
+.TH memcached 8 "20 Oct 2015" "SunOS 5.12" "Administration Commands"
+.SH NAME
+memcached \- high performance memory object caching
+system
+.SH SYNOPSIS
+.LP
+.nf
+\fBmemcached [\fB-l\fR \fI<ip-addr>\fR] [\fB-d\fR] [\fB-u\fR \fI<username>\fR]
+[\fB-m\fR \fI<num>\fR] [\fB-c\fR \fI<num>\fR] [\fB-k\fR] [\fB-L \fR]
+[\fB-p\fR \fI<num>\fR] [\fB-U\fR \fI<num>\fR] [\fB-s\fR \fI<filename>\fR]
+[\fB-a\fR \fI<perms>\fR] [\fB-M\fR] [\fB-r\fR] [\fB-b\fR]
+[\fB-f\fR \fI<factor>\fR] [\fB-n\fR \fI<size>\fR] [\fB-h\fR] [\fB-v\fR] [\fB-vv\fR] [\fB-i\fR]
+[\fB-P\fR \fI<filename>\fR] [\fB-t\fR \fI<threads>\fR] [\fB-D\fR \fI<char>\fR]\fR
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+\fBmemcached\fR is a flexible memory object caching daemon
+designed to alleviate database load in dynamic web applications by storing
+objects in memory.  It is based on \fBlibevent\fR to scale to
+any size needed, and is specifically optimized to avoid swapping and always
+use non-blocking I/O. This man page documents briefly the \fBmemcached\fR memory
+object caching daemon.
+.SH OPTIONS
+.sp
+.LP
+The options supported by the \fBmemcached\fR command are
+described below.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-l\fR \fI<ip-addr>\fR\fR
+.ad
+.RS 17n
+.rt  
+Listen on \fI<ip-addr>\fR; default
+to \fBINADDR_ANY\fR. This is an important option to  consider
+as there is no other way to secure the installation. Binding to an  internal
+or fire walled network interface is suggested.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-d\fR\fR
+.ad
+.RS 17n
+.rt  
+Run memcached as a daemon.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-u\fR \fI<username>\fR\fR
+.ad
+.RS 17n
+.rt  
+Assume the identity of \fI<username>\fR only when run as a super user (root).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-m\fR \fI<num>\fR\fR
+.ad
+.RS 17n
+.rt  
+Use the maximum \fI<num>\fR MB memory for object storage; the default is 64 MB.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-c\fR \fI<num>\fR\fR
+.ad
+.RS 17n
+.rt  
+Use the specified number of maximum simultaneous connections;
+the default is 1024.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-k\fR\fR
+.ad
+.RS 17n
+.rt  
+Lock down all paged memory.
+.sp
+Use this option with caution with large caches. For information about
+the configuration suggestions, see the README and the memcached home page.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-L\fR\fR
+.ad
+.RS 17n
+.rt  
+Preallocate memory and use large memory pages if possible.
+.sp
+This option will preallocate cache memory for object storage.
+See description of \fB-m\fR option for a specification of the size of the memory.
+If supported by the platform, large memory pages will be allocated.
+This should reduce number of TLB misses and increase performance.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fI<num>\fR\fR
+.ad
+.RS 17n
+.rt  
+Listen on the TCP port \fI<num>\fR\&.
+The default port is 11211. 
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-U\fR \fI<num>\fR\fR
+.ad
+.RS 17n
+.rt  
+Listen on the UDP port \fI<num>\fR\&.
+The default is 0, meaning that the UDP protocol is disabled.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fI<filename>\fR\fR
+.ad
+.RS 17n
+.rt  
+Unix socket path to listen on (disables listening support for TCP and UDP).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-a\fR \fI<perms>\fR\fR
+.ad
+.RS 17n
+.rt  
+Permissions (in octal format) for Unix socket created with \fB-s\fR option.
+Default value is 0700.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-M\fR\fR
+.ad
+.RS 17n
+.rt  
+Disable automatic removal of items from the cache when out
+of memory. Additions will not be possible until adequate space is freed up.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-r\fR\fR
+.ad
+.RS 17n
+.rt  
+Raise the core file size limit to the maximum allowable.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-b\fR\fR
+.ad
+.RS 17n
+.rt  
+Run a managed instance.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-f\fR \fI<factor>\fR\fR
+.ad
+.RS 17n
+.rt  
+Use this option to specify \fI<factor>\fR as
+the multiplier for computing the sizes of memory chunks that items are stored
+in. A lower value may result in less wasted memory depending on the total
+amount of memory available and the distribution of item sizes. The default
+value is 1.25.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR \fI<size>\fR\fR
+.ad
+.RS 17n
+.rt  
+Allocate a minimum of \fI<size>\fR bytes
+for the item key, value, and flags. The default value is 48. If you have a
+lot of small keys and values, you can get a significant memory efficiency
+gain with a lower value. If you use a high chunk growth factor, that is \fB-f\fR option, you may want to increase the size to allow a bigger percentage
+of your items to fit in the most densely packed smallest chunks.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-h\fR\fR
+.ad
+.RS 17n
+.rt  
+Show the version of memcached and a summary of options.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-v\fR\fR
+.ad
+.RS 17n
+.rt  
+Be verbose during the event loop; print out errors and warnings.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-vv\fR\fR
+.ad
+.RS 17n
+.rt  
+Be even more verbose; same as \fB-v\fR option but
+also print client commands and  responses.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-i\fR\fR
+.ad
+.RS 17n
+.rt  
+Display \fBmemcached\fR and \fBlibevent\fR licenses.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-P\fR \fI<filename>\fR\fR
+.ad
+.RS 17n
+.rt  
+Print \fBpidfile\fR to the specified file.
+.LP
+Note - 
+.sp
+.RS 2
+This option can be used only when \fBmechached\fR is
+run as a daemon (\fB-d\fR option).
+.RE
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-t\fR \fI<threads>\fR\fR
+.ad
+.RS 17n
+.rt  
+Number of threads to use to process incoming requests. The default is 4.
+It is typically not useful to set this much higher than the number of CPU cores
+on the \fBmemcached\fR server.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-D\fR \fI<char>\fR\fR
+.ad
+.RS 17n
+.rt  
+Use the \fI<char>\fR as the delimiter
+between key prefixes and IDs. This is used for per-prefix statistics reporting.
+The default is \fB:\fR (colon). If this option is specified,
+statistics collection is turned on automatically; if not, then it can be turned
+on by sending the \fBstats detail on\fR command to the server.
+.RE
+
+.SH EXIT STATUS
+.sp
+.LP
+The following exit values are returned:
+.sp
+.ne 2
+.mk
+.na
+\fB\fB0\fR\fR
+.ad
+.RS 5n
+.rt  
+command executed successfully
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB1\fR\fR
+.ad
+.RS 5n
+.rt  
+error in executing the command
+.RE
+
+.SH SERVICE MANAGEMENT FACILITY
+.sp
+.LP
+\fBmemcached\fR package for Solaris (\fBservice/memcached\fR)
+includes files necessary to register with the Service Management Facility
+described in \fISMF(7)\fR. The following procedure describes the steps to automate
+the service management using memcached.
+.RS +4
+.TP
+1.
+Add other parameters to be passed to the memcached service instance.
+.sp
+example: specify the server to use 1024 MB of memory
+.sp
+.in +2
+.nf
+example% svccfg
+svc:> select memcached
+svc:/application/database/memcached> setprop memcached/options=("-m" "1024")
+svc:/application/database/memcached> quit
+example% svcadm refresh memcached
+.fi
+.in -2
+
+.LP
+Note - 
+.sp
+.RS 2
+The arguments cannot be passed as a single string because of a limitation in \fIsvccfg\fR.
+.RE
+.RE
+.RS +4
+.TP
+2.
+Enable memcached .
+.sp
+.in +2
+.nf
+example% svcadm enable memcached 
+.fi
+.in -2
+
+The state of the service instance changes to \fBonline\fR,
+and the memcached service instance must be started:
+.sp
+.in +2
+.nf
+example% svcs memcached
+STATE          STIME    FMRI
+online          1:19:15 svc:/application/database/memcached:default
+.fi
+.in -2
+.sp
+
+.RE
+.RS +4
+.TP
+3.
+To disable shutdown and automatic restart of memcached service instance,
+.sp
+.in +2
+.nf
+example% svcadm disable memcached
+.fi
+.in -2
+
+.RE
+.SH USER AUTHORIZATIONS
+.sp
+.LP
+You can use \fBRBAC(7)\fR to authorize otherwise non-privileged users to manage
+\fBmemcached\fR services.
+To let a user named \fBmyuser\fR change \fBmemcached\fR value properties and
+manage \fBmemcached\fR service states, add the following line to
+\fB/etc/user_attr\fR:
+.sp
+.in +2
+.nf
+myuser::::type=role;profiles=Memcached Administration,All
+.fi
+.in -2
+.sp
+.RE
+.SH PACKAGE CONTENTS
+.sp
+.LP
+The \fBmemcached\fR package consists of the memcached server and
+man pages for the server. 
+.sp
+.LP
+Client libraries can be made available by installing other packages.
+.sp
+.LP
+The memcached server is based on the memcached open-source software
+available from http://www.danga.com/memcached/\&.
+.SH SECURITY
+.sp
+.LP
+When the memcached server is started, it listens for network requests
+on a TCP port and/or a UDP port. It is important for the security of the network
+that you protect this port, for example, by blocking access to this port in
+a firewall. 
+.sp
+.LP
+The default TCP port number to use is 11211. 
+.sp
+.LP
+You may use the \fB-p\fR option to set another TCP port number.
+There is no default UDP port number. You can use the \fB-U\fR option
+to set a UDP port number.
+.sp
+.LP
+If you are running memcached on a server with multiple network interfaces,
+you can restrict vulnerability by binding memcached to a single interface
+by using the \fB-l\fR option.
+.LP
+Caution - 
+.sp
+.RS 2
+Note that \fBmemcached\fR was designed for speed
+and not for security. There is no authentication of requests that go in to
+the memcached servers, and communication is not encrypted. The network that
+your memcached servers and clients run within should be safe-guarded against
+network attacks.
+.RE
+.SH SEE ALSO
+.sp
+.LP
+\fBlibmemcached(3libmemcached)\fR
+.LP
+Additional documentation (FAQ) can be found at http://www.eu.socialtext.net/memcached/index.cgi\&.
+.SH NOTES
+.sp
+.LP
+LICENSE
+.sp
+.LP
+The \fBmemcached\fR daemon is copyright Danga Interactive
+and is distributed under  the BSD license. \fBmemcached\fR clients
+are licensed separately.

--- a/components/memcached/Solaris/memcached.xml	Fri Oct 23 05:42:31 2015 -0700
+++ b/components/memcached/Solaris/memcached.xml	Fri Oct 23 14:22:44 2015 -0700
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
 
  CDDL HEADER START
 
@@ -74,7 +74,7 @@
          <loctext xml:lang='C'>memcached 1.4.5</loctext>
       </common_name>
       <documentation>
-         <manpage title='memcached' section='1m' manpath='/usr/share/man' />
+         <manpage title='memcached' section='8' manpath='/usr/share/man' />
       </documentation>
     </template>
 

--- a/components/memcached/memcached.p5m	Fri Oct 23 05:42:31 2015 -0700
+++ b/components/memcached/memcached.p5m	Fri Oct 23 14:22:44 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -41,6 +41,6 @@
 file Solaris/memcached path=lib/svc/method/memcached
 file path=usr/include/memcached/protocol_binary.h
 file usr/lib/$(MACH64)/memcached path=usr/lib/memcached mode=0555
-file Solaris/memcached.1m path=usr/share/man/man1m/memcached.1m
+file Solaris/memcached.8 path=usr/share/man/man8/memcached.8
 #
 license memcached.license license=BSD

--- a/components/quagga/Solaris/README.Solaris	Fri Oct 23 05:42:31 2015 -0700
+++ b/components/quagga/Solaris/README.Solaris	Fri Oct 23 14:22:44 2015 -0700
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 #ident	"@(#)README.Solaris	1.2	11/01/03 SMI"
 
@@ -46,7 +46,7 @@
  - Provides header files, archive libraries and libtool files required for
    building code using the Quagga libraries. Note that these interfaces are
    External to Solaris and come without API stability guarantees. See also the
-   attributes (5) manual page.
+   attributes (7) manual page.
  
 SUNWquaggaS
 
@@ -68,7 +68,7 @@
 daemon start/stop scripts			/lib/svc/method 
 SMF manifests					/lib/svc/manifest/network/routing
 Quagga Info documentation			/usr/share/info
-Manual Pages					/usr/share/man/man1m
+Manual Pages					/usr/share/man/man8
 Libraries					/usr/lib
 Development headers				/usr/include/quagga
 
@@ -79,7 +79,7 @@
 Previously, the Zebra routing protocol suite was delivered as part of the
 SFW consolidation.  This has now been replaced with Quagga, and Zebra
 routing configuration can be migrated easily, either explicitly by running
-"routeadm -u" (see routeadm (1M)), or by rebooting the system. The
+"routeadm -u" (see routeadm (8)), or by rebooting the system. The
 appropriate configuration files for the daemons used will be migrated to
 Quagga, and the equivalent Quagga SMF services will be enabled. 
 
@@ -87,10 +87,10 @@
 Incompatibilities of Quagga  
 ============================
 
-You may use in.routed(1M) on other systems on your network, but you must not
+You may use in.routed(8) on other systems on your network, but you must not
 run in.routed or in.rdisc on the same system that is configured to run
 Quagga. Quagga is incompatible with the Solaris IP Multipathing
-(in.mpathd(1M)) feature.  Do not enable IPMP on a system running Quagga. If
+(in.mpathd(8)) feature.  Do not enable IPMP on a system running Quagga. If
 you have a machine set up with IPMP and wish to run Quagga on it, please
 unconfigure IPMP. See
 

--- a/components/quagga/Solaris/quagga.1m	Fri Oct 23 05:42:31 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-'\" te
-.\" Copyright (c) 2006, 2011, Oracle and/or its affiliates\&. All rights reserved\&.
-.TH quagga 1m "01 Aug 2006" "SunOS 5.11" "System Administration Commands"
-.SH "NAME"
-quagga - advanced routing protocol suite from www.quagga.net
-.SH "SYNOPSIS"
-.PP
-\fBQuagga\fR is an advanced routing software package that provides a suite of
-TCP/IP based routing protocols.
-.PP
-\fBQuagga\fR supports protocols such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3,
-BGP-4, and BGP-4+. This document is provided for informational purposes to
-help users configure quagga under Solaris specifically. Further
-documentation on quagga configuration in general is provided at
-http://www.quagga.net.
-.SH "DESCRIPTION"
-.PP
-\fBQuagga\fR consists of the following package:
-.sp
-.in +2
-.ie t \(bu
-.el o
-.mk
-.in +3
-.rt
-system/network/routing/quagga - Quagga root files
-.sp
-.in -3
-.in -2
-.PP
-More detailed \fBQuagga\fR documentation is available from
-http://www.quagga.net/docs, or in the GNU Info format \fBQuagga\fR documentation
-installed in /usr/share/info.
-.PP
-In Solaris, quagga daemons are managed by the following smf(5) services:
-.PP
-svc:/network/routing/zebra:quagga	zebra routing manager daemon
-.PP
-svc:/network/routing/rip:quagga	RIPv2 routing daemon
-.PP
-svc:/network/routing/ripng:quagga	RIPng routing daemon
-.PP
-svc:/network/routing/bgp:quagga	BGP routing daemon
-.PP
-svc:/network/routing/ospf:quagga	OSPF routing daemon
-.PP
-svc:/network/routing/ospf6:quagga	OSPF6 routing daemon
-.PP
-\fBQuagga\fR daemons can be configured either via the \fBsmf\fR(5) framework, or via routeadm(1M),
-the global dynamic routing management utility.
-.PP
-Note that quagga was built without the vtysh (unified vty shell) utility, as it depends on a package
-not currently distributed with Solaris.
-.PP
-.SH "COMMANDS"
-.PP
-By default, \fBin.routed\fR and \fBin.ripngd\fR, managed by the svc:/network/routing/route
-and svc:/network/routing/ripng services respectively, are configured as default 
-IPv4/IPv6 routing services. To disable these, either utilize \fBrouteadm\fR (1M) or 
-\fBsvcadm\fR (1M) as follows:
-.sp
-.nf
-\f(CW# routeadm -d route
-# routeadm -d ripng:default
-\fR
-.fi
-.sp
-disables in.routed and in.ripngd respectively using \fBrouteadm\fR (1M). 
-.sp
-.nf
-\f(CW# svcadm disable route:default
-# svcadm disable ripng:default
-\fR
-.fi
-.sp
-disables in.routed and in.ripngd respectively using smf(1). 
-.PP
-Note that these services must be disabled or their quagga counterparts
-(rip:quagga, ripng:quagga) will not run, since they services specify to the
-smf framework that they and their quagga counterparts cannot run
-simultaneously.
-.PP
-To enable quagga services, again either \fBrouteadm\fR(1M) or \fBsvcadm\fR(1M) can be used.
-Note that quagga services, like in.routed and in.ripngd, specify dependencies
-on ipv4(6)-routing(forwarding) services, so as with all smf(1) services, ensure the 
-appropriate dependencies are enabled or the services will not start.
-.PP
-For example,
-.sp
-.nf
-\f(CW# routeadm -e rip:quagga
-# routeadm -e ipv4-routing -u
-\fR
-.fi
-.sp
-enables quagga's RIPv2 daemon (the -u option above is required, as 
-global ip routing/forwarding settings are not applied to the system until next reboot
-unless the -u is issued).
-.PP
-To do the same via \fBsmf\fR(1),
-.sp
-.nf
-\f(CW# svcadm enable -r rip:quagga
-\fR
-.fi
-.sp
-The "-r" option recursively enables rip:quagga's dependencies, which include
-the ipv4-routing service.
-.PP
-The status of all routing daemon services can be displayed via \fBrouteadm\fR(1M),
-run without options, or, through smf(1), via the svcs(1) command.
-.PP
-Commandline arguments to the quagga daemons can be altered by
-modifying the routing/daemon-args property, again either via \fBrouteadm\fR(1M)
-or svccfg(1M):
-.sp
-.nf
-\f(CW# routeadm -m rip:quagga daemon-args="-s"
-\fR
-.fi
-.sp
-or
-.sp
-.nf
-\f(CW# svccfg -s rip:quagga setprop routing/daemon-args="-s"
-# svcadm refresh rip:quagga
-\fR
-.fi
-.sp
-The "refresh" is required to ensure the daemon re-reads its configuration.
-.SH "DIAGNOSTICS"
-.PP
-To see status of all routing services, run \fBrouteadm\fR(1M) without options.
-.SH "SEE ALSO"
-.PP
-\fBripngd\fR(1m), \fBisisd\fR(1m), \fBospfd\fR(1m), \fBospf6d\fR(1m), \fBbgpd\fR(1m), \fBzebra\fR(1m), \fBrouteadm\fR(1M),
-\fBsvcadm\fR(1M), svcs(1), svccfg(1M), smf(5)
-.SH "AUTHORS"
-See <http://www.quagga.net>, or the Info file for an  accurate  list of authors.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/quagga/Solaris/quagga.8	Fri Oct 23 14:22:44 2015 -0700
@@ -0,0 +1,139 @@
+'\" te
+.\" Copyright (c) 2006, 2015, Oracle and/or its affiliates\&. All rights reserved\&.
+.TH quagga 8 "20 Oct 2015" "SunOS 5.12" "System Administration Commands"
+.SH "NAME"
+quagga - advanced routing protocol suite from www.quagga.net
+.SH "SYNOPSIS"
+.PP
+\fBQuagga\fR is an advanced routing software package that provides a suite of
+TCP/IP based routing protocols.
+.PP
+\fBQuagga\fR supports protocols such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3,
+BGP-4, and BGP-4+. This document is provided for informational purposes to
+help users configure quagga under Solaris specifically. Further
+documentation on quagga configuration in general is provided at
+http://www.quagga.net.
+.SH "DESCRIPTION"
+.PP
+\fBQuagga\fR consists of the following package:
+.sp
+.in +2
+.ie t \(bu
+.el o
+.mk
+.in +3
+.rt
+system/network/routing/quagga - Quagga root files
+.sp
+.in -3
+.in -2
+.PP
+More detailed \fBQuagga\fR documentation is available from
+http://www.quagga.net/docs, or in the GNU Info format \fBQuagga\fR documentation
+installed in /usr/share/info.
+.PP
+In Solaris, quagga daemons are managed by the following smf(7) services:
+.PP
+svc:/network/routing/zebra:quagga	zebra routing manager daemon
+.PP
+svc:/network/routing/rip:quagga	RIPv2 routing daemon
+.PP
+svc:/network/routing/ripng:quagga	RIPng routing daemon
+.PP
+svc:/network/routing/bgp:quagga	BGP routing daemon
+.PP
+svc:/network/routing/ospf:quagga	OSPF routing daemon
+.PP
+svc:/network/routing/ospf6:quagga	OSPF6 routing daemon
+.PP
+\fBQuagga\fR daemons can be configured either via the \fBsmf\fR(7) framework, or via routeadm(8),
+the global dynamic routing management utility.
+.PP
+Note that quagga was built without the vtysh (unified vty shell) utility, as it depends on a package
+not currently distributed with Solaris.
+.PP
+.SH "COMMANDS"
+.PP
+By default, \fBin.routed\fR and \fBin.ripngd\fR, managed by the svc:/network/routing/route
+and svc:/network/routing/ripng services respectively, are configured as default 
+IPv4/IPv6 routing services. To disable these, either utilize \fBrouteadm\fR (8) or 
+\fBsvcadm\fR (8) as follows:
+.sp
+.nf
+\f(CW# routeadm -d route
+# routeadm -d ripng:default
+\fR
+.fi
+.sp
+disables in.routed and in.ripngd respectively using \fBrouteadm\fR (8). 
+.sp
+.nf
+\f(CW# svcadm disable route:default
+# svcadm disable ripng:default
+\fR
+.fi
+.sp
+disables in.routed and in.ripngd respectively using smf(7). 
+.PP
+Note that these services must be disabled or their quagga counterparts
+(rip:quagga, ripng:quagga) will not run, since they services specify to the
+smf framework that they and their quagga counterparts cannot run
+simultaneously.
+.PP
+To enable quagga services, again either \fBrouteadm\fR(8) or \fBsvcadm\fR(8) can be used.
+Note that quagga services, like in.routed and in.ripngd, specify dependencies
+on ipv4(6)-routing(forwarding) services, so as with all smf(7) services, ensure the 
+appropriate dependencies are enabled or the services will not start.
+.PP
+For example,
+.sp
+.nf
+\f(CW# routeadm -e rip:quagga
+# routeadm -e ipv4-routing -u
+\fR
+.fi
+.sp
+enables quagga's RIPv2 daemon (the -u option above is required, as 
+global ip routing/forwarding settings are not applied to the system until next reboot
+unless the -u is issued).
+.PP
+To do the same via \fBsmf\fR(7),
+.sp
+.nf
+\f(CW# svcadm enable -r rip:quagga
+\fR
+.fi
+.sp
+The "-r" option recursively enables rip:quagga's dependencies, which include
+the ipv4-routing service.
+.PP
+The status of all routing daemon services can be displayed via \fBrouteadm\fR(8),
+run without options, or, through smf(7), via the svcs(1) command.
+.PP
+Commandline arguments to the quagga daemons can be altered by
+modifying the routing/daemon-args property, again either via \fBrouteadm\fR(8)
+or svccfg(8):
+.sp
+.nf
+\f(CW# routeadm -m rip:quagga daemon-args="-s"
+\fR
+.fi
+.sp
+or
+.sp
+.nf
+\f(CW# svccfg -s rip:quagga setprop routing/daemon-args="-s"
+# svcadm refresh rip:quagga
+\fR
+.fi
+.sp
+The "refresh" is required to ensure the daemon re-reads its configuration.
+.SH "DIAGNOSTICS"
+.PP
+To see status of all routing services, run \fBrouteadm\fR(8) without options.
+.SH "SEE ALSO"
+.PP
+\fBripngd\fR(8), \fBisisd\fR(8), \fBospfd\fR(8), \fBospf6d\fR(8), \fBbgpd\fR(8), \fBzebra\fR(8), \fBrouteadm\fR(8),
+\fBsvcadm\fR(8), svcs(1), svccfg(8), smf(7)
+.SH "AUTHORS"
+See <http://www.quagga.net>, or the Info file for an  accurate  list of authors.

--- a/components/quagga/Solaris/quaggaadm.1m	Fri Oct 23 05:42:31 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-'\" te
-.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates\&. All rights reserved\&.
-.\" ident	"@(#)quaggaadm.1m	1.3	10/03/16 SMI"
-.TH quaggaadm 1M "02 Oct 2008" "" ""
-.SH "NAME"
-quaggaadm \- quagga routing daemon administration tool
-.SH "SYNOPSIS"
-.PP
-\fBquaggaadm\fR [-\fBe\fR] \fIzebra\fR|\fIripd\fR|\fIripngd\fR|\fIospfd\fR|\fIospf6d\fR|\fIbgpd\fR|\fIisisd\fR
-.SH "DESCRIPTION"
-.PP
-The \fBquaggaadm\fR command is provided as a simple wrapper to facilitate connection
-to the quagga daemons respective vty terminal telnet interfaces. \fBquaggaadm\fR simply telnets
-the appropriate vty port for the specified daemon on localhost, and from there the
-user can update configuration for that daemon. Note that if the vty is disabled
-for the given daemon, \fBquaggaadm\fR will prompt the user to request enable. Note
-that to complete this operation, the user will require solaris.smf.manage.routing
-and solaris.smf.modify.routing authorizations.
-.SH "OPTIONS"
-.PP
-The following command-line options are supported:
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\-e\fR\fR
-.ad
-.sp .6
-.in +4
-Automatically enable the vty for the specified daemon.
-.sp
-.sp 1
-.in -4
-.SH "EXIT STATUS"
-.PP
-The following exit values are returned:
-.sp
-.ne 2
-.mk
-.na
-\fB\fB0\fR\fR
-.ad
-.sp .6
-.in +4
-Successful completion.
-.sp
-.sp 1
-.in -4
-.sp
-.ne 2
-.mk
-.na
-\fB\fB!=0\fR\fR
-.ad
-.sp .6
-.in +4
-An error occurred while obtaining or modifying the system configuration.
-.sp
-.sp 1
-.in -4
-.SH "SEE ALSO"
-.PP
-\fBquagga\fR(1M), \fBattributes\fR(5), \fBrouteadm\fR(1M)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/quagga/Solaris/quaggaadm.8	Fri Oct 23 14:22:44 2015 -0700
@@ -0,0 +1,62 @@
+'\" te
+.\" Copyright (c) 2008, 2015, Oracle and/or its affiliates\&. All rights reserved\&.
+.TH quaggaadm 8 "20 Oct 2015" "" ""
+.SH "NAME"
+quaggaadm \- quagga routing daemon administration tool
+.SH "SYNOPSIS"
+.PP
+\fBquaggaadm\fR [-\fBe\fR] \fIzebra\fR|\fIripd\fR|\fIripngd\fR|\fIospfd\fR|\fIospf6d\fR|\fIbgpd\fR|\fIisisd\fR
+.SH "DESCRIPTION"
+.PP
+The \fBquaggaadm\fR command is provided as a simple wrapper to facilitate connection
+to the quagga daemons respective vty terminal telnet interfaces. \fBquaggaadm\fR simply telnets
+the appropriate vty port for the specified daemon on localhost, and from there the
+user can update configuration for that daemon. Note that if the vty is disabled
+for the given daemon, \fBquaggaadm\fR will prompt the user to request enable. Note
+that to complete this operation, the user will require solaris.smf.manage.routing
+and solaris.smf.modify.routing authorizations.
+.SH "OPTIONS"
+.PP
+The following command-line options are supported:
+.sp
+.ne 2
+.mk
+.na
+\fB\fB\-e\fR\fR
+.ad
+.sp .6
+.in +4
+Automatically enable the vty for the specified daemon.
+.sp
+.sp 1
+.in -4
+.SH "EXIT STATUS"
+.PP
+The following exit values are returned:
+.sp
+.ne 2
+.mk
+.na
+\fB\fB0\fR\fR
+.ad
+.sp .6
+.in +4
+Successful completion.
+.sp
+.sp 1
+.in -4
+.sp
+.ne 2
+.mk
+.na
+\fB\fB!=0\fR\fR
+.ad
+.sp .6
+.in +4
+An error occurred while obtaining or modifying the system configuration.
+.sp
+.sp 1
+.in -4
+.SH "SEE ALSO"
+.PP
+\fBquagga\fR(8), \fBattributes\fR(7), \fBrouteadm\fR(8)

--- a/components/quagga/quagga.p5m	Fri Oct 23 05:42:31 2015 -0700
+++ b/components/quagga/quagga.p5m	Fri Oct 23 14:22:44 2015 -0700
@@ -21,8 +21,6 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=(.+)/man/man1m/(.+).1m$ -> set action.hash %<1>/man/man8/%<2>.8 >
-<transform file -> edit path man/man8 man/man1m >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/system/network/routing/quagga@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -121,13 +119,13 @@
 link path=usr/sbin/zebraadm target=quaggaadm
 file path=usr/share/info/quagga.info
 file path=usr/share/info/quagga.info-1
-file path=usr/share/man/man1m/bgpd.1m
-file path=usr/share/man/man1m/isisd.1m
-file path=usr/share/man/man1m/ospf6d.1m
-file path=usr/share/man/man1m/ospfd.1m
-file path=usr/share/man/man1m/ripd.1m
-file path=usr/share/man/man1m/ripngd.1m
-file path=usr/share/man/man1m/zebra.1m
-file Solaris/quagga.1m path=usr/share/man/man8/quagga.1m
-file Solaris/quaggaadm.1m path=usr/share/man/man8/quaggaadm.1m
+file path=usr/share/man/man8/bgpd.8
+file path=usr/share/man/man8/isisd.8
+file path=usr/share/man/man8/ospf6d.8
+file path=usr/share/man/man8/ospfd.8
+file Solaris/quagga.8 path=usr/share/man/man8/quagga.8
+file Solaris/quaggaadm.8 path=usr/share/man/man8/quaggaadm.8
+file path=usr/share/man/man8/ripd.8
+file path=usr/share/man/man8/ripngd.8
+file path=usr/share/man/man8/zebra.8
 license quagga.license license=GPLv2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sudo/patches/05-normalize-man-pages.patch	Fri Oct 23 14:22:44 2015 -0700
@@ -0,0 +1,22 @@
+In Solaris 12, we will be normalizing man pages. See PSARC 2015/428.
+This means that what was section 1m, is now section 8 and what was
+section 4 is now section 5. But currently only for Solaris 12.
+
+This patch should eventually be sent upstream, but for that to happen
+it will need to be reworked into a form that will be acceptable for
+all versions of Solaris. Until then, we are just using this Solaris 12
+specific patch.
+
+--- sudo-1.8.9p5/configure.ac.orig	2015-10-20 07:25:44.363830767 -0700
++++ sudo-1.8.9p5/configure.ac	2015-10-20 07:26:11.354071075 -0700
+@@ -1640,8 +1640,8 @@
+ 		if test "$with_AFS" = "yes"; then
+ 		    AFS_LIBS="-lc -lucb"
+ 		fi
+-		: ${mansectsu='1m'}
+-		: ${mansectform='4'}
++		: ${mansectsu='8'}
++		: ${mansectform='5'}
+ 		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
+ 		AC_CHECK_FUNCS(priv_set, [PSMAN=1])
+ 		;;

--- a/components/sudo/sudo.p5m	Fri Oct 23 05:42:31 2015 -0700
+++ b/components/sudo/sudo.p5m	Fri Oct 23 14:22:44 2015 -0700
@@ -93,11 +93,11 @@
 file path=usr/share/locale/vi/LC_MESSAGES/sudoers.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/sudo.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/sudoers.mo
-file path=usr/share/man/man1m/sudo.1m
-file path=usr/share/man/man1m/sudo_plugin.1m
-link path=usr/share/man/man1m/sudoedit.1m target=sudo.1m
-file path=usr/share/man/man1m/sudoreplay.1m
-file path=usr/share/man/man1m/visudo.1m
-file path=usr/share/man/man4/sudoers.4
-file path=usr/share/man/man4/sudoers.ldap.4
+file path=usr/share/man/man5/sudoers.5
+file path=usr/share/man/man5/sudoers.ldap.5
+file path=usr/share/man/man8/sudo.8
+file path=usr/share/man/man8/sudo_plugin.8
+link path=usr/share/man/man8/sudoedit.1m target=sudo.8
+file path=usr/share/man/man8/sudoreplay.8
+file path=usr/share/man/man8/visudo.8
 license sudo.license license="ISC-like, BSD, zlib license"