--- a/src/man/packagemanager.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/packagemanager.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH packagemanager 1 "27 May 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH packagemanager 1 "21 May 2013" "SunOS 5.12" "User Commands"
.SH NAME
packagemanager \- GUI for the Image Packaging System
.SH SYNOPSIS
@@ -281,7 +281,7 @@
Package Manager online help
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
.SH NOTES
.sp
.LP
--- a/src/man/pkg.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkg.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkg 1 "19 Apr 2013" "SunOS 5.12" "User Commands"
+.TH pkg 1 "27 Aug 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkg \- Image Packaging System retrieval client
.SH SYNOPSIS
@@ -209,7 +209,7 @@
[--set-property \fIname_of_property\fR=\fIvalue\fR]
[--add-property-value \fIname_of_property\fR=\fIvalue_to_add\fR]
[--remove-property-value \fIname_of_property\fR=\fIvalue_to_remove\fR]
- [--unset-property \fIname_of_property_to_delete\fR]
+ [--unset-property \fIname_of_property_to_delete\fR]
[--proxy \fIproxy_to_use\fR] \fIpublisher\fR
.fi
@@ -319,10 +319,6 @@
.na
\fB\fB-R\fR \fIdir\fR\fR
.ad
-.br
-.na
-\fB\fB--image-dir\fR \fIdir\fR\fR
-.ad
.sp .6
.RS 4n
Operate on the image rooted at \fIdir\fR. If no directory was specified or determined based on environment, the default is /. See the "Environment Variables" section for more information.
@@ -715,7 +711,7 @@
.ad
.sp .6
.RS 4n
-List installed packages and the newest version of packages that are available for installation. Packages are considered to be available for installation if they are allowed by the installed incorporations and by the image's variants. If one or more patterns are specified, then the newest version matching the specified pattern and allowed by any installed incorporations and the image's variants is listed. Without \fB-a\fR, list only installed packages.
+List installed packages and list the newest version of packages that are not installed but could be installed in this image. Packages can be installed if they are allowed by the installed incorporations and by the image's variants. If one or more patterns are specified, then the newest version matching the specified pattern and allowed by any installed incorporations and the image's variants is listed. Without \fB-a\fR, list only installed packages.
.RE
.sp
@@ -759,7 +755,7 @@
.ad
.sp .6
.RS 4n
-Do not list any packages, but return failure if there are any fatal errors.
+Do not list any packages, but return failure if a fatal error occurs.
.RE
.sp
@@ -781,7 +777,7 @@
.ad
.sp .6
.RS 4n
-List only packages with newer versions available. This option cannot be used with \fB-g\fR.
+List installed packages that have newer versions available. This option cannot be used with \fB-g\fR.
.RE
.sp
@@ -812,7 +808,7 @@
.ne 2
.mk
.na
-\fB\fBpkg info\fR [\fB-lr\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--license\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg info\fR [\fB-lqr\fR] [\fB-g\fR \fIpath_or_uri\fR]... [\fB--license\fR] [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
@@ -858,7 +854,7 @@
.ad
.sp .6
.RS 4n
-Do not display any package information, but return failure if there are any fatal errors.
+Do not display any package information, but return failure if a fatal error occurs.
.RE
.sp
@@ -880,7 +876,7 @@
.ad
.sp .6
.RS 4n
-Display the license texts for the packages. This option can be combined with \fB-l\fR, \fB-q\f, or R\fB-r\fR. When all patterns match a known package and have licenses, the command will return success. If one or more patterns are unmatched or match packages that do not have licenses, the command will return failure.
+Display the license texts for the packages. This option can be combined with \fB-l\fR, \fB-q\fR, or \fB-r\fR. Return success if all \fIpkg_fmri_pattern\fR patterns match known packages and have licenses. Return failure if one or more patterns are unmatched or match packages that do not have licenses.
.RE
.RE
@@ -1095,7 +1091,7 @@
.ad
.sp .6
.RS 4n
-Search for matches to the \fIquery\fR, and display the results. See the description of \fIquery\fR below.
+Search for actions that match \fIquery\fR, and display the matching search index, action name, action value, and package name. See the description of \fIquery\fR below. Some searches might yield duplicate results.
.sp
.ne 2
.mk
@@ -1185,7 +1181,7 @@
.ad
.sp .6
.RS 4n
-Control the columns of the results. The \fB-o\fR option can be specified multiple times, or multiple attributes can be specified as the argument to one \fB-o\fR option by separating the attribute names with commas. In addition to the pseudo attributes outlined above, the following attributes are defined for search results:
+Control the columns of the results. The \fB-o\fR option can be specified multiple times, or multiple attributes can be specified as the argument to one \fB-o\fR option by separating the attribute names with commas. In addition to the pseudo attributes outlined above, the following attributes are defined for search results. These attributes help show why a particular result was a match:
.sp
.ne 2
.mk
@@ -1229,11 +1225,13 @@
.ad
.sp .6
.RS 4n
-By default, \fIquery\fR is interpreted as a series of terms to be matched exactly. The \fB?\fR and \fB*\fR characters can be used as \fBglob\fR(3C)\(hystyle wildcards, allowing more flexible query matches.
-.sp
-In addition to simple token matching and wildcard search, a more complicated query language is supported. Phrases can be searched for by using single or double quotation marks (\fB\&'\fR or \fB"\fR). Be sure to take your shell into account so that \fBpkg\fR actually sees the \fB\&'\fR or \fB"\fR.
-.sp
-Boolean search using AND and OR is supported.
+By default, \fIquery\fR is interpreted as a series of terms to be matched exactly and multiple terms are ANDed.
+.sp
+AND and OR are supported.
+.sp
+The \fB?\fR and \fB *\fR characters can be used as \fBglob\fR(3C)\(hystyle wildcards, allowing more flexible query matches.
+.sp
+In addition to simple token matching and wildcard search, a more complicated query language is supported. Phrases can be searched for by using single or double quotation marks (\fB'\fR or \fB"\fR). Be sure to take your shell into account so that \fBpkg\fR actually sees the \fB'\fR or \fB"\fR.
.sp
Which tokens are indexed is action-dependent, but can include content hashes and path names. For information about actions and their attributes, see "Actions" in the \fBpkg\fR(5) man page. See also the list of pseudo attribute names in \fBpkg contents\fR and \fB-o\fR above.
.sp
@@ -1347,7 +1345,7 @@
.ad
.sp .6
.RS 4n
-Print nothing, but return failure if there are any fatal errors.
+Suppress progress messages and all other output during the requested operation.
.RE
.sp
@@ -1430,7 +1428,7 @@
.ad
.sp .6
.RS 4n
-Revert all files tagged with \fItag-name\fR, and remove any unpackaged files or directories that are under directories with this tag and that match \fIpattern\fR. See the description of the \fBrevert-tag\fR attribute in "File Actions" and "Directory Actions" in the \fBpkg\fR(5) man page for more information about \fItag-name\fR and \fIpattern\fR.
+Revert all files tagged with \fItag-name\fR, and remove any unpackaged files or directories that are under directories with this tag and that match \fIpattern\fR. See the description of the \fBrevert-tag\fR attribute in "File Actions" and "Directory Actions" in the \fBpkg\fR(5) man page for more information about \fBtag-name\fR and \fIpattern\fR.
.RE
.sp
@@ -1482,7 +1480,7 @@
.ne 2
.mk
.na
-\fB\fB-F\fR\fR
+\fB\fB-F\fR \fIformat\fR\fR
.ad
.sp .6
.RS 4n
@@ -1596,7 +1594,7 @@
.ne 2
.mk
.na
-\fB\fB-F\fR\fR
+\fB\fB-F\fR \fIformat\fR\fR
.ad
.sp .6
.RS 4n
@@ -1622,7 +1620,7 @@
.ad
.sp .6
.RS 4n
-Display all variants explicitly set in the image and all variants that are listed in installed packages. This option cannot be combined with \fB-i\fR.
+Display all variants explicitly set in the image and all variants that are listed in installed packages. The \fB-a\fR option cannot be combined with the \fB-i\fR option.
.RE
.sp
@@ -1633,7 +1631,7 @@
.ad
.sp .6
.RS 4n
-Display all variants that are listed in installed packages. This option cannot be combined with \fB-a\fR.
+Display all variants that are listed in installed packages. The \fB-i\fR option cannot be combined with the \fB-a\fR option.
.RE
.sp
@@ -1644,7 +1642,7 @@
.ad
.sp .6
.RS 4n
-Display the possible variant values that can be set for installed packages. This option can be combined with \fB-a\fR and \fB-i\fR.
+Display the possible variant values that can be set for installed packages. The \fB-v\fR option can be combined with the \fB-a\fR or \fB-i\fR option.
.RE
.RE
@@ -1672,7 +1670,7 @@
.ad
.sp .6
.RS 4n
-Display the current values and source of all facets that have been explicitly set in this image by using the \fBpkg change-facet\fR command or inherited from a parent image. See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about facets.
+Display the current values and source of all facets that have been explicitly set in this image by using the \fBpkg change-facet\fR command or that have been inherited from a parent image . See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about facets.
.sp
.ne 2
.mk
@@ -1688,7 +1686,7 @@
.ne 2
.mk
.na
-\fB\fB-F\fR\fR
+\fB\fB-F\fR \fIformat\fR\fR
.ad
.sp .6
.RS 4n
@@ -1714,7 +1712,7 @@
.ad
.sp .6
.RS 4n
-Display all facets explicitly set in the image and all facets that are listed in installed packages. This option cannot be combined with \fB-i\fR.
+Display all facets explicitly set in the image and all facets that are listed in installed packages. The \fB-a\fR option cannot be combined with the \fB-i\fR option.
.RE
.sp
@@ -1725,7 +1723,7 @@
.ad
.sp .6
.RS 4n
-Display all facets that are listed in installed packages. This option cannot be combined with \fB-a\fR.
+Display all facets that are listed in installed packages. The \fB-i\fR option cannot be combined with the \fB-a\fR option.
.RE
.sp
@@ -1986,6 +1984,17 @@
.ne 2
.mk
.na
+\fB\fB-F\fR \fIformat\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify an alternative output format. Currently, only \fBtsv\fR (Tab Separated Values) is valid.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fB-H\fR\fR
.ad
.sp .6
@@ -2015,17 +2024,6 @@
Display only enabled publishers.
.RE
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-F\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify an alternative output format. Currently, only \fBtsv\fR (Tab Separated Values) is valid.
-.RE
-
.RE
.sp
@@ -2104,7 +2102,7 @@
.ad
.sp .6
.RS 4n
-Add the specified certificate as a CA certificate that is trusted. The hashes of the PEM representation of the user-approved CA certificates are listed in the detailed output of the \fBpkg publisher\fR command.
+For verifying signed packages, add the specified certificate as a CA certificate that is trusted. The hashes of the PEM representation of the user-approved CA certificates are listed in the detailed output of the \fBpkg publisher\fR command.
.RE
.sp
@@ -2115,7 +2113,7 @@
.ad
.sp .6
.RS 4n
-Treat the certificate with the given hash of its PEM representation as revoked. The hashes of the user-revoked CA certificates are listed in the detailed output of the \fBpkg publisher\fR command.
+For verifying signed packages, treat the certificate with the given hash of its PEM representation as revoked. The hashes of the user-revoked CA certificates are listed in the detailed output of the \fBpkg publisher\fR command.
.RE
.sp
@@ -2126,7 +2124,7 @@
.ad
.sp .6
.RS 4n
-Remove the certificate with the given hash from the list of approved certificates and the list of revoked certificates.
+For verifying signed packages, remove the certificate with the given hash from the list of approved certificates and the list of revoked certificates.
.RE
.sp
@@ -2315,7 +2313,9 @@
.ad
.sp .6
.RS 4n
-Use the specified web proxy URI to retrieve content for the specified origin (\fB-g\fR) or mirror (\fB-m\fR). The proxy value is stored as part of the publisher configuration. At run time, \fB$http_proxy\fR or related environment variables override this proxy setting. See the \fBcurl\fR(1) man page for the list of accepted environment variable names.
+Use the specified proxy URI to retrieve content for the specified origin (\fB-g\fR) or mirror (\fB-m\fR). The proxy value is stored as part of the publisher configuration, which means the system repository used by child images is automatically updated. This option cannot be used to set an authenticated proxy. The \fIproxy_to_use\fR value cannot have the form \fBprotocol://user:password@host\fR.
+.sp
+At run time, \fBhttp_proxy\fR or related environment variables override this proxy setting. See the "Environment" section of the \fBcurl\fR(1) man page for the list of accepted environment variable names. If you use an environment variable to set the proxy URI, you must also set the appropriate proxy property of the \fBsvc:/application/pkg/system-repository\fR SMF service to the same value. See "Specifying a Proxy" in \fIAdding and Updating Software in Oracle Solaris 11.2\fR.
.RE
.RE
@@ -2896,7 +2896,7 @@
.ad
.sp .6
.RS 4n
-(string) Determine what checks will be performed on manifests when installing, updating, modifying, or verifying packages in the image. The final policy applied to a package depends on the combination of image policy and publisher policy. The combination will be at least as strict as the stricter of the two policies taken individually. By default, the package client does not check whether certificates have been revoked. To enable those checks, which might require the client to contact external web sites, set the \fBcheck-certificate-revocation\fR image property to \fBTrue\fR. The following values are allowed:
+(string) Determine what checks will be performed on manifests when installing, updating, modifying, or verifying packages in the image. The final policy applied to a package depends on the combination of image policy and publisher policy. The combination will be at least as strict as the stricter of the two policies taken individually. By default, the package client does not check whether certificates have been revoked. To enable those checks, which might require the client to contact external Internet sites, set the \fBcheck-certificate-revocation\fR image property to \fBTrue\fR. The following values are allowed:
.sp
.ne 2
.mk
@@ -3585,7 +3585,7 @@
.ad
.sp .6
.RS 4n
-Seconds below the \fBlowspeed\fR limit (1024 bytes/sec) during transport operations before the client aborts the operation. A value of 0 means do not abort the operation.
+Seconds below the \fBlowspeed\fR limit (1024 bytes/second) during transport operations before the client aborts the operation. A value of 0 means do not abort the operation.
.sp
Default value: 30
.RE
@@ -3834,10 +3834,10 @@
.SH SEE ALSO
.sp
.LP
-\fBpkgsend\fR(1), \fBpkg.depotd\fR(1M), \fBglob\fR(3C), \fBpkg\fR(5), \fBbeadm\fR(1M)
+\fBpkgsend\fR(1), \fBbeadm\fR(1M), \fBpkg.depotd\fR(1M), \fBpkg.sysrepo\fR(1M), \fBglob\fR(3C), \fBpkg\fR(5)
.sp
.LP
-\fIAdding and Updating Oracle Solaris 11.1 Software Packages\fR
+\fIAdding and Updating Software in Oracle Solaris 11.2\fR
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkg.5 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkg.5 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkg 5 "1 Mar 2013" "SunOS 5.12" "Standards, Environments, and Macros"
+.TH pkg 5 "07 Aug 2013" "SunOS 5.12" "Standards, Environments, and Macros"
.SH NAME
pkg \- Image Packaging System
.SH DESCRIPTION
@@ -90,7 +90,7 @@
.ad
.RS 9n
.rt
-The file system path where the file is installed. This is a \fBfile\fR action's key attribute.
+The file system path where the file is installed. This is a \fBfile\fR action's key attribute.
.RE
.sp
@@ -101,7 +101,7 @@
.ad
.RS 9n
.rt
-The access permissions (in numeric form) of the file. These are simple permissions only, not ACLs.
+The access permissions (in numeric form) of the file. These are simple permissions only, not ACLs.
.RE
.sp
@@ -112,7 +112,7 @@
.ad
.RS 9n
.rt
-The name of the user that owns the file.
+The name of the user that owns the file.
.RE
.sp
@@ -123,7 +123,7 @@
.ad
.RS 9n
.rt
-The name of the group that owns the file.
+The name of the group that owns the file.
.RE
.sp
@@ -131,7 +131,7 @@
The payload is a positional attribute in that it is not named. It is the first word after the action name. In a published manifest, it is the \fBSHA-1\fR hash of the file contents. If present in a manifest that has yet to be published, it represents the path where the payload can be found. See \fBpkgsend\fR(1). The hash attribute can be used instead of the positional attribute, should the value include an equals sign. Both can be used in the same action. However, the hashes must be identical.
.sp
.LP
-Other attributes include:
+The \fBpreserve\fR and \fBoverlay\fR attributes affect whether and how a \fBfile\fR action is installed.
.sp
.ne 2
.mk
@@ -140,15 +140,101 @@
.ad
.sp .6
.RS 4n
-This specifies that the file's contents should not be overwritten on upgrade if the contents are determined to have changed since the file was installed or last upgraded. On initial installs, if an existing file is found, the file is salvaged (stored in \fB/var/pkg/lost+found\fR).
+Specifies when and how files are preserved during package operations.
+.sp
+When a package is initially installed, if a file delivered by the package has a \fBpreserve\fR attribute defined with any value and the file already exists in the image, the existing file is stored in \fB/var/pkg/lost+found\fR and the packaged file is installed.
.sp
-If the value of \fBpreserve\fR is \fBrenameold\fR, then the existing file is renamed with the extension \fB\&.old\fR, and the new file is put in its place.
+When a package is initially installed, if a file delivered by the package has a \fBpreserve\fR attribute defined and the file does not already exist in the image, whether that file is installed depends on the value of the \fBpreserve\fR attribute:
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the value of \fBpreserve\fR is \fBlegacy\fR, the packaged file is not installed.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the value of \fBpreserve\fR is not \fBlegacy\fR, the packaged file is installed.
+.RE
+When a package is downgraded, if a file delivered by the downgraded version of the package has a \fBpreserve\fR attribute defined with any value and all of the following conditions are true, the file that currently exists in the image is renamed with the extension \fB\&.update\fR, and the file from the downgraded package is installed.
+.RS +4
+.TP
+.ie t \(bu
+.el o
+The file exists in the image.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+The content of the file delivered by the downgraded version of the package is different from the content of the file delivered by the currently installed version of the package.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+The content of the file delivered by the downgraded version of the package is different from the content of the file that exists in the image.
+.RE
+If any of the above conditions is not true, the file is treated the same as if the package is being upgraded, rather than downgraded.
+.sp
+When a package is upgraded, if a \fBfile\fR action delivered by the upgraded version of the package has a \fBpreserve\fR attribute defined with any value and the \fBfile\fR action is the same as the \fBfile\fR action delivered by the currently installed version of the package, the file is not installed, and the file that exists in the image is not modified. Any modifications made since the previous version was installed are preserved.
.sp
-If the value of \fBpreserve\fR is \fBrenamenew\fR, then the existing file is left alone, and the new file is installed with the extension \fB\&.new\fR.
-.sp
-If the value of \fBpreserve\fR is \fBlegacy\fR, then this file is not installed for initial package installs. On upgrades, any existing file is renamed with the extension \fB\&.legacy\fR, and then the new file is put in its place.
-.sp
-If the value of \fBpreserve\fR is \fBtrue\fR (or a value not listed above, such as \fBstrawberry\fR), then the existing file is left alone, and the new file is not installed.
+When a package is upgraded, if a \fBfile\fR action delivered by the upgraded version of the package has a \fBpreserve\fR attribute defined and the \fBfile\fR action is new or is different from the \fBfile\fR action delivered by the currently installed version of the package, the upgrade is done in the following way:
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file does not exist in the image, the new file is installed.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package exists in the image, did not exist in the currently installed version of the package, and was not renamed or moved by using the \fBoriginal_name\fR attribute (see below), then the existing file is stored in \fB/var/pkg/lost+found\fR and the file delivered by the upgraded version of the package is installed.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package exists in the image and has different content from the file delivered by the currently installed version of the package, the upgrade is done according to the value of the \fBpreserve\fR attribute:
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package has a \fBpreserve\fR value of \fBrenameold\fR, the existing file is renamed with the extension \fB\&.old\fR, and the new file is installed with updated permissions and timestamp (if present). See the \fBtimestamp\fR attribute description below.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package has a \fBpreserve\fR value of \fBrenamenew\fR, the new file is installed with the extension \fB\&.new\fR and the existing file is not modified.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package has a \fBpreserve\fR value of \fBtrue\fR, the new file is not installed, but the permissions and timestamp (if present) are reset on the existing file.
+.RE
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package exists in the image, has the same content as the file delivered by the currently installed version of the package, and has a \fBpreserve\fR value of either \fBrenameold\fR or \fBrenamenew\fR, the existing file is replaced by the file delivered by the upgraded version of the package, including replacing permissions and timestamp (if present).
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package exists in the image, has a \fBpreserve\fR value of \fBlegacy\fR in the upgraded package, and has a different \fBpreserve\fR value in the currently installed version of the package, the existing file is renamed with the extension \fB\&.legacy\fR, and the new file is installed with updated permissions and timestamp (if present).
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+If the file delivered by the upgraded version of the package exists in the image and has a \fBpreserve\fR value of \fBlegacy\fR in both the upgraded package and the currently installed version of the package, the permissions and timestamp (if present) are reset on the existing file.
+.RE
.RE
.sp
@@ -159,18 +245,39 @@
.ad
.sp .6
.RS 4n
-This specifies whether the action allows other packages to deliver a file at the same location or whether it delivers a file intended to overlay another. This functionality is intended for use with configuration files that do not participate in any self-assembly (for example, \fB/etc/motd\fR) and that can be safely overwritten.
+Specifies whether the action allows other packages to deliver a file at the same location or whether it delivers a file intended to overlay another file. This functionality is intended for use with configuration files that do not participate in any self-assembly (for example, \fB/etc/motd\fR) and that can be safely overwritten.
.sp
If \fBoverlay\fR is not specified, multiple packages cannot deliver files to the same location.
.sp
-If the value of \fBoverlay\fR is \fBallow\fR, one other package is allowed to deliver a file to the same location. This value has no effect unless the \fBpreserve\fR attribute is also set.
+The \fBoverlay\fR attribute can have one of the following values:
.sp
-If the value of \fBoverlay\fR is \fBtrue\fR, the file delivered by the action overwrites any other action that has specified \fBallow\fR. Changes to the installed file are preserved based on the value of the \fBpreserve\fR attribute of the overlaying file. On removal, the contents of the file are preserved if the action being overlaid is still installed, regardless of whether the \fBpreserve\fR attribute was specified. Only one action can overlay another, and the \fBmode\fR, \fBowner\fR, and \fBgroup\fR attributes must match.
+.ne 2
+.mk
+.na
+\fB\fBallow\fR\fR
+.ad
+.RS 9n
+.rt
+One other package is allowed to deliver a file to the same location. This value has no effect unless the \fBpreserve\fR attribute is also set.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBtrue\fR\fR
+.ad
+.RS 9n
+.rt
+The file delivered by the action overwrites any other action that has specified \fBallow\fR.
+.RE
+
+Changes to the installed file are preserved based on the value of the \fBpreserve\fR attribute of the overlaying file. On removal, the contents of the file are preserved if the action being overlaid is still installed, regardless of whether the \fBpreserve\fR attribute was specified. Only one action can overlay another, and the \fBmode\fR, \fBowner\fR, and \fBgroup\fR attributes must match.
.RE
.sp
.LP
-Files can also be "tasted," and depending on the flavor, can have additional attributes. For ELF files, the following attributes are recognized:
+The following attributes are recognized for ELF files:
.sp
.ne 2
.mk
@@ -205,6 +312,9 @@
.RE
.sp
+.LP
+The following additional attributes are recognized for \fBfile\fR actions:
+.sp
.ne 2
.mk
.na
@@ -239,6 +349,28 @@
The \fBrevert-tag\fR attribute can also be specified at the directory level. See "Directory Actions" below.
.RE
+.sp
+.ne 2
+.mk
+.na
+\fB\fBtimestamp\fR\fR
+.ad
+.sp .6
+.RS 4n
+This attribute is used to set the access and modification time on the file. The \fBtimestamp\fR attribute value must be expressed in UTC in ISO-8601 format, omitting the colons and hyphens.
+.sp
+The \fBtimestamp\fR attribute is essential when packaging \fB\&.pyc\fR or \fB\&.pyo\fR files for Python. The related \fB\&.py\fR file for the \fB\&.pyc\fR or \fB\&.pyo\fR files must be marked with the timestamp embedded within those files, as shown in the following example:
+.sp
+.in +2
+.nf
+file path=usr/lib/python2.6/vendor-packages/pkg/__init__.pyc ...
+file path=usr/lib/python2.6/vendor-packages/pkg/__init__.py \e
+ timestamp=20130311T221521Z ...
+.fi
+.in -2
+
+.RE
+
.SS "Directory Actions"
.sp
.LP
@@ -255,6 +387,8 @@
.sp .6
.RS 4n
This attribute is used to identify unpackaged files that should be removed as a set. See "File Actions" above for a description of how to specify this attribute for \fBfile\fR actions. For directories, the value of the \fBrevert-tag\fR attribute is \fItagname\fR\fB=\fR\fIpattern\fR. Multiple \fBrevert-tag\fR attributes can be specified for a single \fBdir\fR action. When \fBpkg revert\fR is invoked with a matching \fItagname\fR, any unpackaged files or directories under this \fBdir\fR directory that match \fIpattern\fR (using shell globbing characters) are removed. See the \fBpkg\fR(1) man page for information about the \fBpkg revert\fR command.
+.sp
+The \fBrevert-tag\fR attribute can also be specified at the directory level. See "Directory Actions" below.
.RE
.sp
@@ -547,7 +681,7 @@
.ad
.sp .6
.RS 4n
-The dependency must, if present, be at the specified value or better on the image to be modified prior to installation. If the value of the \fBroot-image\fR attribute is \fBtrue\fR, the dependency must be present on the image rooted at / in order to install this package. If the fmri also starts with pkg:/feature/firmware/, the remainder of the name is treated as a command in /usr/lib/fwenum that evaluates the firmware dependency. See the package developer's guide for details.
+Prior to installation of this package, the dependency target must, if present, be at the specified value or greater on the image to be modified. If the value of the \fBroot-image\fR attribute is \fBtrue\fR, the target must be present on the image rooted at / in order to install this package. If the value of the \fBroot-image\fR attribute is \fBtrue\fR and the value of the \fBfmri\fR attribute starts with \fBpkg:/feature/firmware/\fR, the remainder of the \fBfmri\fR value is treated as a command in \fB/usr/lib/fwenum\fR that evaluates the firmware dependency. See \fIPackaging and Delivering Software With the Image Packaging System in Oracle Solaris 11.2\fR for examples.
.RE
.sp
@@ -902,7 +1036,7 @@
The \fBuser\fR action defines a UNIX user as defined in \fB/etc/passwd\fR, \fB/etc/shadow\fR, \fB/etc/group\fR, and \fB/etc/ftpd/ftpusers\fR files. Entries are added to the appropriate files for users defined with this \fBuser\fR action.
.sp
.LP
-The \fBuser\fR action is intended to define a user for a daemon or other software to use. Do not use the \fBuser\fR action to define administrative or interactive accounts.
+The \fBuser\fR action is intended to define a user for a daemon or other software to use. Do not use the \fBuser\fR action to define administrative or interactive accounts.
.sp
.LP
The following attributes are recognized:
@@ -1200,7 +1334,7 @@
Facets are treated as boolean values by package clients: Facets can be set only to \fBtrue\fR (enabled) or \fBfalse\fR (disabled) in the image. By default, all facets are considered to be set to \fBtrue\fR in the image.
.sp
.LP
-Facets can either be set locally within an image or inherited from a parent image. Inherited facets are evaluated before, and hence take priority over, any local facets. If the same exact facet is both inherited and set locally, the inherited facet value masks the local value. Facet changes made via \fBpkg change-facet\fR will only affect local facets.
+Facets can be either set locally within an image or inherited from a parent image. For example, a non-global zone can inherit a facet from the global zone. Inherited facets are evaluated before, and take priority over, any locally set facets. If the same facet is both inherited and locally set, the inherited facet value masks the locally set value. Facet changes made by using the \fBpkg change-facet\fR command only affect locally set facets.
.sp
.LP
The value of a facet tag on an action can be set to \fBall\fR or \fBtrue\fR to control how clients filter faceted actions. All values other than \fBall\fR or \fBtrue\fR have undefined behavior. See below for a description of the conditions that must exist in the image to install an action that has facet tags.
@@ -1241,7 +1375,7 @@
file group=sys mode=0644 overlay=allow owner=root \e
path=etc/motd pkg.csize=68 pkg.size=48 preserve=true \e
- variant.debug.osnet=false
+ variant.debug.osnet=false
.fi
.in -2
@@ -1403,13 +1537,13 @@
\fBpkg\fR(1), \fBpkgsend\fR(1), \fBpkg.depotd\fR(1M), \fBpkg.sysrepo\fR(1M), \fBsvcs\fR(1), \fBsvcadm\fR(1M)
.sp
.LP
-\fIAdding and Updating Oracle Solaris 11.1 Software Packages\fR
+\fIAdding and Updating Software in Oracle Solaris 11.2\fR
.sp
.LP
-\fICopying and Creating Oracle Solaris 11.1 Package Repositories\fR
+\fICopying and Creating Package Repositories in Oracle Solaris 11.2\fR
.sp
.LP
-\fIPackaging and Delivering Software With the Oracle Solaris 11 Image Packaging System\fR
+\fIPackaging and Delivering Software With the Image Packaging System in Oracle Solaris 11.2\fR
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkg.depot-config.1m Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkg.depot-config.1m Tue Sep 17 09:39:41 2013 -0700
@@ -327,7 +327,7 @@
\fBsvcprop\fR(1), \fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsvccfg\fR(1M), \fBpkg.depotd\fR(1M), \fBpkg\fR(5)
.sp
.LP
-\fICopying and Creating Oracle Solaris 11.1 Package Repositories\fR
+\fICopying and Creating Package Repositories in Oracle Solaris 11.2\fR
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkg.depotd.1m Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkg.depotd.1m Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkg.depotd 1M "5 Jun 2012" "SunOS 5.12" "System Administration Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkg.depotd 1M "21 May 2013" "SunOS 5.12" "System Administration Commands"
.SH NAME
pkg.depotd \- Image Packaging System depot server
.SH SYNOPSIS
@@ -790,7 +790,10 @@
\fBdns-sd\fR(1M), \fBmdnsd\fR(1M), \fBpkg\fR(1), \fBpkgrepo\fR(1), \fBpkgsend\fR(1), \fBsyslogd\fR(1M), \fBsmf\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fICopying and Creating Package Repositories in Oracle Solaris 11.2\fR
+.sp
+.LP
+\fBhttps://java.net/projects/ips/pages/Home\fR
.SH NOTES
.sp
.LP
--- a/src/man/pkg.sysrepo.1m Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkg.sysrepo.1m Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkg.sysrepo 1M "27 May 2012" "SunOS 5.12" "System Administration Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkg.sysrepo 1M "21 May 2013" "SunOS 5.12" "System Administration Commands"
.SH NAME
pkg.sysrepo \- Image Packaging System system repository configuration
.SH SYNOPSIS
@@ -168,4 +168,4 @@
\fBpkg\fR(1), \fBpkg.depotd\fR(1M), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgdepend.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgdepend.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgdepend 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
+.TH pkgdepend 1 "12 Jul 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgdepend \- Image Packaging System dependency analyzer
.SH SYNOPSIS
@@ -115,10 +115,6 @@
.na
\fB\fB-R\fR \fIdir\fR\fR
.ad
-.br
-.na
-\fB\fB--image-dir\fR \fIdir\fR\fR
-.ad
.sp .6
.RS 4n
Operate on the image rooted at \fIdir\fR. If no directory was specified or determined based on environment, the default is /. See the "Environment Variables" section for more information.
@@ -420,12 +416,12 @@
dir path=opt mode=0755 group=sys owner=root
dir path=opt/python mode=0755 group=sys owner=root
dir path=opt/python/foo mode=0755 group=sys owner=root
-file NOHASH path=opt/python/__init__.py mode=0644 group=sys owner=root
-file NOHASH path=opt/python/foo/__init__.py mode=0644 group=sys owner=root
+file path=opt/python/__init__.py mode=0644 group=sys owner=root
+file path=opt/python/foo/__init__.py mode=0644 group=sys owner=root
#
# Add runpath and bypass-generate attributes:
#
-file NOHASH path=opt/python/foo/file.py mode=0644 group=sys owner=root \e
+file path=opt/python/foo/file.py mode=0644 group=sys owner=root \e
pkg.depend.bypass-generate=.*/test.py.* \e
pkg.depend.bypass-generate=.*/testmodule.so \e
pkg.depend.bypass-generate=.*/test.so \e
@@ -522,4 +518,4 @@
\fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgdiff.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgdiff.1 Tue Sep 17 09:39:41 2013 -0700
@@ -8,7 +8,7 @@
.nf
/usr/bin/pkgdiff [-i \fIattribute\fR]... [-o \fIattribute\fR]
[-t \fIaction_name\fR[,\fIaction_name\fR]...]...
- [-v \fIname\fR=\fIvalue\fR]... (\fIfile1\fR | -) (\fIfile2\fR | -)
+ [-v \fIname\fR=\fIvalue\fR]... (\fIfile1\fR | -) (\fIfile2\fR | -)
.fi
.SH DESCRIPTION
@@ -215,4 +215,4 @@
\fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgfmt.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgfmt.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkgfmt 1 "27 May 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkgfmt 1 "21 May 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgfmt \- format a package manifest
.SH SYNOPSIS
@@ -144,4 +144,4 @@
\fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkglint.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkglint.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,12 +1,12 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkglint 1 "27 May 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkglint 1 "02 Apr 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkglint \- Image Packaging System package lint
.SH SYNOPSIS
.LP
.nf
-/usr/bin/pkglint [-c \fIcache_dir\fR] [-r \fIrepo_uri\fR] [-p \fIregexp\fR]
+/usr/bin/pkglint [-c \fIcache_dir\fR] [-r \fIrepo_uri\fR]... [-p \fIregexp\fR]
[-f \fIconfig_file\fR] [-b \fIbuild_no\fR] [-v]
[-l \fIlint_uri\fR] | \fImanifest\fR ...
.fi
@@ -140,7 +140,7 @@
.ad
.sp .6
.RS 4n
-Specify a URI representing the location of the reference repository. If you specify \fB-r\fR, then you must also specify \fB-c\fR.
+Specify a URI representing the location of the reference repository. If you specify \fB-r\fR, then you must also specify \fB-c\fR. The \fB-r\fR option can be specified multiple times.
.RE
.sp
@@ -392,4 +392,4 @@
\fBpkg\fR(1), \fBpkg.depotd\fR(1M), \fBpkgsend\fR(1), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgmerge.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgmerge.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgmerge 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
+.TH pkgmerge 1 "20 May 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgmerge \- Image Packaging System package merging utility
.SH SYNOPSIS
@@ -22,6 +22,9 @@
.sp
.LP
Non-identical actions that deliver to the same path in an input manifest result in \fBpkgmerge\fR exiting with an error.
+.sp
+.LP
+After a \fBpkgmerge\fR operation, if your destination repository must support \fBpkg search\fR operations, run \fBpkgrepo refresh\fR on the repository to update search indexes.
.SH OPTIONS
.sp
.LP
@@ -364,9 +367,9 @@
.sp
.in +2
.nf
-$ \fBpkgmerge -p dev -s arch=sparc,http://src1.example.com \e\fR
-\fB-s arch=i386,http://src2.example.com \e\fR
-\fB-d /\fIpath/to/target/repository\fR\fR
+$ \fBpkgmerge -p dev -s arch=sparc,http://src1.example.com \e
+-s arch=i386,http://src2.example.com \e
+-d /path/to/target/repository\fR
.fi
.in -2
.sp
@@ -444,4 +447,7 @@
\fBpkgrepo\fR(1), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fIPackaging and Delivering Software With the Image Packaging System in Oracle Solaris 11.2\fR
+.sp
+.LP
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgmogrify.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgmogrify.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgmogrify 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
+.TH pkgmogrify 1 "12 Jul 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgmogrify \- Image Packaging System manifest transmogrifier
.SH SYNOPSIS
@@ -86,7 +86,7 @@
.sp
.in +2
.nf
-file NOHASH path=usr/bin/$(ARCH64)/cputrack ...
+file path=usr/bin/$(ARCH64)/cputrack ...
.fi
.in -2
@@ -621,4 +621,4 @@
\fBpkg\fR(1), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgrecv.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgrecv.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,13 +1,14 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgrecv 1 "4 Mar 2013" "SunOS 5.12" "User Commands"
+.TH pkgrecv 1 "30 Aug 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgrecv \- Image Packaging System content retrieval utility
.SH SYNOPSIS
.LP
.nf
-/usr/bin/pkgrecv [-s \fIsrc_uri\fR] [-a] [-d (\fIpath\fR|\fIdest_uri\fR)]
- [-c \fIcache_dir\fR] [-kr] [-m \fImatch\fR] [-n] [--raw]
+/usr/bin/pkgrecv [-aknrv] [-s (\fIsrc_path\fR|\fIsrc_uri\fR)]
+ [-d (\fIdest_path\fR|\fIdest_uri\fR)] [-c \fIcache_dir\fR]
+ [-m \fImatch\fR] [--raw]
[--key \fIsrc_key\fR --cert \fIsrc_cert\fR]
[--dkey \fIdest_key\fR --dcert \fIdest_cert\fR]
(\fIfmri\fR|\fIpattern\fR) ...
@@ -15,19 +16,20 @@
.LP
.nf
-/usr/bin/pkgrecv [-s \fIsrc_uri\fR] --newest
+/usr/bin/pkgrecv [-s (\fIsrc_path\fR|\fIsrc_uri\fR)] --newest
.fi
.LP
.nf
-/usr/bin/pkgrecv [-s \fIsrc_uri\fR] [-d \fIpath\fR] [-p \fIpublisher\fR ...]
- [--key \fIsrc_key\fR --cert \fIsrc_cert\fR] [-n] --clone
+/usr/bin/pkgrecv [-nv] [-s (\fIsrc_path\fR|\fIsrc_uri\fR)]
+ [-d (\fIdest_path\fR|\fIdest_uri\fR)] [-p \fIpublisher\fR]...
+ [--key \fIsrc_key\fR --cert \fIsrc_cert\fR] --clone
.fi
.SH DESCRIPTION
.sp
.LP
-\fBpkgrecv\fR retrieves all versions of each matching \fIfmri\fR or \fIpattern\fR from the \fIsrc_uri\fR \fBpkg\fR(5) repository or package archive and republishes the retrieved packages to the \fIdest_uri\fR package repository or package archive. By default, packages are retrieved in package repository format suitable for use with \fBpkg\fR, \fBpkg.depotd\fR, and package publication tools.
+\fBpkgrecv\fR retrieves all versions of each matching \fIfmri\fR or \fIpattern\fR from the \fBpkg\fR(5) repository or package archive specified by the \fB-s\fR option and optionally republishes the retrieved packages to the package repository or package archive specified by the \fB-d\fR option. By default, packages are retrieved in package repository format suitable for use with \fBpkg\fR, \fBpkg.depotd\fR, and package publication tools.
.sp
.LP
Packages that have not changed are not republished. Therefore, the time to update an existing repository depends on the number of new and changed packages.
@@ -36,7 +38,7 @@
Use the \fB-m\fR option to specify whether to retrieve all versions of each matching package, or only the newest version of each matching package.
.sp
.LP
-If you do not specify \fB\&'*'\fR to be retrieved, you might want to specify the \fB-r\fR option to be sure to retrieve all the dependencies of the specified packages.
+If you do not specify \fB'*'\fR to be retrieved, you might want to specify the \fB-r\fR option to be sure to retrieve all the dependencies of the specified packages.
.LP
Note -
.sp
@@ -69,7 +71,7 @@
.ad
.sp .6
.RS 4n
-Store the retrieved package data in a \fBpkg\fR(5) archive at the location specified by \fB-d\fR. The file cannot already exist. This option can be used only with file system based destinations. Although not required, using a file extension of \fB\&.p5p\fR (for example, \fBarchive.p5p\fR) is strongly suggested. This option cannot be combined with \fB--raw\fR.
+Store the retrieved package data in a \fBpkg\fR(5) archive at the location specified by the \fB-d\fR option. The file specified by \fB-d\fR cannot already exist. The \fB-a\fR option can be used only with file system based destinations. Although not required, using a file extension of \fB\&.p5p\fR (for example, \fBarchive.p5p\fR) is strongly suggested. The \fB-a\fR option cannot be combined with the \fB--raw\fR option.
.RE
.sp
@@ -87,11 +89,11 @@
.ne 2
.mk
.na
-\fB\fB-d\fR (\fIpath\fR|\fIdest_uri\fR)\fR
+\fB\fB-d\fR (\fIdest_path\fR|\fIdest_uri\fR)\fR
.ad
.sp .6
.RS 4n
-Specify the file system path or URI where the retrieved packages should be republished. If \fB-a\fR is specified, this destination is a new package archive that cannot already exist. If \fB-a\fR is not specified, this destination must be a package repository that already exists. Use the \fBpkgrepo\fR command to create a new package repository. If \fB-d\fR is not specified, the value of \fBPKG_DEST\fR is used. See "Environment Variables" below.
+Specify the file system path or URI where the retrieved packages should be republished. If \fB-a\fR is specified, this destination must be a package archive that does not already exist. If \fB-a\fR is not specified, this destination must be a package repository that already exists. Use the \fBpkgrepo\fR command to create a new package repository. If \fB-d\fR is not specified, the value of \fBPKG_DEST\fR is used. See "Environment Variables" below.
.RE
.sp
@@ -193,7 +195,7 @@
.ad
.sp .6
.RS 4n
-Only clone the given publisher. Can be specified multiple times. Only valid with --clone.
+Only clone the specified publisher. This option can be specified multiple times. The \fB-p\fR option is valid only with the \fB--clone\fR option.
.RE
.sp
@@ -211,11 +213,22 @@
.ne 2
.mk
.na
-\fB\fB-s\fR \fIsrc_uri\fR\fR
+\fB\fB-s\fR (\fIsrc_path\fR|\fIsrc_uri\fR)\fR
.ad
.sp .6
.RS 4n
-Specify a URI that represents the location of a \fBpkg\fR(5) repository or package archive from which to receive package data. If \fB-s\fR is not specified, the value of \fBPKG_SRC\fR is used. See "Environment Variables" below.
+Specify the file system path or URI of a \fBpkg\fR(5) repository or package archive from which to receive package data. If \fB-s\fR is not specified, the value of \fBPKG_SRC\fR is used. See "Environment Variables" below.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-v\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display verbose output, including the number of packages retrieved and their full FMRIs, the number of files retrieved, and the estimated size of the transfer.
.RE
.sp
@@ -270,7 +283,7 @@
.ad
.sp .6
.RS 4n
-Make an exact copy of the source repository. By default, the clone operation will only succeed if publishers in the source repository are also present in the destination. By using \fB-p\fR, the operation can be limited to specific publishers which will be added to the destination repository if not already present. Packages in the destination repository which are not in the source will be removed. Cloning will leave the destination repository altered in case of an error. It is therefore strongly advised to have the destination repository in its own zfs dataset and to take a snapshot before cloning.
+Make an exact copy of the source repository. By default, the clone operation succeeds only if publishers in the source repository are also present in the destination. To limit the clone operation to specified publishers, use the \fB-p\fR option. Publishers specified by using the \fB-p\fR option are added to the destination repository if they are not already present. Packages that are in the destination repository but not in the source repository are removed. The clone operation leaves the destination repository altered if an error occurs. Therefore, the destination repository should be in its own ZFS dataset, and a snapshot should be created prior to performing the clone operation.
.RE
.sp
@@ -358,12 +371,20 @@
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://test -d /local/repo -m latest \e\fR
+$ \fBpkgrecv -s http://test -d /local/repo -m latest -v \e\fR
\fBeditor/vim\fR
Processing packages for publisher solaris ...
-Retrieving and evaluating 2 package(s)...
-PROCESS ITEMS GET (MB) SEND(MB)
-Completed 2/2 16.7/16.7 44.9/44.9
+Retrieving and evaluating 1 package(s)...
+
+Adding packages ...
+ Packages to add: 1
+ Files to retrieve: 1557
+Estimated transfer size: 9.21 MB
+PROCESS ITEMS GET (MB) SEND (MB)
+Completed 1/1 9.2/9.2 25.4/25.4
+
+FMRI
+pkg://solaris/editor/[email protected],5.11-0.175.1.0.0.24.0:20121023T171531Z
.fi
.in -2
.sp
@@ -414,12 +435,12 @@
.sp
.LP
-Receive all packages that do not already exist and all changed content from the secure repository located at \fBhttp://pkg.oracle.com/solaris/support/\fR to the repository located at \fB/export/repoSolaris11\fR.
+Receive all packages that do not already exist and all changed content from the secure repository located at \fBhttps://pkg.oracle.com/solaris/support/\fR to the repository located at \fB/export/repoSolaris11\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://pkg.oracle.com/solaris/support/ \e\fR
+$ \fBpkgrecv -s https://pkg.oracle.com/solaris/support/ \e\fR
\fB-d /export/repoSolaris11 -m all-timestamps \e\fR
\fB--key /var/pkg/ssl/Oracle_Solaris_11_Support.key.pem \e\fR
\fB--cert /var/pkg/ssl/Oracle_Solaris_11_Support.certificate.pem '*'\fR
@@ -577,7 +598,7 @@
\fBpkgrepo\fR(1), \fBpkgsend\fR(1), \fBpkg\fR(5)
.sp
.LP
-\fICopying and Creating Oracle Solaris 11.1 Package Repositories\fR
+\fICopying and Creating Package Repositories in Oracle Solaris 11.2\fR
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgrepo.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgrepo.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,18 +1,19 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgrepo 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
+.TH pkgrepo 1 "29 Aug 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgrepo \- Image Packaging System repository management utility
.SH SYNOPSIS
.LP
.nf
-/usr/bin/pkgrepo create [--version \fIver\fR] \fIuri_or_path\fR
+/usr/bin/pkgrepo add-publisher -s \fIrepo_uri_or_path\fR
+ \fIpublisher\fR ...
.fi
.LP
.nf
-/usr/bin/pkgrepo add-publisher -s \fIrepo_uri_or_path\fR
- \fIpublisher\fR ...
+/usr/bin/pkgrepo remove-publisher [-n] [--synchronous]
+ -s \fIrepo_uri_or_path\fR \fIpublisher\fR ...
.fi
.LP
@@ -190,6 +191,56 @@
.ne 2
.mk
.na
+\fB\fBpkgrepo remove-publisher\fR [\fB-n\fR] [\fB--synchronous\fR] \fB-s\fR \fIrepo_uri_or_path\fR \fIpublisher\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Remove the specified publishers from the repository. Remove all packages and all other data for the specified publishers.
+.sp
+If the default publisher is removed, and only one publisher remains in the repository, that remaining publisher becomes the default. The \fBpublisher/prefix\fR property of the repository is set to that remaining publisher.
+.sp
+If the default publisher is removed, and multiple publishers remain in the repository, or if the last publisher is removed from the repository, the \fBpublisher/prefix\fR property is unset.
+.sp
+This subcommand can be used only with version 4 file system based repositories.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform a trial run of the operation with no publisher changes made. The number of packages to be removed for each publisher is displayed before exiting.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Operate on the repository located at the given URI or file system path.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--synchronous\fR\fR
+.ad
+.sp .6
+.RS 4n
+Wait for the operation to complete before returning. If this option is not specified, the command returns immediately while the publisher is removed asynchronously in the background.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fBpkgrepo get\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR]... \fB-s\fR \fIrepo_uri_or_path\fR [\fB--key\fR \fIssl_key\fR \fB--cert\fR \fIssl_cert\fR]... [\fIsection/property\fR ...]\fR
.ad
.sp .6
@@ -1084,4 +1135,7 @@
\fBpkg\fR(1), \fBpkgrecv\fR(1), \fBpkgsend\fR(1), \fBpkg.depotd\fR(1M), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fICopying and Creating Package Repositories in Oracle Solaris 11.2\fR
+.sp
+.LP
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgsend.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgsend.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-.TH pkgsend 1 "26 Feb 2013" "SunOS 5.12" "User Commands"
+.TH pkgsend 1 "30 Jul 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgsend \- Image Packaging System publication client
.SH SYNOPSIS
@@ -154,6 +154,8 @@
.sp
If not specified, \fBpkgsend publish\fR adds the build version to the package FMRI. The \fBpublish\fR tool also adds the timestamp (the current time in UTC) to the package FMRI. See the \fBpkg\fR(5) man page for information about the version string of a package FMRI.
.sp
+If multiple \fBpkgsend publish\fR processes might be publishing to the same \fB-s\fR repository simultaneously, specifying the \fB--no-catalog\fR option is recommended. See the description of the \fB--no-catalog\fR option below.
+.sp
.ne 2
.mk
.na
@@ -205,10 +207,10 @@
.ad
.sp .6
.RS 4n
-Do not add the package to the publisher's catalog. This option is recommended whenever multiple packages are being published at one time as updates to publisher catalogs must be performed serially. Once publication is complete, the \fBrefresh\fR subcommand of \fBpkgrepo\fR can be used to add the new packages to the respective publisher catalogs.
+Do not add the package to the publisher's catalog. This option is recommended whenever multiple packages are being published at one time because updates to publisher catalogs must be performed serially. Publication performance might be significantly reduced if this option is not used when multiple processes are simultaneously publishing packages. After publication is complete, the new packages can be added to the respective publisher catalogs by using the \fBpkgrepo refresh\fR command.
.RE
-For a descriptions of the \fB-T\fR option, see the \fBgenerate\fR subcommand above.
+For a description of the \fB-T\fR option, see the \fBgenerate\fR subcommand above.
.RE
.SH ENVIRONMENT VARIABLES
@@ -386,7 +388,10 @@
\fBpkgdepend\fR(1), \fBpkgrepo\fR(1), \fBpkg.depotd\fR(1M), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fIPackaging and Delivering Software With the Image Packaging System in Oracle Solaris 11.2\fR
+.sp
+.LP
+\fBhttps://java.net/projects/ips/pages/Home\fR
.SH NOTES
.sp
.LP
--- a/src/man/pkgsign.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgsign.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pkgsign 1 "27 May 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pkgsign 1 "21 May 2013" "SunOS 5.12" "User Commands"
.SH NAME
pkgsign \- Image Packaging System signing utility
.SH SYNOPSIS
@@ -237,4 +237,4 @@
\fBpkg\fR(1), \fBpkgrecv\fR(1), \fBpkgsend\fR(1), \fBpkgrepo\fR(1), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pkgsurf.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pkgsurf.1 Tue Sep 17 09:39:41 2013 -0700
@@ -2,7 +2,7 @@
.\" Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
.TH pkgsurf 1 "09 Aug 2013" "SunOS 5.12" "User Commands"
.SH NAME
-pkgsurf \- Image Packaging System repository re-surfacing utility
+pkgsurf \- Image Packaging System repository resurfacing utility
.SH SYNOPSIS
.LP
.nf
@@ -16,16 +16,19 @@
\fBpkgsurf\fR is a package publication tool for replacing packages in a target repository that have not changed since the latest published version in the reference repository. The result is a new version surface of all packages in the target repository.
.sp
.LP
-\fBpkgsurf\fR operations are irreversible; the target repository should be stored in its own ZFS dataset and a snapshot of the dataset should be taken before running \fBpkgsurf\fR in case the operation must be reverted.
+\fBpkgsurf\fR operations are not reversible. In case the \fBpkgsurf\fR operation must be reverted, you should store the target repository in its own ZFS dataset and take a snapshot of the dataset before you run \fBpkgsurf\fR.
+.sp
+.LP
+Packages in the target repository are compared to packages in the reference repository and analyzed for content changes. For each package, if no content change is found, the package manifest is removed from the target repository and replaced with the manifest of the same package from the reference repository.
.sp
.LP
-Packages in the target repository are compared to a given reference repository and analyzed for content changes. If no content change can be determined, the package manifest will be removed from the target repository and replaced with that of the reference repository. Afterwards, the dependencies of all packages in the repository are adjusted to reflect the version changes and keep the integrity of the repository intact.
+The target repository must be a file system based repository. For optimal performance, the reference repository should also be a file system based repository.
.sp
.LP
-The target repository must be filesystem-based and should only contain one version of each package. If the target repository contains a package which is newer than the latest version in the reference repository and older than the latest version in the target repository, no package version replacement will occur for that package. For optimal performance, the reference repository should also be filesystem-based.
+The target repository should contain only one version of each package. If the target repository contains a package that is both newer than the latest version in the reference repository and older than the latest version in the target repository, no package manifest replacement is done for that package.
.sp
.LP
-The reference repository may contain one or more versions of each package, however, only the latest version will be used for comparison.
+The reference repository can contain one or more versions of each package. However, only the latest version will be used for comparison.
.SH OPTIONS
.sp
.LP
@@ -34,11 +37,37 @@
.ne 2
.mk
.na
+\fB\fB-?\fR\fR
+.ad
+.br
+.na
+\fB\fB--help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fB-c\fR \fIpattern\fR\fR
.ad
.sp .6
.RS 4n
-Treat every package whose FMRI matches 'pattern' as changed and do not reversion it, even if there is no content change. Can be specified multiple times.
+Treat every package whose FMRI matches \fIpattern\fR as changed and do not reversion it, even if there is no content change. This option can be specified multiple times.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-i\fR \fIname\fR\fR
+.ad
+.sp .6
+.RS 4n
+Ignore \fBset\fR actions with the \fBname\fR field set to \fIname\fR for determination of content change. The package will be reversioned even if this action differs between target and reference versions. This option can be specified multiple times.
.RE
.sp
@@ -49,18 +78,7 @@
.ad
.sp .6
.RS 4n
-Perform a trial run with no changes made to the target repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-i\fR \fIname\fR\fR
-.ad
-.sp .6
-.RS 4n
-Ignore set actions with the name field set to \fIname\fR for determination of content change. Package will be reversioned even if this action differs between target and reference version. Can be specified multiple times.
+Perform a trial run of the operation with no changes made to the target repository.
.RE
.sp
@@ -71,9 +89,9 @@
.ad
.sp .6
.RS 4n
-Specify the name of the publisher to be re-surfaced. This option can be specified multiple times.
+Specify the name of the publisher to be resurfaced. This option can be specified multiple times.
.sp
-By default, packages from all publishers found in target and reference repositories are re-surfaced.
+By default, packages from all publishers found in target and reference repositories are resurfaced.
.RE
.sp
@@ -95,22 +113,7 @@
.ad
.sp .6
.RS 4n
-Path to target repository. Packages in this repository get reversioned to the versions present in the reference repository. Repository should only contain one version of each package. Must be a filesystem-based repository.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-?\fR\fR
-.ad
-.br
-.na
-\fB\fB--help\fR\fR
-.ad
-.sp .6
-.RS 4n
-Display a usage message.
+Specify the path to the target repository. Packages in this repository are reversioned to the versions present in the reference repository according to the comparison results. The target repository should contain only one version of each package. The target repository must be a file system based repository.
.RE
.SH ENVIRONMENT VARIABLES
@@ -123,30 +126,29 @@
.na
\fB\fBPKG_REPO\fR\fR
.ad
-.RS 10n
+.RS 12n
.rt
The absolute path of the target repository.
.RE
.SH EXAMPLES
.LP
-\fBExample 1 \fRRe-surface repository
+\fBExample 1 \fRResurface a Repository
.sp
.LP
-Reversion each package in the target repository which did not have any content change from the same package in the reference repository.
+Reversion each package in the target repository that did not have any content change from the same package in the reference repository.
.sp
.in +2
.nf
-$ \fBpkgsurf -s /path/to/target \e\fR
-\fB-r http://reference.example.com\fR
+$ \fBpkgsurf -s /path/to/target -r http://reference.example.com\fR
.fi
.in -2
.sp
.sp
.LP
-Sample package in target:
+Sample package in the target repository:
.sp
.in +2
@@ -158,7 +160,7 @@
.sp
.LP
-Sample package in reference:
+Sample package in the reference repository:
.sp
.in +2
@@ -170,7 +172,7 @@
.sp
.LP
-Sample package in target after operation:
+Sample package in the target repository after the \fBpkgsurf\fR operation:
.sp
.in +2
@@ -180,7 +182,6 @@
.fi
.in -2
-
.SH EXIT STATUS
.sp
.LP
@@ -254,4 +255,7 @@
\fBpkgrepo\fR(1), \fBpkg\fR(5)
.sp
.LP
-\fBhttps://java.net/projects/ips\fR
+\fICopying and Creating Package Repositories in Oracle Solaris 11.2\fR
+.sp
+.LP
+\fBhttps://java.net/projects/ips/pages/Home\fR
--- a/src/man/pm-updatemanager.1 Wed Sep 18 09:25:03 2013 -0700
+++ b/src/man/pm-updatemanager.1 Tue Sep 17 09:39:41 2013 -0700
@@ -1,6 +1,6 @@
'\" te
-.\" Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-.TH pm-updatemanager 1 "27 May 2012" "SunOS 5.12" "User Commands"
+.\" Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+.TH pm-updatemanager 1 "21 May 2013" "SunOS 5.12" "User Commands"
.SH NAME
pm-updatemanager \- application to update packages
.SH SYNOPSIS
@@ -169,7 +169,7 @@
\fBpackagemanager\fR(1), \fBpkg\fR(1), \fBpkg\fR(5)
.sp
.LP
-\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
+\fBhttps://java.net/projects/ips/pages/Home\fR
.SH NOTES
.sp
.LP