--- a/src/man/packagemanager.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/packagemanager.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH packagemanager 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH packagemanager 1 "27 May 2012" "SunOS 5.11" "User Commands"
.SH NAME
packagemanager \- GUI for the Image Packaging System
.SH SYNOPSIS
@@ -12,9 +12,9 @@
.LP
.nf
-/usr/bin/packagemanager [-hiRu] [--help]
- [--info-install \fIfile\fR] [--update-all]
- [--image-dir \fIdir\fR]
+/usr/bin/packagemanager [-h | --help]
+ [-i | --info-install \fIfile\fR] [-U | --update-all]
+ [-R | --image-dir \fIdir\fR]
.fi
.LP
@@ -58,29 +58,41 @@
.ne 2
.mk
.na
-\fB\fB-h\fR or \fB--help\fR\fR
+\fB\fB-h\fR\fR
+.ad
+.br
+.na
+\fB\fB--help\fR\fR
.ad
.sp .6
.RS 4n
-Displays a usage message.
+Display a usage message.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-i\fR or \fB--info-install\fR \fIfile\fR\fR
+\fB\fB-i\fR \fIfile\fR\fR
+.ad
+.br
+.na
+\fB\fB--info-install\fR \fIfile\fR\fR
.ad
.sp .6
.RS 4n
-Allows you to specify a \fB\&.p5i\fR file to run \fBpackagemanager\fR in Web Install mode. The \fIfile\fR must have the suffix \fB\&.p5i\fR.
+Specify a \fB\&.p5i\fR file to run \fBpackagemanager\fR in Web Install mode. The \fIfile\fR must have the suffix \fB\&.p5i\fR.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-R\fR or \fB--image-dir\fR \fIdir\fR\fR
+\fB\fB-R\fR \fIdir\fR\fR
+.ad
+.br
+.na
+\fB\fB--image-dir\fR \fIdir\fR\fR
.ad
.sp .6
.RS 4n
@@ -91,7 +103,11 @@
.ne 2
.mk
.na
-\fB\fB-U\fR or \fB--update-all\fR\fR
+\fB\fB-U\fR\fR
+.ad
+.br
+.na
+\fB\fB--update-all\fR\fR
.ad
.sp .6
.RS 4n
--- a/src/man/pkg.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkg.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkg 1 "28 Jul 2011" "" ""
+.TH pkg 1 "22 Jun 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkg \- Image Packaging System retrieval client
.SH SYNOPSIS
@@ -17,26 +17,29 @@
.LP
.nf
-/usr/bin/pkg install [-nvq] [-g \fIpath_or_uri\fR ...] [--accept]
- [--licenses] [--no-be-activate] [--no-index] [--no-refresh]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+/usr/bin/pkg install [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
+ [--accept] [--licenses] [--no-be-activate] [--no-index]
+ [--no-refresh] [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
[--reject \fIpkg_fmri_pattern\fR ...] \fIpkg_fmri_pattern\fR ...
.fi
.LP
.nf
-/usr/bin/pkg uninstall [-nvq] [--no-be-activate] [--no-index]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+/usr/bin/pkg uninstall [-nvq] [-C \fIn\fR] [--no-be-activate]
+ [--no-index] [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
\fIpkg_fmri_pattern\fR ...
.fi
.LP
.nf
-/usr/bin/pkg update [-fnvq] [-g \fIpath_or_uri\fR ...] [--accept]
- [--licenses] [--no-be-activate] [--no-index] [--no-refresh]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+/usr/bin/pkg update [-fnvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
+ [--accept] [--licenses] [--no-be-activate] [--no-index]
+ [--no-refresh] [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
[--reject \fIpkg_fmri_pattern\fR ...] [\fIpkg_fmri_pattern\fR ...]
.fi
@@ -57,7 +60,7 @@
.nf
/usr/bin/pkg contents [-Hmr] [-a \fIattribute\fR=\fIpattern\fR ...]
[-g \fIpath_or_uri\fR ...] [-o \fIattribute\fR ...] [-s \fIsort_key\fR]
- [-t \fIaction_type\fR ...] [\fIpkg_fmri_pattern\fR ...]
+ [-t \fIaction_name\fR ...] [\fIpkg_fmri_pattern\fR ...]
.fi
.LP
@@ -73,13 +76,15 @@
.LP
.nf
-/usr/bin/pkg fix [--accept] [--licenses] [\fIpkg_fmri_pattern\fR ...]
+/usr/bin/pkg fix [--accept] [--licenses]
+ [\fIpkg_fmri_pattern\fR ...]
.fi
.LP
.nf
/usr/bin/pkg revert [-nv] [--no-be-activate]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+ [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
(--tagged \fItag-name\fR ... | \fIpath-to-file\fR ...)
.fi
@@ -93,7 +98,8 @@
.nf
usr/bin/pkg set-mediator [-nv] [-I \fIimplementation\fR]
[-V \fIversion\fR] [--no-be-activate]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+ [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
\fImediator\fR ...
.fi
@@ -101,37 +107,40 @@
.LP
.nf
/usr/bin/pkg unset-mediator [-nvIV] [--no-be-activate]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+ [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
\fImediator\fR ...
.fi
.LP
.nf
-/usr/bin/pkg variant [-H] [\fIvariant_spec\fR]
+/usr/bin/pkg variant [-H] [variant.\fIvariant_name\fR ...]
.fi
.LP
.nf
-/usr/bin/pkg change-variant [-nvq] [-g \fIpath_or_uri\fR ...]
+/usr/bin/pkg change-variant [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
[--accept] [--licenses] [--no-be-activate]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+ [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
- \fIvariant_spec\fR=\fIinstance\fR ...
+ \fIvariant_name\fR=\fIvalue\fR ...
.fi
.LP
.nf
-/usr/bin/pkg facet [-H] [\fIfacet_spec\fR]
+/usr/bin/pkg facet [-H] [\fIfacet_name\fR ...]
.fi
.LP
.nf
-/usr/bin/pkg change-facet [-nvq] [-g \fIpath_or_uri\fR ...]
+/usr/bin/pkg change-facet [-nvq] [-C \fIn\fR] [-g \fIpath_or_uri\fR ...]
[--accept] [--licenses] [--no-be-activate]
- [--no-backup-be | --require-backup-be] [--backup-be-name \fIname\fR]
+ [--no-backup-be | --require-backup-be]
+ [--backup-be-name \fIname\fR]
[--deny-new-be | --require-new-be] [--be-name \fIname\fR]
- \fIfacet_spec\fR=[True|False|None] ...
+ \fIfacet_name\fR=[True|False|None] ...
.fi
.LP
@@ -181,7 +190,7 @@
.LP
.nf
-/usr/bin/pkg publisher [-HPn] [\fIpublisher\fR ...]
+/usr/bin/pkg publisher [-HPn] [-F \fIformat\fR] [\fIpublisher\fR ...]
.fi
.LP
@@ -191,18 +200,30 @@
[-G \fIorigin_to_remove\fR | --remove-origin \fIorigin_to_remove\fR ...]
[-m \fImirror_to_add\fR | --add-mirror \fImirror_to_add\fR ...]
[-M \fImirror_to_remove\fR | --remove-mirror \fImirror_to_remove\fR ...]
- [-p \fIrepo_uri\fR] [--enable] [--disable] [--no-refresh]
- [--reset-uuid] [--non-sticky] [--sticky]
- [--search-after \fIpublisher\fR] [--search-before \fIpublisher\fR]
- [--search-first]
+ [--enable] [--disable] [--no-refresh] [--reset-uuid]
+ [--non-sticky] [--sticky] [--search-after \fIpublisher\fR]
+ [--search-before \fIpublisher\fR] [--search-first]
[--approve-ca-cert \fIpath_to_CA\fR]
[--revoke-ca-cert \fIhash_of_CA_to_remove\fR]
[--unset-ca-cert \fIhash_of_CA_to_remove\fR]
[--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]
- [\fIpublisher\fR]
+ [--unset-property \fIname_of_property_to_delete\fR] \fIpublisher\fR
+.fi
+
+.LP
+.nf
+/usr/bin/pkg set-publisher -p \fIrepo_uri\fR [-Ped]
+ [-k \fIssl_key\fR] [-c \fIssl_cert\fR] [--non-sticky] [--sticky]
+ [--search-after \fIpublisher\fR] [--search-before \fIpublisher\fR
+ [--search-first] [--approve-ca-cert \fIpath_to_CA\fR]
+ [--revoke-ca-cert \fIhash_of_CA_to_remove\fR]
+ [--unset-ca-cert \fIhash_of_CA_to_remove\fR]
+ [--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] [\fIpublisher\fR]
.fi
.LP
@@ -245,11 +266,12 @@
.nf
/usr/bin/pkg image-create [-FPUfz] [--force]
[--full | --partial | --user] [--zone]
- [-k \fIssl_key\fR] [-c \fIssl_cert\fR]
- [--no-refresh] [--variant \fIvariant_spec\fR=\fIinstance\fR ...]
+ [-k \fIssl_key\fR] [-c \fIssl_cert\fR] [--no-refresh]
+ [--variant \fIvariant_name\fR=\fIvalue\fR ...]
[-g \fIpath_or_uri\fR | --origin \fIpath_or_uri\fR ...]
[-m \fIuri\fR | --mirror \fIuri\fR ...]
- [--facet \fIfacet_spec\fR=(True|False) ...]
+ [--set-property \fIname_of_property\fR=\fIvalue\fR]
+ [--facet \fIfacet_name\fR=(True|False) ...]
[(-p | --publisher) [\fIname\fR=]\fIrepo_uri\fR] \fIdir\fR
.fi
@@ -277,22 +299,30 @@
.ne 2
.mk
.na
-\fB-R\fR \fIdir\fR
+\fB\fB-?\fR\fR
+.ad
+.br
+.na
+\fB\fB--help\fR\fR
.ad
.sp .6
.RS 4n
-Operate on the image rooted at directory \fIdir\fR. If no directory was specified or determined based on environment, the default is /. See the "Environment Variables" section for more information.
+Display a usage message.
.RE
.sp
.ne 2
.mk
.na
-\fB--help\fR or \fB-?\fR
+\fB\fB-R\fR \fIdir\fR\fR
+.ad
+.br
+.na
+\fB\fB--image-dir\fR \fIdir\fR\fR
.ad
.sp .6
.RS 4n
-Display a usage message.
+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.
.RE
.SH SUB-COMMANDS
@@ -303,115 +333,323 @@
.ne 2
.mk
.na
-\fBrefresh\fR [\fB--full\fR] [\fIpublisher\fR ...]\fR
+\fB\fBpkg refresh\fR [\fB--full\fR] [\fIpublisher\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Update the client's list of available packages and publisher metadata for all publishers.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Update the client's list of available packages and publisher metadata only for the specified publishers.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--full\fR\fR
+.ad
+.sp .6
+.RS 4n
+Force a full retrieval of all publisher metadata, instead of attempting an incremental update, and request that any proxies used during the operation ignore cached data. This option exists for troubleshooting purposes and should not be used on a regular basis.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg install\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR ...] \fIpkg_fmri_pattern\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Install and update the specified packages to the newest version that match \fIpkg_fmri_pattern\fR allowed by the packages installed in the image. To explicitly request the latest version of a package, use \fBlatest\fR for the version portion of \fIpkg_fmri_pattern\fR. For example, specify \fBvim@latest\fR.
+.sp
+Packages are selected based on publisher search order and stickiness. See the \fBpkg publisher\fR and \fBpkg set-publisher\fR commands for information about search order and stickiness. If the \fIpkg_fmri_pattern\fR does not specify the publisher, the first publisher that provides a matching package is used as the installation source. If that publisher does not provide a version of the package that can be installed in this image, then the installation operation fails. Use the \fBpkg list -a\fR command to see which publishers provide a version of the package that can be installed in this image.
+.sp
+If more than one \fIpkg_fmri_pattern\fR is specified, and if any of the specified packages cannot be installed in this image, then none of the specified packages will be installed.
+.sp
+Some configuration files might be renamed or replaced during the installation process. For more information on how the package system determines which files to preserve, and how they are preserved during package operations, see "File Actions" in the \fBpkg\fR(5) man page.
+.sp
+If a package is on the avoid list, installing it removes it from that list.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-g\fR \fIpath_or_uri\fR\fR
+.ad
+.sp .6
+.RS 4n
+Temporarily add the specified package repository or archive to the list of sources in the image from which to retrieve package data. Repositories that require a client SSL certificate cannot be used with this option. This option can be specified multiple times.
+.sp
+When deciding which version of a package to use, publishers configured in the image, but not found in the specified \fIpath_or_uri\fR sources, take precedence. If the version of the package to be installed is provided by a publisher configured in the image and by a \fIpath_or_uri\fR source, the client retrieves the content for that package from the \fIpath_or_uri\fR sources. After installation or update, any packages provided by publishers not configured in the image are added to the image configuration without an origin. Use the \fBpkg publisher\fR command to see which publishers are configured in the image.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
.ad
.sp .6
.RS 4n
-Updates the client's list of available packages and publisher metadata for each publisher specified. If no publishers are specified, the operation is performed for all publishers.
-.sp
-With \fB--full\fR, force a full retrieval of all publisher metadata, instead of attempting an incremental update, and request that any proxies used during the operation ignore cached data. This option exists for troubleshooting purposes and should not be used on a regular basis.
+Perform a trial run of the operation with no package changes made.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-v\fR\fR
+.ad
+.sp .6
+.RS 4n
+Issue verbose progress messages during the requested operation, and display detailed planning information (such as changing facets, mediators, and variants). This option can be specified multiple times to increase the amount of planning information displayed.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-q\fR\fR
+.ad
+.sp .6
+.RS 4n
+Hide progress messages during the requested operation.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-C\fR \fIn\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify the number of child images to update in parallel. When recursing into child images (usually zones), update at most \fIn\fR child images in parallel. The default number of child images to update in parallel is 1. If \fIn\fR is 0 or a negative number, all child images are updated in parallel. See also \fBPKG_CONCURRENCY\fR in the "Environment Variables" section.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--accept\fR\fR
+.ad
+.sp .6
+.RS 4n
+Indicate that you agree to and accept the terms of the licenses of the packages that are updated or installed. If you do not provide this option, and any package licenses require acceptance, the installation operation fails.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--licenses\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display all of the licenses for the packages that are installed or updated as part of this operation.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--no-backup-be\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not create a backup boot environment.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--no-be-activate\fR\fR
+.ad
+.sp .6
+.RS 4n
+If a boot environment is created, do not set it as the active boot environment on the next boot. See the \fBbeadm\fR(1M) man page for more information.
.RE
.sp
.ne 2
.mk
.na
-\fBinstall\fR [\fB-nvq\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR ...] \fIpkg_fmri_pattern\fR ...\fR
+\fB\fB--no-index\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not update the search indexes after the operation has completed successfully.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--no-refresh\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages and other metadata.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--backup-be-name\fR \fIname\fR\fR
.ad
.sp .6
.RS 4n
-Installs and updates packages to the newest version that match \fIpkg_fmri_pattern\fR allowed by the packages installed in the image. To explicitly request the latest version of a package, use \fBlatest\fR for the version portion of \fIpkg_fmri_pattern\fR. For example, specify \fBvim@latest\fR.
-.sp
-Some configuration files might be renamed or replaced during the installation process. For more information on how the package system determines which files to preserve, and how they are preserved during package operations, see "File Actions" in \fBpkg\fR(5).
-.sp
-If a package is on the avoid list, installing it removes it from that list.
-.sp
-With \fB-g\fR, temporarily add the specified package repository or archive to the list of sources in the image from which to retrieve package data. If packages from the specified sources are also available from configured publishers in the image, the client will retrieve content for those packages from the specified sources only. When deciding which version of a package to use, publishers configured in the image, but not found in the given sources take precedence. After install or update, any packages provided by publishers not found in the image are added to the image configuration without an origin. This option can be specified multiple times.
-.sp
-With \fB-n\fR, perform a trial run of the operation with no package changes made.
-.sp
-With \fB-q\fR, hide progress messages during the requested operation.
-.sp
-With \fB-v\fR, issue verbose progress messages during the requested operation, and display detailed planning information (such as changing facets, mediators, and variants). This option can be specified multiple times to increase the amount of planning information displayed.
-.sp
-With \fB--accept\fR, you indicate that you agree to and accept the terms of the licenses of the packages that are updated or installed. If you do not provide this option, and any package licenses require acceptance, the installation operation fails.
-.sp
-With \fB--licenses\fR, display all of the licenses for the packages that are installed or updated as part of this operation.
-.sp
-With \fB--no-backup-be\fR, do not create a backup boot environment.
-.sp
-With \fB--no-be-activate\fR, if a boot environment is created, do not set it as the active BE on the next boot. See \fBbeadm\fR(1M) for more information.
-.sp
-With \fB--no-index\fR, do not update the search indices after the operation has completed successfully.
-.sp
-With \fB--no-refresh\fR, do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages and other metadata.
-.sp
-With \fB--backup-be-name\fR, name the created backup boot environment using the given argument. Use of \fB--backup-be-name\fR implies \fB--require-backup-be\fR. See also \fBbeadm\fR(1M).
-.sp
-With \fB--be-name\fR, rename the newly created boot environment to be the argument given. Use of \fB--be-name\fR implies \fB--require-new-be\fR. See also \fBbeadm\fR(1M).
-.sp
-With \fB--require-backup-be\fR, always create a backup boot environment if a new boot environment will not be created. Without this option, a backup boot environment is created based on image policy. See \fBbe-policy\fR in "Image Properties" below for an explanation of when backup boot environments are created automatically.
-.sp
-With \fB--require-new-be\fR, always create a new boot environment. Without this option, a boot environment is created based on image policy. See \fBbe-policy\fR in "Image Properties" below for an explanation of when boot environments are created automatically. This option cannot be combined with \fB--require-backup-be\fR.
-.sp
-With \fB--deny-new-be\fR, do not create a new boot environment. The operation will not be performed if a new boot environment is required.
-.sp
-With \fB--reject\fR, prevent packages with names matching the given pattern from being installed. If matching packages are already installed, they are removed as part of this operation. Rejected packages that are the target of group dependencies are placed on the avoid list.
+Name the created backup boot environment using the given argument. Use of \fB--backup-be-name\fR implies \fB--require-backup-be\fR. See also the \fBbeadm\fR(1M) man page.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--be-name\fR \fIname\fR\fR
+.ad
+.sp .6
+.RS 4n
+Rename the newly created boot environment to be the argument given. Use of \fB--be-name\fR implies \fB--require-new-be\fR. See also the \fBbeadm\fR(1M) man page.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--require-backup-be\fR\fR
+.ad
+.sp .6
+.RS 4n
+Always create a backup boot environment if a new boot environment will not be created. Without this option, a backup boot environment is created based on image policy. See \fBbe-policy\fR in "Image Properties" below for an explanation of when backup boot environments are created automatically.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--require-new-be\fR\fR
+.ad
+.sp .6
+.RS 4n
+Always create a new boot environment. Without this option, a boot environment is created based on image policy. See \fBbe-policy\fR in "Image Properties" below for an explanation of when boot environments are created automatically. This option cannot be combined with \fB--require-backup-be\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--deny-new-be\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not create a new boot environment. This operation is not performed if a new boot environment is required.
.RE
.sp
.ne 2
.mk
.na
-\fBuninstall\fR [\fB-nvq\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIpkg_fmri_pattern\fR ...\fR
+\fB\fB--reject\fR \fIpkg_fmri_pattern\fR\fR
.ad
.sp .6
.RS 4n
-Removes installed packages that match \fIpkg_fmri_pattern\fR.
+Prevent packages with names matching the given pattern from being installed. If matching packages are already installed, they are removed as part of this operation. Rejected packages that are the target of group dependencies are placed on the avoid list.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg uninstall\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIpkg_fmri_pattern\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Remove installed packages that match \fIpkg_fmri_pattern\fR.
.sp
If a package is the subject of a group dependency, uninstalling it places it on the avoid list. See the \fBavoid\fR subcommand below.
.sp
-For all other options, refer to the \fBinstall\fR command above for usage and their effects.
+For descriptions of options, see the \fBinstall\fR command above.
+.sp
+In the command output, note any messages that say a new boot environment has been created. If a new boot environment has been created and activated, that is the environment that is booted by default on next reboot. See the \fBbeadm\fR(1M) man page for information about managing boot environments.
.RE
.sp
.ne 2
.mk
.na
-\fBupdate\fR [\fB-fnvq\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR ...] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg update\fR [\fB-fnvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-index\fR] [\fB--no-refresh\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] [\fB--reject\fR \fIpkg_fmri_pattern\fR ...] [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
-With no arguments, or if asterisk (*) is one of the patterns provided, update all installed packages in the current image to the newest version allowed by the constraints imposed on the system by installed packages and publisher configuration. To explicitly request the latest version of a package, use \fBlatest\fR for the version portion of \fIpkg_fmri_pattern\fR. For example, specify \fBvim@latest\fR.
-.sp
-If \fIpkg_fmri_pattern\fR is provided, \fBupdate\fR replaces packages that are installed, and that match \fIpkg_fmri_pattern\fR, with the newest version allowed by the patterns and the constraints imposed on the system by installed packages and publisher configuration. Versions older or newer than what is already installed can be specified to perform in-place downgrades or upgrades of specific packages. Updating specific packages across package rename or obsolete boundaries is not supported.
-.sp
-Any preserved configuration files that are part of packages to be downgraded by \fBupdate\fR and that have been changed since the original version was installed are renamed using the extension \fB\&.update\fR. For more information about how the package system determines which files to preserve, and how these files are preserved during package upgrades, see "File Actions" in \fBpkg\fR(5).
-.sp
-With the \fB-f\fR option, do not execute the client up-to-date check when updating all installed packages.
-.sp
-For all other options, refer to the \fBinstall\fR command above for usage and their effects.
+Update all packages installed in the current image to the newest version allowed by the constraints imposed on the system by installed packages and publisher configuration.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
+.ad
+.sp .6
+.RS 4n
+Update only the specified packages installed in the current image. If asterisk (*) is one of the \fIpkg_fmri_pattern\fR patterns provided, update all packages installed in the current image as described above.
+.sp
+To explicitly request the latest version of a package, use \fBlatest\fR for the version portion of \fIpkg_fmri_pattern\fR. For example, specify \fBvim@latest\fR.
+.sp
+Versions older or newer than what is already installed can be specified to perform in-place downgrades or upgrades of specific packages. Updating specific packages across package rename or obsolete boundaries is not supported.
+.sp
+Any preserved configuration files that are part of packages to be downgraded and that have been changed since the original version was installed are renamed using the extension \fB\&.update\fR. For more information about how the package system determines which files to preserve, and how these files are preserved during package upgrades, see "File Actions" in the \fBpkg\fR(5) man page.
+.sp
+If more than one \fIpkg_fmri_pattern\fR is specified, and if any of the specified packages cannot be updated in this image, then none of the specified packages will be updated.
.RE
.sp
.ne 2
.mk
.na
-\fBlist\fR [\fB-Hafnsuv\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--no-refresh\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fB-f\fR\fR
.ad
.sp .6
.RS 4n
-Display a list of packages in the current image, including state and other information. By default, package variants for a different architecture or zone type are excluded. The usual output is in three columns:
+Do not execute the client up-to-date check when updating all installed packages.
+.RE
+
+For all other options, see the \fBinstall\fR command above.
+.sp
+In the command output, note any messages that say a new boot environment has been created. If a new boot environment has been created and activated, that is the environment that is booted by default on next reboot if you do not specify the \fB--no-be-activate\fR option. See the \fBbeadm\fR(1M) man page for information about managing boot environments.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg list\fR [\fB-Hafnsuv\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--no-refresh\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Display a list of all packages installed in the current image, including information such as version and installed state. By default, package variants for a different architecture or zone type are excluded. The usual output is in three columns:
.sp
.in +2
.nf
-NAME (PUBLISHER) VERSION IFO
-system/core-os 0.5.11-0.169 i--
-x11/wm/fvwm (fvwm.org) 2.6.1-3 i--
+NAME (PUBLISHER) VERSION IFO
+system/core-os 0.5.11-0.175.0.0.0.2.1 i--
+x11/wm/fvwm (fvwm.org) 2.6.5 i--
.fi
.in -2
-The first column contains the name of the package. If the publisher from which the package is installed (or available, if not installed) is not the first in the publisher search order, then the publisher name is listed in parentheses after the package name. The second column contains the release and branch versions of the package. See \fBpkg\fR(5) for information about release and branch versions.
+The first column contains the name of the package. If the publisher from which the package is installed (or available, if not installed) is not the first in the publisher search order, then the publisher name is listed in parentheses after the package name. The second column contains the release and branch versions of the package. See the \fBpkg\fR(5) man page for information about release and branch versions and about variants.
.sp
.LP
The last column contains a set of flags that show the status of the package:
@@ -433,158 +671,382 @@
.el o
An \fBo\fR in the \fBO\fR column shows that the package is obsolete. An \fBr\fR in the \fBO\fR column shows that the package has been renamed (a form of obsoletion).
.RE
-With \fB-H\fR, omit the headers from the listing.
-.sp
-With \fB-a\fR, 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.
-.sp
-With \fB-f\fR and \fB-a\fR, list all versions of all packages for all variants regardless of incorporation constraints or installed state. To explicitly list the latest version of a package when using these options, use \fBlatest\fR for the version portion of \fIpkg_fmri_pattern\fR. For example, specify \fBvim@latest\fR.
-.sp
-With \fB-g\fR, use the specified package repository or archive as the source of package data for the operation. This option can be specified multiple times. Use of \fB-g\fR implies \fB-a\fR if \fB-n\fR is not specified.
-.sp
-With \fB-n\fR, display the newest versions of all known packages, regardless of installed state.
-.sp
-With \fB-s\fR, display a one-line short-form giving the package name and summary. This option can be used with \fB-a\fR, \fB-n\fR, \fB-u\fR or \fB-v\fR.
-.sp
-With \fB-u\fR, list only packages with newer versions available. This option cannot be used with \fB-g\fR.
-.sp
-With \fB-v\fR, show full package FMRIs, including publisher and complete version, all in the first column (the VERSION column disappears). This option can be used with \fB-a\fR, \fB-n\fR, or \fB-u\fR.
-.sp
-With \fB--no-refresh\fR, do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
+.ad
+.sp .6
+.RS 4n
+List only the specified packages.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-a\fR\fR
+.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.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-af\fR\fR
+.ad
+.sp .6
+.RS 4n
+List all versions of all packages for all variants regardless of incorporation constraints or installed state. To explicitly list the latest version of a package when using these options, use \fBlatest\fR for the version portion of \fIpkg_fmri_pattern\fR. For example, specify \fBvim@latest\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-g\fR \fIpath_or_uri\fR\fR
+.ad
+.sp .6
+.RS 4n
+Use the specified package repository or archive as the source of package data for the operation. Repositories that require a client SSL certificate cannot be used with this option. This option can be specified multiple times. Use of \fB-g\fR implies \fB-a\fR if \fB-n\fR is not specified.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display the newest versions of all known packages, regardless of installed state.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a one-line short-form giving the package name and summary. This option can be used with \fB-a\fR, \fB-n\fR, \fB-u\fR or \fB-v\fR.
.RE
.sp
.ne 2
.mk
.na
-\fBinfo\fR [\fB-lr\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--license\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fB-u\fR\fR
+.ad
+.sp .6
+.RS 4n
+List only packages with newer versions available. This option cannot be used with \fB-g\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-v\fR\fR
+.ad
+.sp .6
+.RS 4n
+Show full package FMRIs, including publisher and complete version, all in the first column (the VERSION column disappears). This option can be used with \fB-a\fR, \fB-n\fR, or \fB-u\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--no-refresh\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages.
+.RE
+
+.RE
+
+.sp
+.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
+.ad
+.sp .6
+.RS 4n
+Display information about all packages installed in the current image in a human-readable form.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
.ad
.sp .6
.RS 4n
-Display information about packages in a human-readable form. Multiple FMRI patterns can be specified. With no patterns, display information on all installed packages in the image.
-.sp
-With \fB-g\fR, use the specified package repository or archive as the source of package data for the operation. This option can be specified multiple times. Use of \fB-g\fR implies \fB-r\fR.
-.sp
-With \fB-l\fR, only display information for installed packages. This is the default.
-.sp
-With \fB-r\fR, match packages based on the newest available versions, retrieving information for packages not currently installed (if necessary) from the repositories of the image's configured publishers. At least one package must be specified when using this option. Without \fB-r\fR, only installed packages are displayed by default.
-.sp
-With \fB--license\fR, display the license texts for the packages. This option can be combined with \fB-l\fR or \fB-r\fR.
+Display information for only the specified packages.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-g\fR \fIpath_or_uri\fR\fR
+.ad
+.sp .6
+.RS 4n
+Use the specified package repository or archive as the source of package data for the operation. Repositories that require a client SSL certificate cannot be used with this option. This option can be specified multiple times. Use of \fB-g\fR implies \fB-r\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-l\fR\fR
+.ad
+.sp .6
+.RS 4n
+Only display information for installed packages. This is the default.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-r\fR\fR
+.ad
+.sp .6
+.RS 4n
+Match packages based on the newest available versions, retrieving information for packages not currently installed (if necessary) from the repositories of the image's configured publishers. At least one package must be specified when using this option. Without \fB-r\fR, only installed packages are displayed by default.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--license\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display the license texts for the packages. This option can be combined with \fB-l\fR or \fB-r\fR.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBcontents\fR [\fB-Hmr\fR] [\fB-a\fR \fIattribute\fR=\fIpattern\fR ...] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB-o\fR \fIattribute\fR,...] [\fB-s\fR \fIsort_key\fR] [\fB-t\fR \fIaction_type\fR ...] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg contents\fR [\fB-Hmr\fR] [\fB-a\fR \fIattribute\fR=\fIpattern\fR ...] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB-o\fR \fIattribute\fR,...] [\fB-s\fR \fIsort_key\fR] [\fB-t\fR \fIaction_name\fR ...] [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
-Display the contents (action attributes) of packages in the current image. By default, only the \fBpath\fR attribute is displayed. The attributes displayed can be determined with the \fB-o\fR option. 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. Only actions that have the requested attributes are displayed. The \fB-m\fR option can also be used, as a shorthand for \fB-Ho action.raw\fR.
-.sp
-With \fB-a\fR, limit the output to those actions that have an attribute named in the option argument with a value that matches the (glob) pattern in the option argument (following the attribute name with an equals sign). If multiple \fB-a\fR options are given, then actions matching any of them are displayed.
-.sp
-With \fB-g\fR, use the specified package repository or archive as the source of package data for the operation. This option can be specified multiple times. Use of \fB-g\fR implies \fB-r\fR.
-.sp
-With \fB-r\fR, match packages based on the newest available versions, retrieving information for packages not currently installed (if necessary) from the repositories of the image's configured publishers. At least one package must be specified when using this option. Without \fB-r\fR, only installed packages are displayed by default.
-.sp
-With \fB-s\fR, sort actions by the specified action attribute. If not provided, the default is to sort by path or by the first attribute specified by the \fB-o\fR option. The \fB-s\fR option can be specified multiple times.
-.sp
-With \fB-t\fR, only list actions of the type specified. Multiple types can be specified in a comma-separated list. This option can be specified multiple times.
-.sp
-With \fB-H\fR, omit the headers from the listing.
-.sp
-With no arguments, the output includes all installed packages. Alternatively, multiple FMRI patterns can be specified, which restricts the display to the contents of the matching packages. When using \fB-r\fR, one or more \fIpkg_fmri_pattern\fR must be specified.
-.sp
-Several special pseudo attribute names are available for convenience:
+Display the contents (action attributes) of all packages installed in the image. With no options, display the value of the \fBpath\fR attribute for actions installed in the current image, sorted alphabetically by attribute value. For information about actions and their attributes, see "Actions" in the \fBpkg\fR(5) man page. See also the list of pseudo attribute names below.
.sp
.ne 2
.mk
.na
-\fBaction.hash\fR
+\fB\fIpkg_fmri_pattern\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display contents of only the specified packages.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the value of the action's hash, if the action carries a payload.
+.sp .6
+.RS 4n
+Omit the headers from the output.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-a\fR \fIattribute\fR=\fIpattern\fR\fR
+.ad
+.sp .6
+.RS 4n
+Limit the output to those actions that have an attribute named in the option argument with a value that matches the (glob) pattern in the option argument (following the attribute name with an equals sign). If multiple \fB-a\fR options are given, then actions matching any of them are displayed.
.RE
.sp
.ne 2
.mk
.na
-\fBaction.key\fR
+\fB\fB-g\fR \fIpath_or_uri\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display information for packages that could be installed in this image from the specified package repository or archive. Repositories that require a client SSL certificate cannot be used with this option. Packages that could be installed include packages that are currently installed and other packages that satisfy criteria for installation in this image, such as variant and facet restrictions. This option can be specified multiple times. Use of \fB-g\fR implies \fB-r\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-m\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display all attributes of all actions in the specified packages, including actions that could not be installed in this image.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-o\fR \fIattribute\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the value of the action's key attribute. For example, for a file action, this is the path to the file.
+.sp .6
+.RS 4n
+Display the specified attributes, sorted according to the values of the first attribute listed. 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. Only actions that have the requested attributes are displayed.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-r\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display information for the newest available versions of packages that could be installed in this image from the repositories of the publishers configured in this image. Packages that could be installed include packages that are currently installed and other packages that satisfy criteria for installation in this image, such as variant and facet restrictions. At least one package must be specified when using this option.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIsort_key\fR\fR
+.ad
+.sp .6
+.RS 4n
+Sort actions by the specified action attribute. If not provided, the default is to sort by path or by the first attribute specified by the \fB-o\fR option. The \fB-s\fR option can be specified multiple times.
.RE
.sp
.ne 2
.mk
.na
-\fBaction.name\fR
+\fB\fB-t\fR \fIaction_name\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the name of the action. For example, for a file action, this is \fBfile\fR.
+.sp .6
+.RS 4n
+Only list the specified actions. Multiple actions can be specified in a comma-separated list. The value of \fIaction_name\fR is one of the actions listed in "Actions" in the \fBpkg\fR(5) man page, such as \fBfile\fR, \fBdirectory\fR, \fBdriver\fR, \fBdepend\fR, \fBset\fR. This option can be specified multiple times.
+.RE
+
+Several special pseudo attribute names are available for convenience:
+.sp
+.ne 2
+.mk
+.na
+\fB\fBaction.hash\fR\fR
+.ad
+.sp .6
+.RS 4n
+The value of the action's hash, if the action carries a payload.
.RE
.sp
.ne 2
.mk
.na
-\fBaction.raw\fR
+\fB\fBaction.key\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the complete contents of the action as represented in the package manifest. This corresponds to the lines of output of \fBpkg contents -m\fR.
+.sp .6
+.RS 4n
+The value of the action's key attribute. For example, for a \fBfile\fR action, the key attribute is the path to the file. Some actions do not have a key attribute.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBaction.name\fR\fR
+.ad
+.sp .6
+.RS 4n
+The name of the action. For example, for a file action, this is \fBfile\fR.
.RE
.sp
.ne 2
.mk
.na
-\fBpkg.fmri\fR
+\fB\fBaction.raw\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the full form FMRI of the package containing the action, such as \fBpkg://solaris/web/[email protected],5.11-0.169:20110705T153434Z\fR.
+.sp .6
+.RS 4n
+All attributes of matching actions.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg.fmri\fR\fR
+.ad
+.sp .6
+.RS 4n
+The full FMRI of the package containing the action, such as \fBpkg://solaris/group/feature/[email protected],5.11-0.175.0.0.0.2.1:20120705T153434Z\fR.
.RE
.sp
.ne 2
.mk
.na
-\fBpkg.name\fR
+\fB\fBpkg.name\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the name of the package containing the action, such as \fBweb/amp\fR.
+.sp .6
+.RS 4n
+The name of the package containing the action, such as \fBweb/amp\fR.
.RE
.sp
.ne 2
.mk
.na
-\fBpkg.publisher\fR
+\fB\fBpkg.publisher\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the publisher of the package containing the action, such as \fBsolaris\fR.
+.sp .6
+.RS 4n
+The publisher of the package containing the action, such as \fBsolaris\fR.
.RE
.sp
.ne 2
.mk
.na
-\fBpkg.shortfmri\fR
+\fB\fBpkg.shortfmri\fR\fR
.ad
-.RS 17n
-.rt
-Corresponds to the short form FMRI of the package containing the action, such as \fBpkg://solaris/web/[email protected],5.11-0.169\fR
+.sp .6
+.RS 4n
+The short form FMRI of the package containing the action, such as \fBpkg://solaris/group/feature/[email protected],5.11-0.175\fR
.RE
-The \fBcontents\fR and \fBsearch\fR subcommands are related: Both are used to query the system for the contents of packages. The \fBcontents\fR subcommand displays actions in one or more packages, filtering the output based on the options chosen by the user. The \fBsearch\fR subcommand approaches the query from the other direction, looking for packages that contain a user-supplied token.
+The \fBcontents\fR and \fBsearch\fR subcommands are related: Both query the system for the contents of packages. The \fBcontents\fR subcommand displays actions in one or more installed or installable packages, filtering the output based on the specified options. The \fBsearch\fR subcommand approaches the query from the other direction, displaying the names of all packages that contain a user-supplied token.
.sp
Each subcommand is capable of formulating some queries of which the other is capable. Care should be taken in choosing the subcommand, as a given query can be more naturally formulated in one than in the other.
.RE
@@ -593,295 +1055,750 @@
.ne 2
.mk
.na
-\fBsearch\fR [\fB-HIaflpr\fR] [\fB-o\fR \fIattribute\fR,...] [\fB-s\fR \fIrepo_uri\fR] \fIquery\fR
+\fB\fBpkg search\fR [\fB-HIaflpr\fR] [\fB-o\fR \fIattribute\fR,...] [\fB-s\fR \fIrepo_uri\fR] \fIquery\fR\fR
.ad
.sp .6
.RS 4n
-Search for matches to the \fIquery\fR, and display the results. Which tokens are indexed are action-dependent, but can include content hashes and path names. By default, queries are interpreted as a series of terms to be matched exactly. The \fB?\fR and \fB*\fR characters can be used as \fBglob\fR(3C)-style wildcards, allowing more flexible query matches.
-.sp
-With \fB-H\fR, omit the headers.
-.sp
-With \fB-I\fR, use a case-sensitive search.
-.sp
-By default, and with \fB-a\fR, perform the search and display information about the matching actions.
-.sp
-By default, \fBsearch\fR prunes results from packages older than the currently installed version and from package versions excluded by current incorporations. Use \fB-f\fR to show all results, regardless of package version.
-.sp
-With \fB-l\fR, search the image's installed packages.
-.sp
-With \fB-o\fR, the columns of the results can be controlled. 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:
+Search for matches to the \fIquery\fR, and display the results. See the description of \fIquery\fR below.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the output.
+.RE
+
.sp
.ne 2
.mk
.na
-\fBsearch.match\fR
+\fB\fB-I\fR\fR
+.ad
+.sp .6
+.RS 4n
+Use a case-sensitive search.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-a\fR\fR
.ad
-.RS 21n
-.rt
-Corresponds to the string that matched the search query.
+.sp .6
+.RS 4n
+Perform the search and display information about the matching actions. This is the default.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-f\fR\fR
+.ad
+.sp .6
+.RS 4n
+Show all results, regardless of package version. By default, \fBsearch\fR prunes results from packages older than the currently installed version and from package versions excluded by current incorporations.
.RE
.sp
.ne 2
.mk
.na
-\fBsearch.match_type\fR
+\fB\fB-l\fR\fR
.ad
-.RS 21n
-.rt
-Corresponds to the attribute that contained the string that matched the search query.
+.sp .6
+.RS 4n
+Search the image's installed packages.
+.sp
+Both \fB-l\fR and \fB-r\fR (or \fB-s\fR) can be specified together, in which case both local and remote searches are performed.
.RE
-With \fB-p\fR, display packages that have some actions that match each query term. Using this option is equivalent to putting angle brackets (\fB<>\fR) around each term in the query. See below for more description of the \fB<>\fR operator.
-.sp
-By default, and with \fB-r\fR, search the repositories corresponding to the image's publishers.
-.sp
-With \fB-s\fR, search the \fBpkg\fR(5) repository located at the given URI. This can be specified multiple times. Package archives are not supported.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-p\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display packages that have some actions that match each query term. Using this option is equivalent to putting angle brackets (\fB<>\fR) around each term in the query. See \fIquery\fR below for more description of the \fB<>\fR operator.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-r\fR\fR
+.ad
+.sp .6
+.RS 4n
+Search the repositories corresponding to the image's publishers. This is the default.
.sp
Both \fB-l\fR and \fB-r\fR (or \fB-s\fR) can be specified together, in which case both local and remote searches are performed.
-.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. Field, or structured, queries are supported. The syntax for these is \fB\fIpkg_name\fR:\fIaction_type\fR:\fIkey\fR:\fItoken\fR. Missing fields are implicitly wildcarded. A search for \fB:basename:pkg\fR matches all action types in all packages with a key of \fBbasename\fR and that match the token \fBpkg\fR. Explicit wildcards are supported in the \fBpkg_name\fR and \fBtoken\fR fields. The \fBaction_type\fR and \fBkey\fR must match exactly.
-.sp
-To convert actions to the packages that contain those actions, use \fB<>\fR\&. With the \fB-a\fR option, searching for \fBtoken\fR results in information about the actions matching \fBtoken\fR, while searching for \fB<token>\fR results in a list of packages containing actions that matched \fBtoken\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-o\fR \fIattribute\fR\fR
+.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:
+.sp
+.ne 2
+.mk
+.na
+\fB\fBsearch.match\fR\fR
+.ad
+.sp .6
+.RS 4n
+The string that matched the search query.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBsearch.match_type\fR\fR
+.ad
+.sp .6
+.RS 4n
+The attribute that contained the string that matched the search query.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIrepo_uri\fR\fR
+.ad
+.sp .6
+.RS 4n
+Search the \fBpkg\fR(5) repository located at the given URI. This can be specified multiple times. Package archives are not supported.
.RE
.sp
.ne 2
.mk
.na
-\fBverify\fR [\fB-Hqv\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fIquery\fR\fR
.ad
.sp .6
.RS 4n
-Validate the installation of packages in the current image. If current signature policy for related publishers is not \fBignore\fR, the signatures of each package are validated based on policy. See \fBsignature-policy\fR in "Image Properties" below for an explanation of how signature policies are applied.
-.sp
-With \fB-H\fR, omit the headers from the verification output.
-.sp
-With \fB-q\fR, print nothing, but return failure if there are any fatal errors.
-.sp
-With \fB-v\fR, include informational messages regarding packages.
+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.
+.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
+Structured queries are supported with the following syntax:
+.sp
+.in +2
+.nf
+\fIpkg_name\fR:\fIaction_name\fR:\fIindex\fR:\fItoken\fR
+.fi
+.in -2
+
+The value of \fIaction_name\fR is one of the actions listed in "Actions" in the \fBpkg\fR(5) man page. The \fIindex\fR is an attribute of the action. The value of \fIindex\fR must match \fItoken\fR.
+.sp
+Not all action attributes are searchable. For example, \fBmode\fR is an attribute of the \fBfile\fR action, but \fBmode\fR is not a valid value for \fIindex\fR.
+.sp
+Some values for \fIindex\fR are not action attributes but are values derived from other attributes. For example, \fIindex\fR can be \fBbasename\fR, which is not an attribute of any action but is derived from the \fBpath\fR attribute of the \fBfile\fR or \fBdir\fR action by taking the last component of the path.
+.sp
+Different action types have different valid values for \fIindex\fR. This documentation does not list all possible values. Some of the more useful \fIindex\fR values are \fBbasename\fR and \fBpath\fR for file system actions, the dependency type (for example, \fBrequire\fR, \fBoptional\fR, \fBgroup\fR) for \fBdepend\fR actions, and \fBdriver_name\fR and \fBalias\fR for \fBdriver\fR actions.
+.sp
+One special value for \fIindex\fR is the value of a \fBname\fR attribute for a \fBset\fR action. In this case, \fItoken\fR is matched against the value of the \fBvalue\fR attribute that corresponds to the specified \fBname\fR attribute. For example, the following search finds packages that are classified as either Development/Databases or System/Databases. In the "Examples" section, see the example of finding SMF services.
+.sp
+.in +2
+.nf
+$ \fBpkg search info.classification:databases\fR
+.fi
+.in -2
+.sp
+
+Missing fields in a structured query are implicitly wildcarded. A search for \fBbasename:pkg\fR matches all actions in all packages that have an \fIindex\fR of \fBbasename\fR and that match the \fItoken\fR \fBpkg\fR, as shown in the following partial output:
+.sp
+.in +2
+.nf
+$ \fBpkg search basename:pkg\fR
+INDEX ACTION VALUE PACKAGE
+basename dir usr/share/pkg pkg:/package/[email protected]
+basename dir var/sadm/pkg pkg:/package/[email protected]
+basename dir var/spool/pkg pkg:/package/[email protected]
+basename file usr/bin/pkg pkg:/package/[email protected]
+.fi
+.in -2
+.sp
+
+Adding another field narrows the search, as shown in the following complete output:
+.sp
+.in +2
+.nf
+$ \fBpkg search file:basename:pkg\fR
+INDEX ACTION VALUE PACKAGE
+basename file usr/bin/pkg pkg:/package/[email protected]
+.fi
+.in -2
+.sp
+
+Explicit wildcards are supported in the \fIpkg_name\fR and \fItoken\fR fields. The \fIaction_name\fR and \fIindex\fR must match exactly.
+.sp
+See the "Examples" section for examples of searching for files and dependencies.
+.sp
+To convert actions to the packages that contain those actions, use \fB<>\fR, as shown in the following partial output:
+.sp
+.in +2
+.nf
+$ \fBpkg search \e<pkg\e>\fR
+PACKAGE PUBLISHER
+pkg:/package/[email protected] solaris
+pkg:/package/[email protected] solaris
+.fi
+.in -2
+.sp
+
+With the \fB-a\fR option (and by default), searching for \fBtoken\fR results in information about the actions that match \fBtoken\fR, while searching for \fB<token>\fR results in a list of packages that contain actions that match \fBtoken\fR.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBfix\fR [\fB--accept\fR] [\fB--licenses\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg verify\fR [\fB-Hqv\fR] [\fIpkg_fmri_pattern\fR ...]\fR
.ad
.sp .6
.RS 4n
-Fix any errors reported by \fBpkg verify\fR. Verification of installed package content is based on a custom content analysis that might return different results than those of other programs.
-.sp
-With \fB--accept\fR, you indicate that you agree to and accept the terms of the licenses of the packages that are updated or installed. If you do not provide this option, and any package licenses require acceptance, the operation fails.
-.sp
-With \fB--licenses\fR, display all of the licenses for the packages to be installed or updated as part of this operation.
+Validate the installation of all packages installed in the current image. If current signature policy for related publishers is not \fBignore\fR, the signatures of each package are validated based on policy. See \fBsignature-policy\fR in "Image Properties" below for an explanation of how signature policies are applied.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
+.ad
+.sp .6
+.RS 4n
+Validate the installation of only the specified packages installed in the current image.
.RE
.sp
.ne 2
.mk
.na
-\fBrevert\fR [\fB-nv\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] (\fB--tagged\fR \fItag-name\fR ... | \fIpath-to-file\fR ...)\fR
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the verification output.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-q\fR\fR
.ad
.sp .6
.RS 4n
-Revert files to their as-delivered condition. Either all files tagged with a particular value, or individual files can be reverted. File ownership and protections are also restored.
-.LP
-Caution -
-.sp
-.RS 2
-Reverting some editable files to their default values can make the system unbootable, or cause other malfunctions.
+Print nothing, but return failure if there are any fatal errors.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-v\fR\fR
+.ad
+.sp .6
+.RS 4n
+Include informational messages regarding packages.
+.RE
+
.RE
-For all other options, refer to the \fBinstall\fR command above for usage and their effects.
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg fix\fR [\fB--accept\fR] [\fB--licenses\fR] [\fIpkg_fmri_pattern\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Fix any errors reported by \fBpkg verify\fR. Verification of installed package content is based on a custom content analysis that might return different results than those of other programs.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
+.ad
+.sp .6
+.RS 4n
+Fix errors reported by \fBpkg verify\fR for only the specified packages installed in the current image.
.RE
.sp
.ne 2
.mk
.na
-\fBmediator\fR [\fB-aH\fR] [\fB-F\fR \fIformat\fR] [\fImediator\fR ...]\fR
+\fB\fB--accept\fR\fR
.ad
.sp .6
.RS 4n
-Display the current selected version and/or implementation of all mediators, or with arguments, only the mediators specified.
-.sp
-With \fB-a\fR, list the mediations that can be set for currently installed packages.
-.sp
-With \fB-F\fR, specify an alternative output format. Currently, only \fBtsv\fR (Tab Separated Values) is valid.
-.sp
-With \fB-H\fR, omit the headers from the listing.
+Indicate that you agree to and accept the terms of the licenses of the packages that are updated or installed. If you do not provide this option, and any package licenses require acceptance, the operation fails.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--licenses\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display all of the licenses for the packages to be installed or updated as part of this operation.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBset-mediator\fR [\fB-nv\fR] [\fB-I\fR \fIimplementation\fR] [\fB-V\fR \fIversion\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fImediator\fR ...\fR
+\fB\fBpkg revert\fR [\fB-nv\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] (\fB--tagged\fR \fItag-name\fR ... | \fIpath-to-file\fR ...)\fR
.ad
.sp .6
.RS 4n
-Set the version and/or implementation for the specified mediators in the current image.
-.sp
-With \fB-I\fR, set the implementation of the mediated interface to use. By default, if no version is specified, all implementation versions are allowed. To specify an implementation with no version, append an at sign (@).
-.sp
-With \fB-V\fR, set the version of the mediated interface to use.
-.sp
-If the specified mediator version and/or implementation is not currently available, any links using the specified mediators are removed.
-.sp
-For all other options, refer to the \fBinstall\fR command above for their usage and effects.
+Revert files delivered by \fBpkg\fR(5) packages to their as-delivered condition. File ownership and protections are also restored.
+.LP
+Caution -
+.sp
+.RS 2
+Reverting some editable files to their default values can make the system unbootable, or cause other malfunctions.
+.RE
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--tagged\fR \fItag-name\fR\fR
+.ad
+.sp .6
+.RS 4n
+Revert all files tagged with \fItag-name\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpath-to-file\fR\fR
+.ad
+.sp .6
+.RS 4n
+Revert the specified files.
+.RE
+
+For all other options, see the \fBinstall\fR command above.
.RE
.sp
.ne 2
.mk
.na
-\fBunset-mediator\fR [\fB-nvIV\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fImediator\fR ...\fR
+\fB\fBpkg mediator\fR [\fB-aH\fR] [\fB-F\fR \fIformat\fR] [\fImediator\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Display the current selected version and/or implementation of all mediators.
+.sp
+.ne 2
+.mk
+.na
+\fB\fImediator\fR\fR
.ad
.sp .6
.RS 4n
-Revert the version and/or implementation of the specified mediators to the system default.
-.sp
-With \fB-I\fR, revert only the implementation of the mediated interface.
-.sp
-With \fB-V\fR, revert only the version of the mediated interface.
-.sp
-For all other options, refer to the \fBinstall\fR command above for their usage and effects.
+Display the current selected version and/or implementation of only the specified mediators.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-a\fR\fR
+.ad
+.sp .6
+.RS 4n
+List the mediations that can be set for currently installed packages.
.RE
.sp
.ne 2
.mk
.na
-\fBvariant\fR [\fB-H\fR] [\fIvariant_spec\fR]\fR
+\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
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
.ad
.sp .6
.RS 4n
-Display the current values of all variants, or with arguments, only the variants specified.
-.sp
-With \fB-H\fR, omit the headers from the listing.
+Omit the headers from the listing.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg set-mediator\fR [\fB-nv\fR] [\fB-I\fR \fIimplementation\fR] [\fB-V\fR \fIversion\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fImediator\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Set the version and/or implementation for the specified mediators in the current image.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-I\fR \fIimplementation\fR\fR
+.ad
+.sp .6
+.RS 4n
+Set the implementation of the mediated interface to use. By default, if no version is specified, all implementation versions are allowed. To specify an implementation with no version, append an at sign (@).
.RE
.sp
.ne 2
.mk
.na
-\fBchange-variant\fR [\fB-nvq\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIvariant_spec\fR=\fIinstance\fR ...\fR
+\fB\fB-V\fR \fIversion\fR\fR
.ad
.sp .6
.RS 4n
-Change the specified variants in the current image.
-.sp
-For option usage and effects, refer to the \fBinstall\fR command above.
+Set the version of the mediated interface to use.
+.RE
+
+If the specified mediator version and/or implementation is not currently available, any links using the specified mediators are removed.
+.sp
+For all other options, see the \fBinstall\fR command above.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg unset-mediator\fR [\fB-nvIV\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fImediator\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Revert the version and/or implementation of the specified mediators to the system default.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-I\fR\fR
+.ad
+.sp .6
+.RS 4n
+Revert only the implementation of the mediated interface.
.RE
.sp
.ne 2
.mk
.na
-\fBfacet\fR [\fB-H\fR] [\fIfacet_spec\fR]\fR
+\fB\fB-V\fR\fR
.ad
.sp .6
.RS 4n
-Without arguments, displays the current values of all facets. With arguments, evaluate whether each facet would be true or false and print the result.
-.sp
-With \fB-H\fR, omit the headers from the listing.
+Revert only the version of the mediated interface.
+.RE
+
+For all other options, see the \fBinstall\fR command above.
.RE
.sp
.ne 2
.mk
.na
-\fBchange-facet\fR [\fB-nvq\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIfacet_spec\fR=[True|False|None] ...\fR
+\fB\fBpkg variant\fR [\fB-H\fR] [\fBvariant.\fR\fIvariant_name\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Display the current values of all variants set in this image. See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about variants.
+.sp
+.ne 2
+.mk
+.na
+\fB\fBvariant.\fR\fIvariant_name\fR\fR
.ad
.sp .6
.RS 4n
-Change the specified facets in the current image.
-.sp
-Facets can be set to \fBTrue\fR or \fBFalse\fR. Setting one to \fBNone\fR removes that facet specification from the current image.
-.sp
-For option usage and effects, refer to the \fBinstall\fR command above.
+Display the current values of only the specified variants set in this image.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg change-variant\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR |\fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIvariant_name\fR=\fIvalue\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Change the values of the specified variants set in the current image.
+.sp
+Changing the value of a variant can cause package content to be removed, updated, or installed. Changing a variant value can also cause entire packages to be installed, updated, or removed to satisfy the new image configuration. See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about variants.
+.sp
+For descriptions of options, see the \fBinstall\fR command above.
.RE
.sp
.ne 2
.mk
.na
-\fBavoid\fR [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg facet\fR [\fB-H\fR] [\fIfacet_name\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Display the current values of all facets that have been explicitly set in this image by using the \fBpkg change-facet\fR command. See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about facets.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIfacet_name\fR\fR
.ad
.sp .6
.RS 4n
-Avoids the specified packages if they are the target of a group dependency by placing the package names that currently match the specified patterns on the avoid list. Only packages that are not currently installed can be avoided. If a package is currently the target of a group dependency, uninstalling the package places it on the avoid list.
-.sp
-Without any arguments, display each avoided package along with any packages that have a group dependency on that package.
-.sp
-Packages that are on the avoid list are installed if needed to satisfy a required dependency. If that dependency is removed, the package is uninstalled.
+Display the current values of only the specified facets set in this image.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBunavoid\fR [\fIpkg_fmri_pattern\fR ...]\fR
+\fB\fBpkg change-facet\fR [\fB-nvq\fR] [\fB-C\fR \fIn\fR] [\fB-g\fR \fIpath_or_uri\fR ...] [\fB--accept\fR] [\fB--licenses\fR] [\fB--no-be-activate\fR] [\fB--no-backup-be\fR | \fB--require-backup-be\fR] [\fB--backup-be-name\fR \fIname\fR] [\fB--deny-new-be\fR | \fB--require-new-be\fR] [\fB--be-name\fR \fIname\fR] \fIfacet_name\fR=[\fBTrue\fR|\fBFalse\fR|\fBNone\fR] ...\fR
+.ad
+.sp .6
+.RS 4n
+Change the values of the specified facets set in the current image.
+.sp
+Facets can be set to \fBTrue\fR or \fBFalse\fR. Setting a facet to \fBNone\fR applies the default value of \fBTrue\fR to that facet; thus, any actions subject to the facet will be installed. See "Actions" in the \fBpkg\fR(5) man page for information about actions.
+.sp
+Changing the value of a facet can cause package content to be removed, updated, or installed. Changing a facet value can also cause entire packages to be installed, updated, or removed to satisfy the new image configuration. See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about facets.
+.sp
+For descriptions of options, see the \fBinstall\fR command above.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg avoid\fR [\fIpkg_fmri_pattern\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Display each avoided package along with any packages that have a group dependency on that package.
+.sp
+Packages that are on the avoid list are installed if needed to satisfy a required dependency. If that dependency is removed, the package is uninstalled.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
+.ad
+.sp .6
+.RS 4n
+Avoid the specified packages if they are the target of a group dependency by placing the package names that currently match the specified patterns on the avoid list. Only packages that are not currently installed can be avoided. If a package is currently the target of a group dependency, uninstalling the package places it on the avoid list.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg unavoid\fR [\fIpkg_fmri_pattern\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Display the list of avoided packages.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
.ad
.sp .6
.RS 4n
Remove the specified packages from the avoid list. Packages on the avoid list that match an installed package's group dependency cannot be removed using this subcommand. To remove a package from the avoid list that matches a group dependency, install the package.
-.sp
-Without any arguments, display the list of avoided packages.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBfreeze\fR [\fB-n\fR] [\fB-c\fR \fIreason\fR] [\fIpkg_fmri_pattern\fR] ...\fR
+\fB\fBpkg freeze\fR [\fB-n\fR] [\fB-c\fR \fIreason\fR] [\fIpkg_fmri_pattern\fR] \&...\fR
+.ad
+.sp .6
+.RS 4n
+Display information about currently frozen packages: package names, versions, when the package was frozen, and any associated reasons for freezing the packages.
+.sp
+Freezing a package does not prevent removal of the package. No warning is displayed if the package is removed.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
.ad
.sp .6
.RS 4n
-Freeze the specified packages to the versions specified. If no version is given, the package must be installed and is frozen at that installed version. When a package that is frozen is installed or updated, it must end up at a version that matches the version at which it was frozen. For example, if a package was frozen at 1.2, then it could be updated to 1.2.1, 1.2.9, 1.2.0.0.1, and so on. That package could not end up at 1.3, or 1.1. A publisher presented in the \fIpkg_fmri_pattern\fR is used to find matching packages. However, publisher information is not recorded as part of the freeze. A package is frozen with respect to its version only, not its publisher. Freezing a package that is already frozen replaces the freeze version with the newly specified version.
-.sp
-If no packages are provided, information about currently frozen packages is displayed: package names, versions, when the package was frozen, and any associated reasons.
-.sp
-Freezing a package does not prevent removal of the package. No warning is displayed if the package is removed.
-.sp
-With \fB-c\fR, record the \fIreason\fR with the packages that are frozen. The reason is shown if a freeze prevents an installation or update from succeeding.
-.sp
-With \fB-n\fR, perform a trial run of the operation, displaying the list of packages that would be frozen without freezing any packages.
+Freeze the specified packages to the specified versions. If no version is given, the package must be installed and is frozen at that installed version. Freezing a package that is already frozen replaces the freeze version with the newly specified version.
+.sp
+When a package that is frozen is installed or updated, it must end up at a version that matches the version at which it was frozen. For example, if a package was frozen at 1.2, then it could be updated to 1.2.1, 1.2.9, 1.2.0.0.1, and so on. That package could not end up at 1.3, or 1.1. A publisher presented in the \fIpkg_fmri_pattern\fR is used to find matching packages. However, publisher information is not recorded as part of the freeze. A package is frozen with respect to its version only, not its publisher.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-c\fR \fIreason\fR\fR
+.ad
+.sp .6
+.RS 4n
+Record the \fIreason\fR with the packages that are frozen. The reason is shown if a freeze prevents an installation or update from succeeding.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform a trial run of the freeze operation, displaying the list of packages that would be frozen without freezing any packages.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBunfreeze\fR [\fB-n\fR] [\fIpkg_name_pattern\fR] ...\fR
+\fB\fBpkg unfreeze\fR [\fB-n\fR] [\fIpkg_name_pattern\fR] ...\fR
+.ad
+.sp .6
+.RS 4n
+Display information about currently frozen packages: package names, versions, when the package was frozen, and any associated reasons for freezing the packages.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpkg_fmri_pattern\fR\fR
.ad
.sp .6
.RS 4n
Remove the constraints that freezing imposes from the specified packages. Any versions provided are ignored.
-.sp
-With \fB-n\fR, perform a trial run of the unfreeze, displaying the list of packages that would be unfrozen without unfreezing any packages.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform a trial run of the unfreeze operation, displaying the list of packages that would be unfrozen without unfreezing any packages.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBproperty\fR [\fB-H\fR] [\fIpropname\fR ...]\fR
+\fB\fBpkg property\fR [\fB-H\fR] [\fIpropname\fR ...]\fR
.ad
.sp .6
.RS 4n
-Display image property information. With no argument, display the names and values for all image properties. If a specific list of property names is requested, display the names and values for those properties.
-.sp
-With \fB-H\fR, omit the headers from the listing.
+Display the names and values of all image properties. See "Image Properties" below for descriptions of image properties.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpropname\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display the names and values for only the specified properties.
.RE
.sp
.ne 2
.mk
.na
-\fBset-property\fR \fIpropname\fR \fIpropvalue\fR
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg set-property\fR \fIpropname\fR \fIpropvalue\fR\fR
.ad
.sp .6
.RS 4n
@@ -892,7 +1809,7 @@
.ne 2
.mk
.na
-\fBadd-property-value\fR \fIpropname\fR \fIpropvalue\fR
+\fB\fBpkg add-property-value\fR \fIpropname\fR \fIpropvalue\fR\fR
.ad
.sp .6
.RS 4n
@@ -903,7 +1820,7 @@
.ne 2
.mk
.na
-\fBremove-property-value\fR \fIpropname\fR \fIpropvalue\fR
+\fB\fBpkg remove-property-value\fR \fIpropname\fR \fIpropvalue\fR\fR
.ad
.sp .6
.RS 4n
@@ -914,7 +1831,7 @@
.ne 2
.mk
.na
-\fBunset-property\fR \fIpropname\fR ...\fR
+\fB\fBpkg unset-property\fR \fIpropname\fR ...\fR
.ad
.sp .6
.RS 4n
@@ -925,110 +1842,451 @@
.ne 2
.mk
.na
-\fBpublisher\fR [\fB-HPn\fR] [\fIpublisher\fR ...]\fR
+\fB\fBpkg publisher\fR [\fB-HPn\fR] [\fB-F\fR \fIformat\fR] [\fIpublisher\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Display the list of all publishers, their origin URIs, and mirrors in order of search preference.
+.sp
+.ne 2
+.mk
+.na
+\fB\fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display detailed configuration for only the specified publishers.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-P\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display only the first publisher in the publisher search order.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
+.ad
+.sp .6
+.RS 4n
+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
+.ne 2
+.mk
+.na
+\fB\fBpkg set-publisher\fR [\fB-Ped\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB-g\fR \fIorigin_to_add\fR | \fB--add-origin\fR \fIorigin_to_add\fR ...] [\fB-G\fR \fIorigin_to_remove\fR | \fB--remove-origin\fR \fIorigin_to_remove\fR ...] [\fB-m\fR \fImirror_to_add\fR | \fB--add-mirror\fR \fImirror_to_add\fR ...] [\fB-M\fR \fImirror_to_remove\fR | \fB--remove-mirror\fR \fImirror_to_remove\fR ...] [\fB--enable\fR] [\fB--disable\fR] [\fB--no-refresh\fR] [\fB--reset-uuid\fR] [\fB--non-sticky\fR] [\fB--sticky\fR] [\fB--search-after\fR \fIpublisher\fR] [\fB--search-before\fR \fIpublisher\fR] [\fB--search-first\fR] [\fB--approve-ca-cert\fR \fIpath_to_CA\fR] [\fB--revoke-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--unset-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--add-property-value\fR \fIname_of_property\fR=\fIvalue_to_add\fR] [\fB--remove-property-value\fR \fIname_of_property\fR=\fIvalue_to_remove\fR] [\fB--unset-property\fR \fIname_of_property_to_delete\fR] \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Update an existing publisher or add a publisher. If no options affecting search order are specified, new publishers are appended to the search order and are thus searched last.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-P\fR\fR
+.ad
+.br
+.na
+\fB\fB--search-first\fR\fR
+.ad
+.sp .6
+.RS 4n
+Set the specified publisher first in the search order. When installing new packages, this publisher is searched first. Updates to already installed packages come from the same publisher that originally provided the package as long as that publisher remains sticky.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--non-sticky\fR\fR
+.ad
+.sp .6
+.RS 4n
+Higher ranked publishers than this one can provide updates to packages originally installed from this publisher.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--sticky\fR\fR
.ad
.sp .6
.RS 4n
-Display publisher information. With no arguments, display the list of all publishers, their origin URIs, and mirrors in order of search preference. If specific publishers are requested, display detailed configuration for those publishers.
-.sp
-With \fB-H\fR, omit the headers from the listing.
-.sp
-With \fB-P\fR, display only the first publisher in the publisher search order.
-.sp
-With \fB-n\fR, display only enabled publishers.
+Updates to packages that were installed from this publisher must also come from this publisher. This is the default behavior.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--search-before\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Alter the publisher search order so that the publisher being added or modified is searched before the publisher specified in this option.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--search-after\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Alter the publisher search order so that the publisher being added or modified is searched after the publisher specified in this option.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--approve-ca-cert\fR \fIpath_to_CA\fR\fR
+.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.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--revoke-ca-cert\fR \fIhash_of_CA_to_remove\fR\fR
+.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.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--unset-ca-cert\fR \fIhash_of_CA_to_remove\fR\fR
+.ad
+.sp .6
+.RS 4n
+Remove the certificate with the given hash from the list of approved certificates and the list of revoked certificates.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR\fR
+.ad
+.sp .6
+.RS 4n
+Update an existing publisher property or add a new publisher property.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--add-property-value\fR \fIname_of_property\fR=\fIvalue_to_add\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add a value to an existing publisher property or add a new publisher property.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--remove-property-value\fR \fIname_of_property\fR=\fIvalue_to_remove\fR\fR
+.ad
+.sp .6
+.RS 4n
+Remove a value from an existing publisher property.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--unset-property\fR \fIname_of_property_to_delete\fR\fR
+.ad
+.sp .6
+.RS 4n
+Remove an existing publisher property.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-k\fR \fIssl_key\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify the client SSL key.
.RE
.sp
.ne 2
.mk
.na
-\fBset-publisher\fR [\fB-Ped\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB-g\fR \fIorigin_to_add\fR | \fB--add-origin\fR \fIorigin_to_add\fR ...] [\fB-G\fR \fIorigin_to_remove\fR | \fB--remove-origin\fR \fIorigin_to_remove\fR ...] [\fB-m\fR \fImirror_to_add\fR | \fB--add-mirror\fR \fImirror_to_add\fR ...] [\fB-M\fR \fImirror_to_remove\fR | \fB--remove-mirror\fR \fImirror_to_remove\fR ...] [\fB-p\fR \fIrepo_uri\fR] [\fB--enable\fR] [\fB--disable\fR] [\fB--no-refresh\fR] [\fB--reset-uuid\fR] [\fB--non-sticky\fR] [\fB--sticky\fR] [\fB--search-after\fR \fIpublisher\fR] [\fB--search-before\fR \fIpublisher\fR] [\fB--search-first\fR] [\fB--approve-ca-cert\fR \fIpath_to_CA\fR] [\fB--revoke-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--unset-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--add-property-value\fR \fIname_of_property\fR=\fIvalue_to_add\fR] [\fB--remove-property-value\fR \fIname_of_property\fR=\fIvalue_to_remove\fR] [\fB--unset-property\fR \fIname_of_property_to_delete\fR] [\fIpublisher\fR]\fR
+\fB\fB-c\fR \fIssl_cert\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify the client SSL certificate.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-g\fR \fIorigin_to_add\fR\fR
+.ad
+.br
+.na
+\fB\fB--add-origin\fR \fIorigin_to_add\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add the specified URI or path as an origin for the given publisher. This should be the location of a package repository or archive.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-G\fR \fIorigin_to_remove\fR\fR
+.ad
+.br
+.na
+\fB\fB--remove-origin\fR \fIorigin_to_remove\fR\fR
+.ad
+.sp .6
+.RS 4n
+Remove the URI or path from the list of origins for the given publisher. The special value \fB*\fR can be used to remove all origins.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--no-refresh\fR\fR
.ad
.sp .6
.RS 4n
-Update an existing publisher or add a package publisher. If no options affecting search order are specified, new publishers are appended to the search order and are thus searched last.
-.sp
-With \fB-P\fR or \fB--search-first\fR, set the specified publisher first in the search order. When installing new packages, this publisher is searched first. Updates to already installed packages come from the same publisher that originally provided the package as long as that publisher remains sticky. When \fB-P\fR or \fB--search-first\fR is used with \fB-p\fR, only added publishers are placed first in search order.
-.sp
-With \fB--non-sticky\fR, specify that higher ranked publishers than this one can provide updates to packages originally installed from this publisher.
-.sp
-With \fB--sticky\fR, specify that updates to packages that were installed from this publisher must also come from this publisher. This is the default behavior.
-.sp
-With \fB--search-before\fR, alter the publisher search order so that the publisher being modified is searched before the specified publisher. When used with \fB-p\fR, \fB--search-before\fR only applies to added publishers.
-.sp
-With \fB--search-after\fR, alter the publisher search order so that the publisher being modified is searched after the specified publisher. When used with \fB-p\fR, \fB--search-after\fR only applies to added publishers.
-.sp
-With \fB--approve-ca-cert\fR, add the given 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.
-.sp
-With \fB--revoke-ca-cert\fR, 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.
-.sp
-With \fB--unset-ca-cert\fR, remove the certificate with the given hash from the list of approved certificates and the list of revoked certificates.
-.sp
-With \fB--set-property\fR, update an existing publisher property or add a new publisher property.
-.sp
-With \fB--add-property-value\fR, add a value to an existing publisher property or add a new publisher property.
-.sp
-With \fB--remove-property-value\fR, remove a value from an existing publisher property.
-.sp
-With \fB--unset-property\fR, remove an existing publisher property.
-.sp
-With \fB-c\fR and \fB-k\fR, specify client SSL certificate and key respectively.
-.sp
-With \fB-g\fR (\fB--add-origin\fR), add the specified URI or path as an origin for the given publisher. This should be the location of a package repository or archive.
-.sp
-With \fB-G\fR (\fB--remove-origin\fR), remove the URI or path from the list of origins for the given publisher. The special value \fB*\fR can be used to remove all origins.
-.sp
-With \fB--no-refresh\fR, do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages and other metadata.
-.sp
-With \fB--reset-uuid\fR, choose a new unique identifier that identifies this image to its publisher.
-.sp
-With \fB-m\fR (\fB--add-mirror\fR), add the URI as a mirror for the given publisher.
-.sp
-With \fB-M\fR (\fB--remove-mirror\fR), remove the URI from the list of mirrors for the given publisher. The special value \fB*\fR can be used to remove all mirrors.
-.sp
-With \fB-p\fR, retrieve publisher configuration information from the specified repository URI. If a publisher is specified, then only the matching publisher is added or updated. If no publisher is specified, all publishers are added or updated as appropriate. This option cannot be combined with the \fB-g\fR, \fB--add-origin\fR, \fB--G\fR, \fB--remove-origin\fR, \fB-m\fR, \fB--add-mirror\fR, \fB-M\fR, \fB--remove-mirror\fR, \fB--disable\fR, \fB--enable\fR, \fB--no-refresh\fR, or \fB--reset-uuid\fR options.
-.sp
-With \fB-e\fR (\fB--enable\fR), enable the publisher. With \fB-d\fR (\fB--disable\fR), disable the publisher. A disabled publisher is not used when populating the package list or in certain package operations (install, uninstall, and update). However, the properties for a disabled publisher can still be set and viewed. If only one publisher exists, it cannot be disabled.
+Do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages and other metadata.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--reset-uuid\fR\fR
+.ad
+.sp .6
+.RS 4n
+Choose a new unique identifier that identifies this image to its publisher.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-m\fR \fImirror_to_add\fR\fR
+.ad
+.br
+.na
+\fB\fB--add-mirror\fR \fImirror_to_add\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add the URI as a mirror for the given publisher.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-M\fR \fImirror_to_remove\fR\fR
+.ad
+.br
+.na
+\fB\fB--remove-mirror\fR \fImirror_to_remove\fR\fR
+.ad
+.sp .6
+.RS 4n
+Remove the URI from the list of mirrors for the given publisher. The special value \fB*\fR can be used to remove all mirrors.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-e\fR\fR
+.ad
+.br
+.na
+\fB\fB--enable\fR\fR
+.ad
+.sp .6
+.RS 4n
+Enable the publisher.
.RE
.sp
.ne 2
.mk
.na
-\fBunset-publisher\fR \fIpublisher\fR ...\fR
+\fB\fB-d\fR\fR
+.ad
+.br
+.na
+\fB\fB--disable\fR\fR
.ad
.sp .6
.RS 4n
-Remove the configuration associated with the given publisher or publishers.
+Disable the publisher. A disabled publisher is not used when populating the package list or in certain package operations (install, uninstall, and update). However, the properties for a disabled publisher can still be set and viewed. If only one publisher exists, it cannot be disabled.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg set-publisher\fR \fB-p\fR \fIrepo_uri\fR [\fB-Ped\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB--non-sticky\fR] [\fB--sticky\fR] [\fB--search-after\fR \fIpublisher\fR] [\fB--search-before\fR \fIpublisher\fR] [\fB--search-first\fR] [\fB--approve-ca-cert\fR \fIpath_to_CA\fR] [\fB--revoke-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--unset-ca-cert\fR \fIhash_of_CA_to_remove\fR] [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--add-property-value\fR \fIname_of_property\fR=\fIvalue_to_add\fR] [\fB--remove-property-value\fR \fIname_of_property\fR=\fIvalue_to_remove\fR] [\fB--unset-property\fR \fIname_of_property_to_delete\fR] [\fIpublisher\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Retrieve publisher configuration information from the \fIrepo_uri\fR repository URI.
+.sp
+If a publisher operand is specified to this \fBset-publisher\fR subcommand, then only that publisher is added or updated. If no publisher is specified, all publishers in \fIrepo_uri\fR are added or updated as appropriate.
+.sp
+For descriptions of options, see the \fBset-publisher\fR command above. When used with \fB-p\fR, the \fB-P\fR, \fB--search-first\fR, \fB--search-before\fR, and \fB--search-after\fR options only apply to added publishers, not to updated publishers.
+.sp
+The \fB-p\fR option cannot be combined with the \fB-g\fR, \fB--add-origin\fR, \fB-G\fR, \fB--remove-origin\fR, \fB-m\fR, \fB--add-mirror\fR, \fB-M\fR, \fB--remove-mirror\fR, \fB--disable\fR, \fB--enable\fR, \fB--no-refresh\fR, or \fB--reset-uuid\fR options.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg unset-publisher\fR \fIpublisher\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Remove the configuration associated with the specified publisher or publishers.
.RE
.sp
.ne 2
.mk
.na
-\fBhistory\fR [\fB-Hl\fR] [\fB-t\fR [\fItime\fR | \fItime\fR-\fItime\fR],...] [\fB-o\fR \fIcolumn\fR,...] [\fB-n\fR \fInumber\fR]\fR
+\fB\fBpkg history\fR [\fB-Hl\fR] [\fB-t\fR [\fItime\fR | \fItime\fR-\fItime\fR],...] [\fB-o\fR \fIcolumn\fR,...] [\fB-n\fR \fInumber\fR]\fR
.ad
.sp .6
.RS 4n
Display the command history of the applicable image.
.sp
-With \fB-H\fR, omit the headers from the listing.
-.sp
-With \fB-t\fR, display log records for a comma-separated list of timestamps, formatted with \fB%Y-%m-%dT%H:%M:%S\fR (see \fBstrftime\fR(3C)). To specify a range of times, use a hyphen (-) between a start and finish timestamp. The keyword \fBnow\fR can be used as an alias for the current time. If the timestamps specified contain duplicate timestamps or overlapping date ranges, only a single instance of each duplicate history event is printed.
-.sp
-With \fB-l\fR, display log records in long format, which, in addition to the standard format, includes the outcome of the command, the time the command completed, the version and name of the client used, the name of the user who performed the operation, and any errors that were encountered while executing the command.
-.sp
-With \fB-n\fR, display only the specified number of most recent entries.
-.sp
-With \fB-o\fR, display output using the specified comma-separated list of column names. Valid column names are:
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-t\fR \fItime\fR\fR
+.ad
+.br
+.na
+\fB\fB-t\fR \fItime\fR-\fItime\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display log records for a comma-separated list of timestamps, formatted with \fB%Y-%m-%dT%H:%M:%S\fR (see \fBstrftime\fR(3C)). To specify a range of times, use a hyphen (-) between a start and finish timestamp. The keyword \fBnow\fR can be used as an alias for the current time. If the timestamps specified contain duplicate timestamps or overlapping date ranges, only a single instance of each duplicate history event is printed.
+.RE
+
.sp
.ne 2
.mk
.na
-\fBbe\fR
+\fB\fB-l\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display log records in long format, which, in addition to the standard format, includes the outcome of the command, the time the command completed, the version and name of the client used, the name of the user who performed the operation, and any errors that were encountered while executing the command.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-n\fR \fInumber\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
+Display only the specified number of most recent entries.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-o\fR \fIcolumn\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display output using the specified comma-separated list of column names. Valid column names are:
+.sp
+.ne 2
+.mk
+.na
+\fB\fBbe\fR\fR
+.ad
+.sp .6
+.RS 4n
The name of the boot environment this operation was started on.
.RE
@@ -1036,10 +2294,10 @@
.ne 2
.mk
.na
-\fBbe_uuid\fR
+\fB\fBbe_uuid\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The \fBuuid\fR of the boot environment this operation was started on.
.RE
@@ -1047,10 +2305,10 @@
.ne 2
.mk
.na
-\fBclient\fR
+\fB\fBclient\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The name of the client.
.RE
@@ -1058,10 +2316,10 @@
.ne 2
.mk
.na
-\fBclient_ver\fR
+\fB\fBclient_ver\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The version of the client.
.RE
@@ -1069,10 +2327,10 @@
.ne 2
.mk
.na
-\fBcommand\fR
+\fB\fBcommand\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The command line used for this operation.
.RE
@@ -1080,10 +2338,10 @@
.ne 2
.mk
.na
-\fBfinish\fR
+\fB\fBfinish\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The time that this operation finished.
.RE
@@ -1091,10 +2349,10 @@
.ne 2
.mk
.na
-\fBid\fR
+\fB\fBid\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The user id that started this operation.
.RE
@@ -1102,10 +2360,10 @@
.ne 2
.mk
.na
-\fBnew_be\fR
+\fB\fBnew_be\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The new boot environment created by this operation.
.RE
@@ -1113,10 +2371,10 @@
.ne 2
.mk
.na
-\fBnew_be_uuid\fR
+\fB\fBnew_be_uuid\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The \fBuuid\fR of the new boot environment created by this operation.
.RE
@@ -1124,10 +2382,10 @@
.ne 2
.mk
.na
-\fBoperation\fR
+\fB\fBoperation\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The name of the operation.
.RE
@@ -1135,10 +2393,10 @@
.ne 2
.mk
.na
-\fBoutcome\fR
+\fB\fBoutcome\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
A summary of the outcome of this operation.
.RE
@@ -1146,10 +2404,10 @@
.ne 2
.mk
.na
-\fBreason\fR
+\fB\fBreason\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
Additional information on the outcome of this operation.
.RE
@@ -1157,10 +2415,10 @@
.ne 2
.mk
.na
-\fBsnapshot\fR
+\fB\fBsnapshot\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The snapshot taken during this operation. This is only recorded if the snapshot was not automatically removed after successful operation completion.
.RE
@@ -1168,10 +2426,10 @@
.ne 2
.mk
.na
-\fBstart\fR
+\fB\fBstart\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The time that this operation started.
.RE
@@ -1179,21 +2437,21 @@
.ne 2
.mk
.na
-\fBtime\fR
+\fB\fBtime\fR\fR
.ad
-.RS 15n
-.rt
-The total time taken to perform this operation. For operations that take less than a second, 0:00:00 is shown).
+.sp .6
+.RS 4n
+The total time taken to perform this operation. For operations that take less than one second, 0:00:00 is shown.
.RE
.sp
.ne 2
.mk
.na
-\fBuser\fR
+\fB\fBuser\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The username that started this operation.
.RE
@@ -1204,84 +2462,148 @@
The values for \fBbe\fR and \fBnew_be\fR are obtained by looking up the current boot environment name, using the \fBbe_uuid\fR or \fBnew_be_uuid\fR fields. If a boot environment was subsequently renamed, and later deleted, the values displayed for \fBbe\fR and \fBnew_be\fR are the values recorded at the time of the \fBpkg\fR operation.
.RE
+.RE
+
.sp
.ne 2
.mk
.na
-\fBpurge-history\fR
+\fB\fBpkg purge-history\fR\fR
.ad
.sp .6
.RS 4n
-Deletes all existing history information.
+Delete all existing history information.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg rebuild-index\fR\fR
+.ad
+.sp .6
+.RS 4n
+Rebuild the index used by \fBpkg search\fR. This is a recovery operation not intended for general use.
.RE
.sp
.ne 2
.mk
.na
-\fBrebuild-index\fR
+\fB\fBpkg update-format\fR\fR
.ad
.sp .6
.RS 4n
-Rebuilds the index used by \fBpkg search\fR. This is a recovery operation not intended for general use.
+Update the format of the image to the current version. Once this operation has completed, the image can no longer be used with older versions of the \fBpkg\fR(5) system.
.RE
.sp
.ne 2
.mk
.na
-\fBupdate-format\fR
+\fB\fBpkg version\fR\fR
.ad
.sp .6
.RS 4n
-Updates the format of the image to the current version. Once this operation has completed, the image can no longer be used with older versions of the \fBpkg\fR(5) system.
+Display a unique string identifying the version of \fBpkg\fR. This string is not guaranteed to be comparable in any fashion between versions.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkg help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
.RE
.sp
.ne 2
.mk
.na
-\fBversion\fR
+\fB\fBpkg image-create\fR [\fB-FPUz\fR] [\fB-f\fR |\fB--force\fR] [\fB--full\fR | \fB--partial\fR | \fB--user\fR] [\fB--zone\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB--no-refresh\fR] [\fB--variant\fR \fIvariant_name\fR=\fIvalue\fR ...] [\fB-g\fR \fIpath_or_uri\fR | \fB--origin\fR \fIpath_or_uri\fR ...] [\fB-m\fR \fIuri\fR | \fB--mirror\fR \fIuri\fR ...] [\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR] [\fB--facet\fR \fIfacet_name\fR=(\fBTrue\fR|\fBFalse\fR) \&...] [(\fB-p\fR | \fB--publisher\fR) [\fIname\fR=]\fIrepo_uri\fR] \fIdir\fR\fR
.ad
.sp .6
.RS 4n
-Display a unique string identifying the version of \fBpkg\fR(1). This string is not guaranteed to be comparable in any fashion between versions.
+At the location given by \fIdir\fR, create an image suitable for package operations. The default image type is user, as given by the \fB-U\fR (\fB--user\fR) option. The image type can be set to a full image (\fB--F\fR or \fB--full\fR) or to a partial image (\fB-P\fR or \fB--partial\fR) linked to the full image enclosing the given \fIdir\fR path. Additional origins can be specified using \fB-g\fR or \fB--origin\fR. Additional mirrors can be specified using \fB-m\fR or \fB--mirror\fR.
+.sp
+A package repository URI must be provided using the \fB-p\fR or \fB--publisher\fR option. If a publisher name is also provided, then only that publisher is added when the image is created. If a publisher name is not provided, then all publishers known by the specified repository are added to the image. An attempt to retrieve the catalog associated with this publisher is made following the initial creation operations.
+.sp
+For publishers using client SSL authentication, a client key and client certificate can be registered via the \fB-c\fR and \fB-k\fR options. This key and certificate are used for all publishers added during image creation.
+.sp
+If the image is to be run within non-global zone context, then the \fB-z\fR (\fB--zone\fR) option can be used to set an appropriate variant.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-f\fR\fR
+.ad
+.br
+.na
+\fB\fB--force\fR\fR
+.ad
+.sp .6
+.RS 4n
+Force the creation of an image over an existing image. This option should be used with care.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--no-refresh\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages and other metadata.
.RE
.sp
.ne 2
.mk
.na
-\fBimage-create\fR [\fB-FPUfz\fR] [\fB--force\fR] [\fB--full\fR | \fB--partial\fR | \fB--user\fR] [\fB--zone\fR] [\fB-k\fR \fIssl_key\fR] [\fB-c\fR \fIssl_cert\fR] [\fB--no-refresh\fR] [\fB--variant\fR \fIvariant_spec\fR=\fIinstance\fR ...] [\fB-g\fR \fIpath_or_uri\fR | \fB--origin\fR \fIpath_or_uri\fR ...] [\fB-m\fR \fIuri\fR | \fB--mirror\fR \fIuri\fR ...] [\fB--facet\fR \fIfacet_spec\fR=(True|False) \&...] [(\fB-p\fR | \fB--publisher\fR) [\fIname\fR=]\fIrepo_uri\fR] \fIdir\fR
+\fB\fB--variant\fR \fIvariant_name\fR=\fIvalue\fR\fR
+.ad
+.sp .6
+.RS 4n
+Set the specified variant to the indicated value. See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about variants.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--facet\fR \fIfacet_name\fR=(\fBTrue\fR|\fBFalse\fR)\fR
.ad
.sp .6
.RS 4n
-At the location given by \fIdir\fR, create an image suitable for package operations. The default image type is user, as given by the \fB-U\fR (\fB--user\fR) option. The image type can be set to a full image (\fB--F\fR or \fB--full\fR) or to a partial image (\fB-P\fR or \fB--partial\fR) linked to the full image enclosing the given \fIdir\fR path. Additional origins can be specified using \fB-g\fR or \fB--origin\fR. Additional mirrors can be specified using \fB--m\fR or \fB--mirror\fR.
-.sp
-A package repository URI must be provided using the \fB-p\fR or \fB--publisher\fR option. If a publisher name is also provided, then only that publisher is added when the image is created. If a publisher name is not provided, then all publishers known by the specified repository are added to the image. An attempt to retrieve the catalog associated with this publisher is made following the initial creation operations.
-.sp
-For publishers using client SSL authentication, a client key and client certificate can be registered via the \fB-c\fR and \fB-k\fR options. This key and certificate are used for all publishers added during image creation.
-.sp
-If the image is to be run within non-global zone context, then the \fB-z\fR (\fB--zone\fR) option can be used to set an appropriate variant.
-.sp
-With \fB-f\fR (\fB--force\fR), force the creation of an image over an existing image. This option should be used with care.
-.sp
-With \fB--no-refresh\fR, do not attempt to contact the repositories for the image's publishers to retrieve the newest list of available packages and other metadata.
-.sp
-With \fB--variant\fR, set the specified variant to the indicated value.
-.sp
-With \fB--facet\fR, set the specified facet to the indicated value.
+Set the specified facet to the indicated value. See "Facets and Variants" in the \fBpkg\fR(5) man page for more information about facets.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--set-property\fR \fIname_of_property\fR=\fIvalue\fR\fR
+.ad
+.sp .6
+.RS 4n
+Set the specified image property to the indicated value. See "Image Properties" below for descriptions of image properties.
+.RE
+
.RE
.SH IMAGE PROPERTIES
.sp
.LP
-The following properties are part of the image and can be set using the \fBset-property\fR subcommand. The values of these properties are viewable with the \fBproperty\fR subcommand.
+The following properties define characteristics of the image. These properties store information about the purpose, content, and behavior of the image. To view the current values of these properties in the image, use the \fBpkg property\fR command. To modify the values of these properties, use the \fBpkg set-property\fR and \fBpkg unset-property\fR commands.
.sp
.ne 2
.mk
.na
-\fBbe-policy\fR
+\fB\fBbe-policy\fR\fR
.ad
.sp .6
.RS 4n
@@ -1290,57 +2612,59 @@
.ne 2
.mk
.na
-\fBdefault\fR
+\fB\fBdefault\fR\fR
.ad
-.RS 22n
-.rt
-Apply the default BE creation policy, currently 'create-backup'.
+.sp .6
+.RS 4n
+Apply the default boot environment creation policy, \fBcreate-backup\fR.
.RE
.sp
.ne 2
.mk
.na
-\fBalways-new\fR
+\fB\fBalways-new\fR\fR
.ad
-.RS 22n
-.rt
-Requires a reboot for all package operations by performing them in a new BE set as active on the next boot. A backup BE will never be created unless explicitly requested.
-.sp
-This policy is the safest, but is more strict than most sites need, as no packages can be added without a reboot.
+.sp .6
+.RS 4n
+Requires a reboot for all package operations by performing them in a new boot environment set as active on the next boot. A backup bootnvironment is not created unless explicitly requested.
+.sp
+This policy is the safest, but is more strict than most sites need since no packages can be added without a reboot.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBcreate-backup\fR
+\fB\fBcreate-backup\fR\fR
.ad
-.RS 22n
-.rt
-For package operations that require a reboot, a new BE will be created and set as active on the next boot. If packages are modified or content that could affect the kernel are installed and the operation affects the live BE, a backup BE will be created but will not be set as active. A backup BE may also be explicitly requested.
-.sp
-This policy is potentially risky only if newly installed software causes system instability, which is possible, but relatively rare.
+.sp .6
+.RS 4n
+For package operations that require a reboot, a new bootironment is created and set as active on the next boot. If packages are modified or content that could affect the kernel is installed and the operation affects the live boot environment, a backup boot environment is created but not set as active. A backup boot environment can also be explicitly requested.
+.sp
+This policy is potentially risky only if newly installed software causes system instability, which is possible but relatively rare.
.RE
.sp
.ne 2
.mk
.na
-\fBwhen-required\fR
+\fB\fBwhen-required\fR\fR
.ad
-.RS 22n
-.rt
-For package operations that require a reboot, a new BE will be created and set as active on the next boot. A backup BE will never be created unless explicitly requested.
-.sp
-This policy carries the greatest risk since if a packaging change to the live BE makes further changes impossible, there may be no recent BE to which one can fallback.
+.sp .6
+.RS 4n
+For package operations that require a reboot, a new boot environment is created and set as active on the next boot. A backup boot environment is not created unless explicitly requested.
+.sp
+This policy carries the greatest risk since if a packaging change to the live boot environment makes further changes impossible, there might be no recent boot environment to which one can fallback.
.RE
.sp
.ne 2
.mk
.na
-\fBca-path\fR
+\fB\fBca-path\fR\fR
.ad
.sp .6
.RS 4n
@@ -1353,11 +2677,11 @@
.ne 2
.mk
.na
-\fBcheck-certificate-revocation\fR
+\fB\fBcheck-certificate-revocation\fR\fR
.ad
.sp .6
.RS 4n
-(string) If this is set to True, the package client attempts to contact any CRL distribution points in the certificates used for signature verification to determine whether the certificate has been revoked since being issued.
+(boolean) If this is set to \fBTrue\fR, the package client attempts to contact any CRL distribution points in the certificates used for signature verification to determine whether the certificate has been revoked since being issued.
.sp
Default value: \fBFalse\fR
.RE
@@ -1366,11 +2690,11 @@
.ne 2
.mk
.na
-\fBflush-content-cache-on-success\fR
+\fB\fBflush-content-cache-on-success\fR\fR
.ad
.sp .6
.RS 4n
-(boolean) If this is set to True, the package client removes the files in its content-cache when install or update operations complete. For update operations, the content is removed only from the source BE. When a packaging operation next occurs in the destination BE, the package client flushes its content cache if this option has not been changed.
+(boolean) If this is set to \fBTrue\fR, the package client removes the files in its content-cache when install or update operations complete. For update operations, the content is removed only from the source boot environment. When a packaging operation next occurs in the destination boot environment, the package client flushes its content cache if this option has not been changed.
.sp
This property can be used to keep the content-cache small on systems with limited disk space. This property can cause operations to take longer to complete.
.sp
@@ -1381,11 +2705,11 @@
.ne 2
.mk
.na
-\fBmirror-discovery\fR
+\fB\fBmirror-discovery\fR\fR
.ad
.sp .6
.RS 4n
-(boolean) This property tells the client to discover link-local content mirrors using mDNS and DNS-SD. If this property is set to True, the client attempts to download package content from mirrors it dynamically discovers. To run a mirror that advertises its content via mDNS, see \fBpkg.depotd\fR(1M).
+(boolean) This property tells the client to discover link-local content mirrors using mDNS and DNS-SD. If this property is set to \fBTrue\fR, the client attempts to download package content from mirrors it dynamically discovers. To run a mirror that advertises its content via mDNS, see the \fBpkg.depotd\fR(1M) man page.
.sp
Default value: \fBFalse\fR
.RE
@@ -1394,7 +2718,7 @@
.ne 2
.mk
.na
-\fBsend-uuid\fR
+\fB\fBsend-uuid\fR\fR
.ad
.sp .6
.RS 4n
@@ -1407,19 +2731,19 @@
.ne 2
.mk
.na
-\fBsignature-policy\fR
+\fB\fBsignature-policy\fR\fR
.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 web sites, set the \fBcheck-certificate-revocation\fR image property to \fBTrue\fR. The following values are allowed:
.sp
.ne 2
.mk
.na
-\fBignore\fR
+\fB\fBignore\fR\fR
.ad
-.RS 22n
-.rt
+.sp .6
+.RS 4n
Ignore signatures for all manifests.
.RE
@@ -1427,10 +2751,10 @@
.ne 2
.mk
.na
-\fBverify\fR
+\fB\fBverify\fR\fR
.ad
-.RS 22n
-.rt
+.sp .6
+.RS 4n
Verify that all manifests with signatures are validly signed, but do not require all installed packages to be signed. This is the default value.
.RE
@@ -1438,10 +2762,10 @@
.ne 2
.mk
.na
-\fBrequire-signatures\fR
+\fB\fBrequire-signatures\fR\fR
.ad
-.RS 22n
-.rt
+.sp .6
+.RS 4n
Require that all newly installed packages have at least one valid signature. The \fBpkg fix\fR and \fBpkg verify\fR commands also warn if an installed package does not have a valid signature.
.RE
@@ -1449,10 +2773,10 @@
.ne 2
.mk
.na
-\fBrequire-names\fR
+\fB\fBrequire-names\fR\fR
.ad
-.RS 22n
-.rt
+.sp .6
+.RS 4n
Follow the same requirements as \fBrequire-signatures\fR but also require that the strings listed in the \fBsignature-required-names\fR property appear as a common name of the certificates used to verify the chains of trust of the signatures.
.RE
@@ -1462,7 +2786,7 @@
.ne 2
.mk
.na
-\fBsignature-required-names\fR
+\fB\fBsignature-required-names\fR\fR
.ad
.sp .6
.RS 4n
@@ -1473,7 +2797,7 @@
.ne 2
.mk
.na
-\fBtrust-anchor-directory\fR
+\fB\fBtrust-anchor-directory\fR\fR
.ad
.sp .6
.RS 4n
@@ -1484,22 +2808,22 @@
.ne 2
.mk
.na
-\fBuse-system-repo\fR
+\fB\fBuse-system-repo\fR\fR
.ad
.sp .6
.RS 4n
-(boolean) This property indicates whether the image should use the system repository as a source for image and publisher configuration and as a proxy for communicating with the publishers provided. The default value is \fBignore\fR. See \fBpkg.sysrepo\fR(1M) for information about system repositories.
+(boolean) This property indicates whether the image should use the system repository as a source for image and publisher configuration and as a proxy for communicating with the publishers provided. The default value is \fBFalse\fR. See the \fBpkg.sysrepo\fR(1M) man page for information about system repositories.
.RE
.SH PUBLISHER PROPERTIES
.sp
.LP
-The following properties are part of the image and can be set using the \fB--set-property\fR option of the \fBset-publisher\fR subcommand.
+The following properties define signature policy for a particular publisher. The image properties of the same name define signature policy for the image. To view the current values of these properties for a particular publisher, use the \fBpkg publisher\fR \fIpublisher_name\fR command. To modify the values of these publisher signature policy properties, use the \fB--set-property\fR and \fB--unset-property\fR options of the \fBpkg set-publisher\fR command.
.sp
.ne 2
.mk
.na
-\fBsignature-policy\fR
+\fB\fBsignature-policy\fR\fR
.ad
.sp .6
.RS 4n
@@ -1510,7 +2834,7 @@
.ne 2
.mk
.na
-\fBsignature-required-names\fR
+\fB\fBsignature-required-names\fR\fR
.ad
.sp .6
.RS 4n
@@ -1641,11 +2965,13 @@
.in +2
.nf
$ \fBpkg search bge\fR
-INDEX ACTION VALUE PACKAGE
-driver_name driver bge pkg:/driver/network/[email protected]
-basename file kernel/drv/sparcv9/bge pkg:/driver/network/[email protected]
-basename file kernel/drv/amd64/bge pkg:/driver/network/[email protected]
-pkg.fmri set solaris/driver/network/bge pkg:/driver/network/[email protected]
+INDEX ACTION VALUE PACKAGE
+driver_name driver bge pkg:/driver/network/ethernet/[email protected]
+basename file kernel/drv/sparcv9/bge pkg:/driver/network/ethernet/[email protected]
+basename file kernel/drv/amd64/bge pkg:/driver/network/ethernet/[email protected]
+basename file platform/sun4v/kernel/drv/sparcv9/bge pkg:/system/kernel/[email protected]
+pkg.fmri set solaris/driver/network/bge pkg:/driver/network/[email protected]
+pkg.fmri set solaris/driver/network/ethernet/bge pkg:/driver/network/ethernet/[email protected]
.fi
.in -2
.sp
@@ -1655,7 +2981,89 @@
The token is in the package \fBdriver/network/bge\fR both as the basename for the file action representing \fB/kernel/drv/\fIarch\fR/bge\fR and as a driver name.
.LP
-\fBExample 8 \fRSearch for Packages that Depend on the Specified Package
+\fBExample 8 \fRSearch for a File
+.sp
+.LP
+Search for the package that delivers a file by specifying the full path name of the file, including the leading slash character.
+
+.sp
+.in +2
+.nf
+$ \fBpkg search -o path,pkg.name -l /usr/bin/vim\fR
+PATH PKG.NAME
+usr/bin/vim editor/vim/vim-core
+.fi
+.in -2
+.sp
+
+.sp
+.LP
+Search for a file and the package that delivers that file by specifying \fBfile\fR for the \fIaction_name\fR, \fBpath\fR or \fBbasename\fR for the \fIindex\fR, and the full or partial file name for the \fItoken\fR.
+
+.sp
+.in +2
+.nf
+$ \fBpkg search -o path,pkg.name -l file:basename:vim\fR
+PATH PKG.NAME
+usr/bin/vim editor/vim/vim-core
+.fi
+.in -2
+.sp
+
+.LP
+\fBExample 9 \fRSearch for Files and Directories
+.sp
+.LP
+Search for files and directories and the packages that deliver them by specifying \fBpath\fR or \fBbasename\fR for the \fIindex\fR and the full or partial file name for the \fItoken\fR. Depending on your shell, you might need to escape wildcards.
+
+.sp
+.in +2
+.nf
+$ \fBpkg search -o path,pkg.name -l path:*/vim\fR
+PATH PKG.NAME
+usr/bin/vim editor/vim/vim-core
+usr/share/vim editor/vim
+usr/share/vim editor/vim/vim-core
+$ \fBpkg search -o path,pkg.name -l basename:vim\fR
+PATH PKG.NAME
+usr/share/vim editor/vim
+usr/share/vim editor/vim/vim-core
+usr/bin/vim editor/vim/vim-core
+.fi
+.in -2
+.sp
+
+.LP
+\fBExample 10 \fRShow Which Packages Provide Which SMF Services
+.sp
+.LP
+Show which packages provide a particular SMF service by specifying the value \fBorg.opensolaris.smf.fmri\fR for the \fIindex\fR in a structured search and the name of the service you want to find for the \fItoken\fR. The value \fBorg.opensolaris.smf.fmri\fR is the name of an attribute of a \fBset\fR action. Remember to escape the : in the name of the service.
+
+.sp
+.LP
+For example, show which HTTP servers are available by specifying the value \fBsvc:/network/http\fR for the \fItoken\fR.
+
+.sp
+.in +2
+.nf
+$ \fBpkg search 'org.opensolaris.smf.fmri:svc\e:/network/http*'\fR
+INDEX ACTION VALUE PACKAGE
+org.opensolaris.smf.fmri set svc:/network/http pkg:/web/server/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http pkg:/web/proxy/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http pkg:/web/proxy/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http pkg:/web/java-servlet/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http pkg:/web/server/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http:apache22 pkg:/web/server/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http:lighttpd14 pkg:/web/server/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http:privoxy pkg:/web/proxy/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http:squid pkg:/web/proxy/[email protected]
+org.opensolaris.smf.fmri set svc:/network/http:tomcat6 pkg:/web/java-servlet/[email protected]
+.fi
+.in -2
+.sp
+
+.LP
+\fBExample 11 \fRSearch for Packages that Depend on the Specified Package
.sp
.LP
Search for installed packages that depend on \fBpackage/pkg\fR.
@@ -1663,17 +3071,23 @@
.sp
.in +2
.nf
-$ \fBpkg search -l 'depend::package/pkg'\fR
-INDEX ACTION VALUE PACKAGE
-incorporate depend package/[email protected] pkg:/consolidation/ips/[email protected]
-require depend package/[email protected] pkg:/system/[email protected]
-require depend package/[email protected] pkg:/package/pkg/[email protected]
+$ \fBpkg search -l depend::package/pkg\fR
+INDEX ACTION VALUE PACKAGE
+incorporate depend package/[email protected] pkg:/consolidation/ips/[email protected]
+require depend pkg:/package/[email protected] pkg:/package/pkg/[email protected]
+require depend pkg:/package/[email protected] pkg:/system/library/[email protected]
+require depend pkg:/package/[email protected] pkg:/package/pkg/[email protected]
+require depend pkg:/package/[email protected] pkg:/system/library/[email protected]
+require depend package/pkg pkg:/system/zones/brand/[email protected]
+require depend pkg:/package/[email protected] pkg:/install/[email protected]
+require depend pkg:/package/[email protected] pkg:/system/[email protected]
+require depend pkg:/package/[email protected] pkg:/package/pkg/[email protected]
.fi
.in -2
.sp
.LP
-\fBExample 9 \fRSearch for Dependencies
+\fBExample 12 \fRSearch for Dependencies
.sp
.LP
Search for all \fBincorporate\fR dependencies in installed packages.
@@ -1681,17 +3095,17 @@
.sp
.in +2
.nf
-$ \fBpkg search -l 'depend:incorporate:'\fR
-INDEX ACTION VALUE PACKAGE
-incorporate depend pkg:/[email protected],5.11-0.133 pkg:/consolidation/osnet/[email protected]
-incorporate depend pkg:/[email protected],5.11-0.133 pkg:/consolidation/osnet/[email protected]
+$ \fBpkg search -l depend:incorporate:\fR
+INDEX ACTION VALUE PACKAGE
+incorporate depend pkg:/[email protected] pkg:/consolidation/osnet/[email protected]
+incorporate depend pkg:/[email protected] pkg:/consolidation/osnet/[email protected]
\&...
.fi
.in -2
.sp
.LP
-\fBExample 10 \fRAdd a Publisher
+\fBExample 13 \fRAdd a Publisher
.sp
.LP
Add a new publisher \fBexample.com\fR, with a repository located at \fBhttp://www.example.com/repo\fR.
@@ -1705,7 +3119,7 @@
.sp
.LP
-\fBExample 11 \fRAdd a Publisher With Key and Certificate
+\fBExample 14 \fRAdd a Publisher With Key and Certificate
.sp
.LP
Add a new publisher \fBexample.com\fR, with a secure repository located at \fBhttps://secure.example.com/repo\fR, and a key and certificate stored in the directory \fB/root/creds\fR.
@@ -1721,7 +3135,7 @@
.sp
.LP
-\fBExample 12 \fRAdd and Automatically Configure a Publisher
+\fBExample 15 \fRAdd and Automatically Configure a Publisher
.sp
.LP
Add a new publisher with a repository located at \fB/export/repo\fR using automatic configuration.
@@ -1735,7 +3149,7 @@
.sp
.LP
-\fBExample 13 \fRAdd and Manually Configure a Publisher
+\fBExample 16 \fRAdd and Manually Configure a Publisher
.sp
.LP
Add a new publisher \fBexample.com\fR with a repository located at \fB/export/repo/example.com\fR using manual configuration.
@@ -1749,7 +3163,7 @@
.sp
.LP
-\fBExample 14 \fRVerify All Signed Packages
+\fBExample 17 \fRVerify All Signed Packages
.sp
.LP
Configure an image to verify all signed packages.
@@ -1763,7 +3177,7 @@
.sp
.LP
-\fBExample 15 \fRRequire All Packages To Be Signed
+\fBExample 18 \fRRequire All Packages To Be Signed
.sp
.LP
Configure an image to require all packages to be signed, and require the string \fBexample.com\fR to be seen as a common name for one of the certificates in the chain of trust.
@@ -1777,7 +3191,7 @@
.sp
.LP
-\fBExample 16 \fRRequire All Packages From a Specified Publisher To Be Signed
+\fBExample 19 \fRRequire All Packages From a Specified Publisher To Be Signed
.sp
.LP
Configure an image so that all packages installed from publisher \fBexample.com\fR must be signed.
@@ -1792,7 +3206,7 @@
.sp
.LP
-\fBExample 17 \fRRequire a Specified String in the Chain of Trust
+\fBExample 20 \fRRequire a Specified String in the Chain of Trust
.sp
.LP
Add the string \fBfoo\fR to the image's list of common names that must be seen in a signature's chain of trust to be considered valid.
@@ -1806,7 +3220,7 @@
.sp
.LP
-\fBExample 18 \fRRemove a String From the Chain of Trust for a Specified Publisher
+\fBExample 21 \fRRemove a String From the Chain of Trust for a Specified Publisher
.sp
.LP
Remove the string \fBfoo\fR from the list of common names that must be seen to validate a signature for the publisher \fBexample.com\fR.
@@ -1821,7 +3235,7 @@
.sp
.LP
-\fBExample 19 \fRAdd a Trusted CA Certificate
+\fBExample 22 \fRAdd a Trusted CA Certificate
.sp
.LP
Add the certificate stored in \fB/tmp/example_file.pem\fR as a trusted CA certificate for the publisher \fBexample.com\fR.
@@ -1836,7 +3250,7 @@
.sp
.LP
-\fBExample 20 \fRRevoke a Certificate
+\fBExample 23 \fRRevoke a Certificate
.sp
.LP
Revoke the certificate with the hash \fBa12345\fR for publisher \fBexample.com\fR, preventing the certificate from validating any signatures for packages from \fBexample.com\fR.
@@ -1850,7 +3264,7 @@
.sp
.LP
-\fBExample 21 \fRForget About a Certificate
+\fBExample 24 \fRForget About a Certificate
.sp
.LP
Make \fBpkg\fR forget that the certificate \fBa12345\fR was ever added or revoked by the user.
@@ -1864,7 +3278,7 @@
.sp
.LP
-\fBExample 22 \fRDowngrade a Package
+\fBExample 25 \fRDowngrade a Package
.sp
.LP
Downgrade the installed package \[email protected]\fR to an older version.
@@ -1878,7 +3292,7 @@
.sp
.LP
-\fBExample 23 \fRSwitch Conflicting Package Installation
+\fBExample 26 \fRSwitch Conflicting Package Installation
.sp
.LP
In the case of two conflicting packages, change which package is installed. Suppose package A depends on either package B or package C, and B and C are mutually exclusive. If A and B are installed, use the following command to switch to using C instead of B without uninstalling A:
@@ -1892,7 +3306,7 @@
.sp
.LP
-\fBExample 24 \fRList Packages in a Package Archive
+\fBExample 27 \fRList Packages in a Package Archive
.sp
.LP
List all versions of all packages in a package archive.
@@ -1906,7 +3320,7 @@
.sp
.LP
-\fBExample 25 \fRList Packages in a Package Repository
+\fBExample 28 \fRList Packages in a Package Repository
.sp
.LP
List all versions of all packages in a repository.
@@ -1920,7 +3334,7 @@
.sp
.LP
-\fBExample 26 \fRDisplay Information About a Package in a Package Archive
+\fBExample 29 \fRDisplay Information About a Package in a Package Archive
.sp
.LP
Display the package information for the latest version of a package in a package archive. The package might or might not be currently installed.
@@ -1934,7 +3348,7 @@
.sp
.LP
-\fBExample 27 \fRDisplay Contents of a Package in a Package Archive
+\fBExample 30 \fRDisplay Contents of a Package in a Package Archive
.sp
.LP
Display the contents of a package in a package archive. The package is not currently installed.
@@ -1948,7 +3362,7 @@
.sp
.LP
-\fBExample 28 \fRRemove All Publisher Origins and Mirrors
+\fBExample 31 \fRRemove All Publisher Origins and Mirrors
.sp
.LP
Remove all of the origins and mirrors for a publisher and add a new origin.
@@ -1967,7 +3381,7 @@
.ne 2
.mk
.na
-\fBPKG_IMAGE\fR
+\fB\fBPKG_IMAGE\fR\fR
.ad
.sp .6
.RS 4n
@@ -1978,62 +3392,87 @@
.ne 2
.mk
.na
-\fBPKG_CLIENT_CONNECT_TIMEOUT\fR
+\fB\fBPKG_CLIENT_CONNECT_TIMEOUT\fR\fR
.ad
.sp .6
.RS 4n
-Seconds to wait trying to connect during transport operations (for each attempt) before the client aborts the operation. The default value is 60.
+Seconds to wait trying to connect during transport operations (for each attempt) before the client aborts the operation. A value of 0 means wait indefinitely.
+.sp
+Default value: 60
.RE
.sp
.ne 2
.mk
.na
-\fBPKG_CLIENT_LOWSPEED_TIMEOUT\fR
+\fB\fBPKG_CLIENT_LOWSPEED_TIMEOUT\fR\fR
.ad
.sp .6
.RS 4n
-Seconds below the \fBlowspeed\fR limit (1024 bytes/sec) during transport operations before the client aborts the operation. The default value is 30.
+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.
+.sp
+Default value: 30
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBPKG_CLIENT_MAX_CONSECUTIVE_ERROR\fR\fR
+.ad
+.sp .6
+.RS 4n
+Maximum number of transient transport errors before the client aborts the operation. A value of 0 means do not abort the operation.
+.sp
+Default value: 4
.RE
.sp
.ne 2
.mk
.na
-\fBPKG_CLIENT_MAX_CONSECUTIVE_ERROR\fR
+\fB\fBPKG_CLIENT_MAX_REDIRECT\fR\fR
.ad
.sp .6
.RS 4n
-Maximum number of transient transport errors before the client aborts the operation. The default value is 4.
+Maximum number of HTTP or HTTPS redirects allowed during transport operations before a connection is aborted. A value of 0 means do not abort the operation.
+.sp
+Default value: 5
.RE
.sp
.ne 2
.mk
.na
-\fBPKG_CLIENT_MAX_REDIRECT\fR
+\fB\fBPKG_CONCURRENCY\fR\fR
.ad
.sp .6
.RS 4n
-Maximum number of HTTP or HTTPS redirects allowed during transport operations before a connection is aborted. The default value is 5.
+The number of child images to update in parallel. Ignored if the \fB-C\fR option is specified.
+.sp
+When recursing into child images (usually zones), update at most \fB$PKG_CONCURRENCY\fR child images in parallel. If \fB$PKG_CONCURRENCY\fR is 0 or a negative number, all child images are updated in parallel.
+.sp
+Default value: 1
.RE
.sp
.ne 2
.mk
.na
-\fBPKG_CLIENT_MAX_TIMEOUT\fR
+\fB\fBPKG_CLIENT_MAX_TIMEOUT\fR\fR
.ad
.sp .6
.RS 4n
-Maximum number of transport attempts per host before the client aborts the operation. The default value is 4.
+Maximum number of transport attempts per host before the client aborts the operation. A value of 0 means do not abort the operation.
+.sp
+Default value: 4
.RE
.sp
.ne 2
.mk
.na
-\fBhttp_proxy\fR, \fBhttps_proxy\fR
+\fB\fBhttp_proxy\fR, \fBhttps_proxy\fR\fR
.ad
.sp .6
.RS 4n
@@ -2048,7 +3487,7 @@
.ne 2
.mk
.na
-\fB0\fR
+\fB\fB0\fR\fR
.ad
.RS 6n
.rt
@@ -2059,7 +3498,7 @@
.ne 2
.mk
.na
-\fB1\fR
+\fB\fB1\fR\fR
.ad
.RS 6n
.rt
@@ -2070,7 +3509,7 @@
.ne 2
.mk
.na
-\fB2\fR
+\fB\fB2\fR\fR
.ad
.RS 6n
.rt
@@ -2081,7 +3520,7 @@
.ne 2
.mk
.na
-\fB3\fR
+\fB\fB3\fR\fR
.ad
.RS 6n
.rt
@@ -2092,7 +3531,7 @@
.ne 2
.mk
.na
-\fB4\fR
+\fB\fB4\fR\fR
.ad
.RS 6n
.rt
@@ -2103,7 +3542,7 @@
.ne 2
.mk
.na
-\fB5\fR
+\fB\fB5\fR\fR
.ad
.RS 6n
.rt
@@ -2114,7 +3553,7 @@
.ne 2
.mk
.na
-\fB6\fR
+\fB\fB6\fR\fR
.ad
.RS 6n
.rt
@@ -2125,7 +3564,7 @@
.ne 2
.mk
.na
-\fB7\fR
+\fB\fB7\fR\fR
.ad
.RS 6n
.rt
@@ -2136,7 +3575,7 @@
.ne 2
.mk
.na
-\fB99\fR
+\fB\fB99\fR\fR
.ad
.RS 6n
.rt
@@ -2146,12 +3585,12 @@
.SH FILES
.sp
.LP
-A \fBpkg\fR(5) image can be located arbitrarily within a larger file system. In the following file descriptions, the token \fB$IMAGE_ROOT\fR is used to distinguish relative paths. For a typical system installation, \fB$IMAGE_ROOT\fR is equivalent to \fB/\fR.
+A \fBpkg\fR(5) image can be located arbitrarily within a larger file system. In the following file descriptions, the token \fB$IMAGE_ROOT\fR is used to distinguish relative paths. For a typical system installation, \fB$IMAGE_ROOT\fR is equivalent to \fB/\fR
.sp
.ne 2
.mk
.na
-\fB$IMAGE_ROOT/var/pkg\fR
+\fB\fB$IMAGE_ROOT/var/pkg\fR\fR
.ad
.sp .6
.RS 4n
@@ -2162,7 +3601,7 @@
.ne 2
.mk
.na
-\fB$IMAGE_ROOT/.org.opensolaris,pkg\fR
+\fB\fB$IMAGE_ROOT/.org.opensolaris,pkg\fR\fR
.ad
.sp .6
.RS 4n
@@ -2176,10 +3615,10 @@
.ne 2
.mk
.na
-\fB$IMAGE_META/lost+found\fR
+\fB\fB$IMAGE_META/lost+found\fR\fR
.ad
-.RS 26n
-.rt
+.sp .6
+.RS 4n
Location of conflicting directories and files moved during a package operation. Location of unpackaged contents of a removed directory.
.RE
@@ -2187,10 +3626,10 @@
.ne 2
.mk
.na
-\fB$IMAGE_META/publisher\fR
+\fB\fB$IMAGE_META/publisher\fR\fR
.ad
-.RS 26n
-.rt
+.sp .6
+.RS 4n
Contains a directory for each publisher. Each directory stores publisher-specific metadata.
.RE
--- a/src/man/pkg.5 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkg.5 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2009, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkg 5 "29 Jul 2011" "SunOS 5.11" "Standards, Environments, and Macros"
+.TH pkg 5 "5 Jun 2012" "SunOS 5.11" "Standards, Environments, and Macros"
.SH NAME
pkg \- Image Packaging System
.SH DESCRIPTION
@@ -15,17 +15,17 @@
.sp
.in +2
.nf
-pkg://opensolaris.org/library/[email protected],5.11-0.75:20071001T163427Z
+pkg://solaris/system/library/[email protected],5.11-0.175.0.0.0.2.1:20120921T190358Z
.fi
.in -2
.sp
.sp
.LP
-\fBopensolaris.org\fR is the publisher. \fBlibrary/libc\fR is the package name. Although the namespace is hierarchical and arbitrarily deep, there is no enforced containment; the name is essentially arbitrary. The publisher information is optional, but must be preceded by \fBpkg://\fR if present. An FMRI that includes the publisher is often referred to as being "fully qualified." If publisher information is not present, then the package name should generally be preceded by \fBpkg:/\fR.
+\fBsolaris\fR is the publisher. \fBsystem/library/c++-runtime\fR is the package name. Although the namespace is hierarchical and arbitrarily deep, there is no enforced containment; the name is essentially arbitrary. The publisher information is optional, but must be preceded by \fBpkg://\fR if present. An FMRI that includes the publisher is often referred to as being "fully qualified." If publisher information is not present, then the package name should generally be preceded by \fBpkg:/\fR.
.sp
.LP
-Packaging clients often allow the scheme of an FMRI to be omitted if it does not contain publisher information. For example, \fBpkg:/library/libc\fR can be written as \fBlibrary/libc\fR. If the scheme is omitted, clients also allow omission of all but the last component of a package name for matching purposes. For example, \fBlibrary/libc\fRcould be written as \fBlibc\fR, which would then match packages named \fBlibc\fR or package names ending in \fB/libc\fR.
+Packaging clients often allow the scheme of an FMRI to be omitted if it does not contain publisher information. For example, \fBpkg:/system/library/c++-runtime\fR can be written as \fBsystem/library/c++-runtime\fR. If the scheme is omitted, clients also allow omission of all but the last component of a package name for matching purposes. For example, \fBsystem/library/c++-runtime\fR could be written as \fBlibrary/c++-runtime\fR or \fBc++-runtime\fR, which would then match packages named \fBc++-runtime\fR or package names ending in \fB/c++-runtime\fR.
.sp
.LP
A publisher name identifies a person, group of persons, or an organization as the source of one or more packages. To avoid publisher name collisions and help identify the publisher, a best practice is to use a domain name that represents the entity publishing the packages as a publisher name.
@@ -66,7 +66,7 @@
.sp
.LP
-Names of attributes cannot have whitespace, quotation marks, or equals signs (=) in them. All characters after the first equals sign belong to the value. Values can have all of those, though spaces must be enclosed in single or double quotation marks. Single quotation marks do not need to be escaped inside a string that is enclosed in double quotation marks, and double quotation marks do not need to be escaped inside a string that is enclosed in single quotation marks. A quotation mark can be prefixed with a backslash (\\) character to avoid terminating the quoted string. A backslash can be escaped with a backslash.
+Names of attributes cannot have whitespace, quotation marks, or equals signs (=) in them. All characters after the first equals sign belong to the value. Values can have all of those, though spaces must be enclosed in single or double quotation marks. Single quotation marks do not need to be escaped inside a string that is enclosed in double quotation marks, and double quotation marks do not need to be escaped inside a string that is enclosed in single quotation marks. A quotation mark can be prefixed with a backslash (\e) character to avoid terminating the quoted string. A backslash can be escaped with a backslash.
.sp
.LP
Attributes can be named more than once with multiple values. These are treated as unordered lists.
@@ -139,8 +139,8 @@
.na
\fB\fBpreserve\fR\fR
.ad
-.RS 12n
-.rt
+.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).
.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.
@@ -158,8 +158,8 @@
.na
\fB\fBoverlay\fR\fR
.ad
-.RS 12n
-.rt
+.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.
.sp
If \fBoverlay\fR is not specified, multiple packages cannot deliver files to the same location.
@@ -178,9 +178,9 @@
.na
\fB\fBelfarch\fR\fR
.ad
-.RS 17n
-.rt
-The architecture of the ELF file. This is the output of \fBuname -p\fRon the architecture for which the file is built.
+.sp .6
+.RS 4n
+The architecture of the ELF file. This is the output of \fBuname -p\fR on the architecture for which the file is built.
.RE
.sp
@@ -189,8 +189,8 @@
.na
\fB\fBelfbits\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
This is \fB32\fR or \fB64\fR.
.RE
@@ -200,8 +200,8 @@
.na
\fB\fBelfhash\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
This is the hash of the "interesting" ELF sections in the file. These are the sections that are mapped into memory when the binary is loaded. These are the only sections necessary to consider when determining whether the executable behavior of two binaries will differ.
.RE
@@ -211,8 +211,8 @@
.na
\fB\fBoriginal_name\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
This attribute is used to handle editable files moving from package to package or from place to place, or both. The form this takes is the name of the originating package, followed by a colon and the original path to the file. Any file being deleted is recorded either with its package and path, or with the value of the \fBoriginal_name\fR attribute if specified. Any editable file being installed that has the \fBoriginal_name\fR attribute set uses the file of that name if it is deleted as part of the same packaging operation.
.RE
@@ -222,9 +222,9 @@
.na
\fB\fBrevert-tag\fR\fR
.ad
-.RS 17n
-.rt
-This attribute is used to tag editable files that should be reverted as a set. Multiple revert-tag values can be specified. The file reverts to its manifest-defined state when \fBpkg revert\fR is invoked with any of those tags specified. See \fBpkg\fR(1).
+.sp .6
+.RS 4n
+This attribute is used to tag editable files that should be reverted as a set. Multiple \fBrevert-tag\fR values can be specified. The file reverts to its manifest-defined state when \fBpkg revert\fR is invoked with any of those tags specified. See \fBpkg\fR(1).
.RE
.SS "Directory Actions"
@@ -243,8 +243,8 @@
.na
\fB\fBsalvage-from\fR\fR
.ad
-.RS 16n
-.rt
+.sp .6
+.RS 4n
This names a directory of salvaged items. A directory with such an attribute inherits on creation the salvaged directory contents if they exist.
.RE
@@ -282,7 +282,7 @@
.ad
.sp .6
.RS 4n
-Specifies the entry in the mediation namespace shared by all path names participating in a given mediation group (for example, \fBpython\fR). Link mediation can be performed based on \fBmediator-version\fR and/or \fBmediator-implementation\fR. All mediated links for a given path name must specify the same mediator. However, not all mediator versions and implementations need to provide a link at a given path. If a mediation does not provide a link, then the link is removed when that mediation is selected. A \fBmediator\fR, in combination with a specific version and/or implementation represents a mediation that can be selected for use by the packaging system.
+Specifies the entry in the mediation namespace shared by all path names participating in a given mediation group (for example, \fBpython\fR). Link mediation can be performed based on \fBmediator-version\fR and/or \fBmediator-implementation\fR. All mediated links for a given path name must specify the same mediator. However, not all mediator versions and implementations need to provide a link at a given path. If a mediation does not provide a link, then the link is removed when that mediation is selected. A \fBmediator\fR, in combination with a specific version and/or implementation represents a mediation that can be selected for use by the packaging system.
.RE
.sp
@@ -306,7 +306,7 @@
.RS 4n
Specifies the implementation of the mediator for use in addition to or instead of the \fBmediator-version\fR. Implementation strings are not considered to be ordered and a string is arbitrary selected by \fBpkg\fR(5) if not explicitly specified by a system administrator.
.sp
-The value can be a string of arbitrary length composed of alphanumeric characters and spaces. If the implementation itself can be versioned or is versioned, then the version should be specified at the end of the string, after a @ (expressed as a dot-separated sequence of nonnegative integers). If multiple versions of an implementation exist, the default behavior is to select the implementation with the greatest version.
+The value can be a string of arbitrary length composed of alphanumeric characters and spaces. If the implementation itself can be versioned or is versioned, then the version should be specified at the end of the string, after a @ (expressed as a dot-separated sequence of nonnegative integers). If multiple versions of an implementation exist, the default behavior is to select the implementation with the greatest version.
.sp
If only one instance of an implementation mediation link at a particular path is installed on a system, then that one is chosen automatically. If future links at the path are installed, the link is not switched unless a vendor, site, or local override applies, or if one of the links is version mediated.
.RE
@@ -344,8 +344,8 @@
.na
\fB\fBname\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The name of the driver. This is usually, but not always, the file name of the driver binary. This is the \fBdriver\fR action's key attribute.
.RE
@@ -355,8 +355,8 @@
.na
\fB\fBalias\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
This represents an alias for the driver. A given driver can have more than one \fBalias\fR attribute. No special quoting rules are necessary.
.RE
@@ -366,8 +366,8 @@
.na
\fB\fBclass\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
This represents a driver class. A given driver can have more than one \fBclass\fR attribute.
.RE
@@ -377,8 +377,8 @@
.na
\fB\fBperms\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
This represents the file system permissions for the driver's device nodes.
.RE
@@ -388,8 +388,8 @@
.na
\fB\fBclone_perms\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
This represents the file system permissions for the clone driver's minor nodes for this driver.
.RE
@@ -399,8 +399,8 @@
.na
\fB\fBpolicy\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
This specifies additional security policy for the device. A given driver can have more than one \fBpolicy\fR attribute, but no minor device specification can be present in more than one attribute.
.RE
@@ -410,8 +410,8 @@
.na
\fB\fBprivs\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
This specifies privileges used by the driver. A given driver can have more than one \fBprivs\fR attribute.
.RE
@@ -421,9 +421,9 @@
.na
\fB\fBdevlink\fR\fR
.ad
-.RS 15n
-.rt
-This specifies an entry in \fB/etc/devlink.tab\fR. The value is the exact line to go into the file, with tabs denoted by \fB\\t\fR. See \fBdevlinks\fR(1M) for more information. A given driver can have more than one \fBdevlink\fR attribute.
+.sp .6
+.RS 4n
+This specifies an entry in \fB/etc/devlink.tab\fR. The value is the exact line to go into the file, with tabs denoted by \fB\et\fR\&. See \fBdevlinks\fR(1M) for more information. A given driver can have more than one \fBdevlink\fR attribute.
.RE
.SS "Depend Actions"
@@ -439,8 +439,8 @@
.na
\fB\fBfmri\fR\fR
.ad
-.RS 14n
-.rt
+.sp .6
+.RS 4n
The FMRI representing the dependent package. This is the \fBdependency\fR action's key attribute. The \fBfmri\fR value must not include the publisher. The package name is assumed to be complete. Dependencies of type \fBrequire-any\fR can have multiple \fBfmri\fR attributes. A version is optional on the \fBfmri\fR value, though for some types of dependencies, an \fBfmri\fR with no version has no meaning.
.RE
@@ -450,27 +450,108 @@
.na
\fB\fBtype\fR\fR
.ad
-.RS 14n
-.rt
+.sp .6
+.RS 4n
The type of the dependency.
.sp
-If the value is \fBrequire\fR, then the dependency is required and must have a version equal to or greater than the version specified in the \fBfmri\fR attribute. If the version is not specified, any version satisfies the dependency. A package cannot be installed if any of its required dependencies cannot be satisfied.
+.ne 2
+.mk
+.na
+\fB\fBrequire\fR\fR
+.ad
+.sp .6
+.RS 4n
+The dependency is required and must have a version equal to or greater than the version specified in the \fBfmri\fR attribute. If the version is not specified, any version satisfies the dependency. A package cannot be installed if any of its required dependencies cannot be satisfied.
+.RE
+
.sp
-If the value is \fBoptional\fR, then the dependency, if present, must be at the specified version level or greater.
+.ne 2
+.mk
+.na
+\fB\fBoptional\fR\fR
+.ad
+.sp .6
+.RS 4n
+The dependency, if present, must be at the specified version level or greater.
+.RE
+
.sp
-If the value is \fBexclude\fR, then the containing package cannot be installed if the dependency is present at the specified version level or greater. If no version is specified, the dependent package cannot be installed concurrently with the package specifying the dependency.
+.ne 2
+.mk
+.na
+\fB\fBexclude\fR\fR
+.ad
+.sp .6
+.RS 4n
+The containing package cannot be installed if the dependency is present at the specified version level or greater. If no version is specified, the dependent package cannot be installed concurrently with the package specifying the dependency.
+.RE
+
.sp
-If the value is \fBincorporate\fR, then the dependency is optional, but the version of the dependent package is constrained. See "Constraints and Freezing" below.
+.ne 2
+.mk
+.na
+\fB\fBincorporate\fR\fR
+.ad
+.sp .6
+.RS 4n
+The dependency is optional, but the version of the dependent package is constrained. See "Constraints and Freezing" below.
+.RE
+
.sp
-If the value is \fBrequire-any\fR, then any one of multiple dependent packages as specified by multiple \fBfmri\fR attributes can satisfy the dependency, following the same rules as the \fBrequire\fR dependency type.
+.ne 2
+.mk
+.na
+\fB\fBrequire-any\fR\fR
+.ad
+.sp .6
+.RS 4n
+Any one of multiple dependent packages as specified by multiple \fBfmri\fR attributes can satisfy the dependency, following the same rules as the \fBrequire\fR dependency type.
+.RE
+
.sp
-If the value is \fBconditional\fR, the dependency is required only if the package defined by the \fBpredicate\fR attribute is present on the system.
+.ne 2
+.mk
+.na
+\fB\fBconditional\fR\fR
+.ad
+.sp .6
+.RS 4n
+The dependency is required only if the package defined by the \fBpredicate\fR attribute is present on the system.
+.RE
+
.sp
-If the value is \fBorigin\fR, 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.
+.ne 2
+.mk
+.na
+\fB\fBorigin\fR\fR
+.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.
+.RE
+
.sp
-If the value is \fBgroup\fR, the dependency is required unless the package is on the image avoid list. Note that obsolete packages silently satisfy the group dependency. See the \fBavoid\fR subcommand in \fBpkg\fR(1).
+.ne 2
+.mk
+.na
+\fB\fBgroup\fR\fR
+.ad
+.sp .6
+.RS 4n
+The dependency is required unless the package is on the image avoid list. Note that obsolete packages silently satisfy the group dependency. See the \fBavoid\fR subcommand in \fBpkg\fR(1).
+.RE
+
.sp
-If the value is \fBparent\fR, then the dependency is ignored if the image is not a child image. If the image is a child image then the dependency is required to be present in the parent image. The package version matching for a \fBparent\fR dependency is the same as that used for \fBincorporate\fR dependencies.
+.ne 2
+.mk
+.na
+\fB\fBparent\fR\fR
+.ad
+.sp .6
+.RS 4n
+The dependency is ignored if the image is not a child image. If the image is a child image then the dependency is required to be present in the parent image. The package version matching for a \fBparent\fR dependency is the same as that used for \fBincorporate\fR dependencies.
+.RE
+
.RE
.sp
@@ -479,8 +560,8 @@
.na
\fB\fBpredicate\fR\fR
.ad
-.RS 14n
-.rt
+.sp .6
+.RS 4n
The FMRI representing the predicate for \fBconditional\fR dependencies.
.RE
@@ -490,8 +571,8 @@
.na
\fB\fBroot-image\fR\fR
.ad
-.RS 14n
-.rt
+.sp .6
+.RS 4n
Has an effect only for \fBorigin\fR dependencies as mentioned above.
.RE
@@ -511,8 +592,8 @@
.na
\fB\fBlicense\fR\fR
.ad
-.RS 16n
-.rt
+.sp .6
+.RS 4n
This is a \fBlicense\fR action's key attribute. This attribute provides a meaningful description for the license to assist users in determining the contents without reading the license text itself. Some example values include:
.RS +4
.TP
@@ -562,7 +643,7 @@
.el o
Simplified BSD License
.RE
-Wherever possible, including the version of the license in the description is recommended as shown above. The \fBlicense\fR value must be unique within a package.
+The \fBlicense\fR value must be unique within a package. Including the version of the license in the description, as shown in several of the examples above, is recommended. If a package has code under multiple licenses, use multiple \fBlicense\fR actions. The length of the license attribute value should not be more than 64 characters.
.RE
.sp
@@ -571,8 +652,8 @@
.na
\fB\fBmust-accept\fR\fR
.ad
-.RS 16n
-.rt
+.sp .6
+.RS 4n
When \fBtrue\fR, this license must be accepted by a user before the related package can be installed or updated. Omission of this attribute is equivalent to \fBfalse\fR. The method of acceptance (interactive or configuration-based, for example) is at the discretion of clients.
.RE
@@ -582,8 +663,8 @@
.na
\fB\fBmust-display\fR\fR
.ad
-.RS 16n
-.rt
+.sp .6
+.RS 4n
When \fBtrue\fR, the action's payload must be displayed by clients during packaging operations. Omission of this value is equivalent to \fBfalse\fR. This attribute should not be used for copyright notices, only actual licenses or other material that must be displayed during operations. The method of display is at the discretion of clients.
.RE
@@ -600,8 +681,8 @@
.na
\fB\fBcategory\fR\fR
.ad
-.RS 12n
-.rt
+.sp .6
+.RS 4n
The value for the \fBCATEGORY\fR parameter. The default value is \fBsystem\fR.
.RE
@@ -611,8 +692,8 @@
.na
\fB\fBdesc\fR\fR
.ad
-.RS 12n
-.rt
+.sp .6
+.RS 4n
The value for the \fBDESC\fR parameter.
.RE
@@ -622,8 +703,8 @@
.na
\fB\fBhotline\fR\fR
.ad
-.RS 12n
-.rt
+.sp .6
+.RS 4n
The value for the \fBHOTLINE\fR parameter.
.RE
@@ -633,8 +714,8 @@
.na
\fB\fBname\fR\fR
.ad
-.RS 12n
-.rt
+.sp .6
+.RS 4n
The value for the \fBNAME\fR parameter. The default value is \fBnone provided\fR.
.RE
@@ -644,8 +725,8 @@
.na
\fB\fBpkg\fR\fR
.ad
-.RS 12n
-.rt
+.sp .6
+.RS 4n
The abbreviation for the package being installed. The default value is the name from the FMRI of the package. This is a \fBlegacy\fR action's key attribute.
.RE
@@ -655,8 +736,8 @@
.na
\fB\fBvendor\fR\fR
.ad
-.RS 12n
-.rt
+.sp .6
+.RS 4n
The value for the \fBVENDOR\fR parameter.
.RE
@@ -666,8 +747,8 @@
.na
\fB\fBversion\fR\fR
.ad
-.RS 12n
-.rt
+.sp .6
+.RS 4n
The value for the VERSION parameter. The default value is the version from the FMRI of the package.
.RE
@@ -707,10 +788,21 @@
.ne 2
.mk
.na
+\fB\fBpkg.fmri\fR\fR
+.ad
+.sp .6
+.RS 4n
+See "Package FMRIs and Versions" in the "Description" section.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fBinfo.classification\fR\fR
.ad
-.RS 23n
-.rt
+.sp .6
+.RS 4n
One or more tokens that a \fBpkg\fR(5) client can use to classify the package. The value should have a scheme (such as "org.opensolaris.category.2008" or "org.acm.class.1998") and the actual classification, such as "Applications/Games", separated by a colon (:).
.RE
@@ -720,8 +812,8 @@
.na
\fB\fBpkg.description\fR\fR
.ad
-.RS 23n
-.rt
+.sp .6
+.RS 4n
A detailed description of the contents and functionality of the package, typically a paragraph or so in length.
.RE
@@ -731,8 +823,8 @@
.na
\fB\fBpkg.obsolete\fR\fR
.ad
-.RS 23n
-.rt
+.sp .6
+.RS 4n
When \fBtrue\fR, the package is marked obsolete. An obsolete package can have no actions other than more set actions, and must not be marked renamed.
.RE
@@ -742,8 +834,8 @@
.na
\fB\fBpkg.renamed\fR\fR
.ad
-.RS 23n
-.rt
+.sp .6
+.RS 4n
When \fBtrue\fR, the package has been renamed. There must be one or more \fBdepend\fR actions in the package as well that point to the package versions to which this package has been renamed. A package cannot be marked both renamed and obsolete, but otherwise can have any number of set actions.
.RE
@@ -753,8 +845,8 @@
.na
\fB\fBpkg.summary\fR\fR
.ad
-.RS 23n
-.rt
+.sp .6
+.RS 4n
A short, one-line description of the package.
.RE
@@ -768,8 +860,8 @@
.na
\fB\fBgroupname\fR\fR
.ad
-.RS 13n
-.rt
+.sp .6
+.RS 4n
The value for the name of the group.
.RE
@@ -779,8 +871,8 @@
.na
\fB\fBgid\fR\fR
.ad
-.RS 13n
-.rt
+.sp .6
+.RS 4n
The group's unique numerical id. The default value is the first free group under 100.
.RE
@@ -797,8 +889,8 @@
.na
\fB\fBusername\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The unique name of the user
.RE
@@ -808,8 +900,8 @@
.na
\fB\fBpassword\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The encrypted password of the user. Default value is \fB*LK*\fR. See \fBshadow\fR(4).
.RE
@@ -819,8 +911,8 @@
.na
\fB\fBuid\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The unique uid of the user. Default value is first free value under 100.
.RE
@@ -830,8 +922,8 @@
.na
\fB\fBgroup\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The name of the user's primary group. Must be found in \fB/etc/group\fR.
.RE
@@ -841,8 +933,8 @@
.na
\fB\fBgcos-field\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The value of the \fBgcos\fR field in \fB/etc/passwd\fR. Default value is \fBusername\fR.
.RE
@@ -852,8 +944,8 @@
.na
\fB\fBhome-dir\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The user's home directory. Default value is /.
.RE
@@ -863,8 +955,8 @@
.na
\fB\fBlogin-shell\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The user's default shell. Default value is empty.
.RE
@@ -874,8 +966,8 @@
.na
\fB\fBgroup-list\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
Secondary groups to which the user belongs. See \fBgroup\fR(4).
.RE
@@ -885,8 +977,8 @@
.na
\fB\fBftpuser\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
Can be set to \fBtrue\fR or \fBfalse\fR. The default value of \fBtrue\fR indicates that the user is permitted to login via FTP. See \fBftpusers\fR(4).
.RE
@@ -896,8 +988,8 @@
.na
\fB\fBlastchg\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The number of days between January 1, 1970, and the date that the password was last modified. Default value is empty. See \fBshadow\fR(4).
.RE
@@ -907,8 +999,8 @@
.na
\fB\fBmin\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The minimum number of days required between password changes. This field must be set to 0 or above to enable password aging. Default value is empty. See \fBshadow\fR(4).
.RE
@@ -918,8 +1010,8 @@
.na
\fB\fBmax\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The maximum number of days the password is valid. Default value is empty. See \fBshadow\fR(4).
.RE
@@ -929,8 +1021,8 @@
.na
\fB\fBwarn\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The number of days before password expires that the user is warned. See \fBshadow\fR(4).
.RE
@@ -940,8 +1032,8 @@
.na
\fB\fBinactive\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
The number of days of inactivity allowed for that user. This is counted on a per-machine basis. The information about the last login is taken from the machine's \fBlastlog\fR file. See \fBshadow\fR(4).
.RE
@@ -951,8 +1043,8 @@
.na
\fB\fBexpire\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
An absolute date expressed as the number of days since the UNIX Epoch (January 1, 1970). When this number is reached, the login can no longer be used. For example, an expire value of 13514 specifies a login expiration of January 1, 2007. See \fBshadow\fR(4).
.RE
@@ -962,8 +1054,8 @@
.na
\fB\fBflag\fR\fR
.ad
-.RS 15n
-.rt
+.sp .6
+.RS 4n
Set to empty. See \fBshadow\fR(4).
.RE
@@ -985,7 +1077,7 @@
.ad
.sp .6
.RS 4n
-Can be set to \fBtrue\fR or \fBfalse\fR. If an action with this actuator set to \fBtrue\fR is installed or updated during a package installation, then the packaging transaction can be advertised as requiring a reboot. Certain client implementations might take additional steps, such as performing the entire package operation using a clone of the image, in the case that the image is the live system image.
+Can be set to \fBtrue\fR or \fBfalse\fR. This actuator declares that update or removal of the tagged action must be performed in a new boot environment if the package system is operating on a live image. Creation of a new boot environment is controlled by the \fBbe-policy\fR image property. See the "Image Properties" section in the \fBpkg\fR(1) man page for more information about the \fBbe-policy\fR property.
.RE
.sp
@@ -996,11 +1088,29 @@
.ad
.sp .6
.RS 4n
-Each of these actuators takes the value of an FMRI of a service instance to operate on during the package installation or removal. \fBdisable_fmri\fR causes the given FMRI to be disabled prior to action removal, per the \fBdisable\fR subcommand to \fBsvcadm\fR(1M). \fBrefresh_fmri\fR and \fBrestart_fmri\fR cause the given FMRI to be refreshed or restarted after action installation or update, per the respective subcommands of \fBsvcadm\fR(1M). Finally, \fBsuspend_fmri\fR causes the given FMRI to be disabled temporarily prior to the action install phase, and then enabled after the completion of that phase.
+Each of these actuators takes the value of an FMRI of a service instance to operate on during the package installation or removal. \fBdisable_fmri\fR causes the given FMRI to be disabled prior to action removal, per the \fBdisable\fR subcommand to \fBsvcadm\fR(1M). \fBrefresh_fmri\fR and \fBrestart_fmri\fR cause the given FMRI to be refreshed or restarted after action installation, update, or removal per the respective subcommands of \fBsvcadm\fR(1M). Finally, \fBsuspend_fmri\fR causes the given FMRI to be disabled temporarily prior to the action install phase, and then enabled after the completion of that phase.
.sp
The value can contain a pattern that matches multiple service instances. However, it must do so explicitly with a glob as accepted by \fBsvcs\fR(1), rather than doing so implicitly by not indicating any instances.
.RE
+.SH MEDIATIONS
+.sp
+.LP
+A mediator is a name that represents a set of related symbolic or hard links. If two or more link actions have the same path and mediator name, the user or the package system selects the link target based on version, implementation, or priority. See "Link Actions" for information about mediator attributes.
+.sp
+.LP
+The following example shows two different instances of a mediator named \fBjava\fR where the link choices are between versions. These two \fBlink\fR actions would appear in two different packages.
+.sp
+.in +2
+.nf
+link mediator=java mediator-version=1.6 path=usr/java target=jdk/jdk1.6.0_31
+link mediator=java mediator-version=1.7 path=usr/java target=jdk/jdk1.7.0_02
+.fi
+.in -2
+
+.sp
+.LP
+See the \fBset-mediator\fR subcommand in the \fBpkg\fR(1) man page for information about how to select the version you want for this link path. To have a choice of versions, both packages must be installed.
.SH CONSTRAINTS AND FREEZING
.sp
.LP
@@ -1013,7 +1123,7 @@
Most parts of the operating system are encapsulated by packages called \fBincorporations\fR. These packages primarily deliver constraints represented by the \fBincorporate\fR dependency.
.sp
.LP
-As described above, an incorporated package need not be present on the system, but if it is, then it specifies both an inclusive minimum version and an exclusive maximum version. For example, if the dependent FMRI has a version of 1.4.3, then no version less than 1.4.3 would satisfy the dependency, and neither would any version greater than or equal to 1.4.4. However, versions that merely extended the dotted sequence, such as 1.4.3.7, would be allowed.
+As described above, an incorporated package need not be present on the system, but if it is, then it specifies both an inclusive minimum version and an exclusive maximum version. For example, if the dependent FMRI has a version of 1.4.3, then no version less than 1.4.3 would satisfy the dependency, and neither would any version greater than or equal to 1.4.4. However, versions that merely extended the dotted sequence, such as 1.4.3.7, would be allowed.
.sp
.LP
Incorporations are used to force parts of the system to upgrade synchronously. For some components, such as the C library and the kernel, this is a basic requirement. For others, such as a simple userland component on which nothing else has a dependency, the synchronous upgrade is used merely to provide a known and tested set of package versions that can be referred to by a particular version of the incorporation.
@@ -1025,10 +1135,10 @@
Attempting an upgrade of a package to a version that is not allowed by an installed incorporation will not attempt to find a newer version of the incorporation in order to satisfy the request, but will instead fail. If the constraint itself must be moved, and the incorporation specifying it cannot be removed, then the incorporation must be upgraded to a version that specifies a desired version of the constraint. Upgrading an incorporation causes all of the incorporated packages that would not satisfy the constraints delivered by the new version to be upgraded as well.
.sp
.LP
-A system administrator can constrain a package by using the \fBpkg freeze\fR command. The named package is constrained to the version installed on the system if no version is provided. If a versioned package is provided, then this administrative constraint, or freeze, acts as if an incorporate dependency were installed where the \fBfmri\fR attribute had the value of the provided package version.
+A system administrator can constrain a package by using the \fBpkg freeze\fR command. The named package is constrained to the version installed on the system if no version is provided. If a versioned package is provided, then this administrative constraint, or freeze, acts as if an incorporate dependency were installed where the \fBfmri\fR attribute had the value of the provided package version.
.sp
.LP
-A freeze is never be lifted automatically by the packaging system. To relax a constraint, use the \fBpkg unfreeze\fR command.
+A freeze is never lifted automatically by the packaging system. To relax a constraint, use the \fBpkg unfreeze\fR command.
.SH PUBLISHERS AND REPOSITORIES
.sp
.LP
@@ -1039,36 +1149,126 @@
.sp
.LP
A \fBmirror\fR is a package repository that contains only package content (files). If one or more mirrors are configured for a given publisher in an image, the client API prefers the mirrors for package content retrieval and attempts to choose the best one to retrieve package content from. If the mirror is unreachable, does not have the required content, or is slower, the client API retrieves the content from any configured origin repositories. Mirrors are intended for content sharing among a trusted set of clients using the dynamic mirror functionality of \fBpkg.depotd\fR(1M). Mirrors are also intended to be used to authenticate access to package metadata, but distribute the package content without authentication. For example, a client might be configured with an \fBhttps\fR origin that requires an SSL key and certificate pair to access, and with an \fBhttp\fR mirror that provides the package content. In this way, only authorized clients can install or update the packages, while the overhead of authentication for package content retrieval is avoided. A mirror can be created by removing all subdirectories of a repository except those named \fBfile\fR and their parents. An origin repository can be also be provisioned as a mirror by using the mirror mode of \fBpkg.depotd\fR(1M).
-.SH PROPERTIES
+.SH GLOBAL AND NON-GLOBAL ZONE UPDATE
+.sp
+.LP
+The \fBpkg\fR system forces non-global zones to be kept in sync with the global zone. This means that certain packages must be at the same version in the global zone and all non-global zones to ensure the same kernel is run. To do this, \fBpkg\fR uses \fBparent\fR dependencies to impose certain constraints on non-global zones. See "Depend Actions" above for more information about \fBparent\fR dependencies.
+.sp
+.LP
+Because of restrictions that the global zone imposes on non-global zones, the non-global zones must have access to the packages of the global zone and must have a similar publisher configuration. Both of these objectives are achieved by using a \fBsystem repository\fR (see the \fBpkg.sysrepo\fR(1M) man page). The system repository provides access to the publishers configured in the global zone and information about how those publishers are configured. To prevent non-global zones from choosing different packages during installation or update, system publishers are ranked higher in the publisher search order than publishers configured in the non-global zone. See the \fBpkg set-publisher\fR command in the \fBpkg\fR(1) man page for information about publisher search order.
+.sp
+.LP
+To update all non-global zones on the system, use the \fBpkg update\fR command with no arguments in the global zone. This command operates on the global zone and on each non-global zone recursively. The minimal changes necessary are made to non-global zones to bring them in sync with the changes made in the global zone. For example, suppose package \fBfoo\fR is installed at version 1 in both the global zone and non-global zones, and suppose version 2 is available in a system repository. If \fBfoo\fR has a parent dependency, then \fBpkg update foo\fR updates \fBfoo\fR to version 2 in both the global zone and the non-global zones because the \fBparent\fR dependency forces the package to stay in sync. If \fBfoo\fR does not have a parent dependency, then \fBfoo\fR is updated to version 2 in the global zone but remains at version 1 in the non-global zones.
+.SH FACETS AND VARIANTS
+.sp
+.LP
+Software can have components that are optional and components that are mutually exclusive. Examples of optional components include locales and documentation. Examples of mutually exclusive components include SPARC or x86 and debug or non-debug binaries.
+.sp
+.LP
+In IPS, optional components are called \fBfacets\fR and mutually exclusive components are called \fBvariants\fR. Facets and variants are specified as tags on package actions. Each facet and variant tag has a name and a value. A single action can have multiple facet and variant tags. Examples of components with multiple facet and variant tags include an architecture-specific header file that is used by developers, or a component that is only for a SPARC global zone.
+.sp
+.LP
+An example of a variant tag is \fBvariant.arch=sparc\fR. An example of a facet tag is \fBfacet.devel=true\fR. Facets and variants are often referred to without the leading \fBfacet.\fR and \fBvariant.\fR.
+.sp
+.LP
+Facets and variants are special properties of the image and cannot be set on individual packages. To view the current values of the facets and variants set on the image, use the \fBpkg facet\fR and \fBpkg variant\fR commands as shown in the \fBpkg\fR(1) man page. To modify the values of the facets and variants set on the image, use the \fBpkg change-facet\fR and \fBpkg change-variant\fR commands.
+.sp
+.LP
+Facets are boolean: They can be set only to \fBtrue\fR (enabled) or \fBfalse\fR (disabled). By default, all facets are considered to be set to \fBtrue\fR in the image. A facet tag on an action should only have the value \fBtrue\fR; other values have undefined behavior. A facet set on the image can be a full facet such as \fBdoc.man\fR or a pattern such as \fBlocale.*\fR. This is useful when you want to disable a portion of the facet namespace, and only enable individual facets within it. For example, you could disable all locales and then only enable one or two specific locales, as shown in the following example:
+.sp
+.in +2
+.nf
+# \fBpkg change-facet locale.*=false\fR
+[output about packages being updated]
+# \fBpkg change-facet locale.en_US=true\fR
+[output about packages being updated]
+.fi
+.in -2
+.sp
+
+.sp
+.LP
+Most variants can have any number of values. For example, the \fBarch\fR variant can be set to \fBi386\fR, \fBsparc\fR, \fBppc\fR, \fBarm\fR, or whatever architectures the distribution supports. (Only \fBi386\fR and \fBsparc\fR are used in Oracle Solaris.) The exception are the \fBdebug\fR variants. The \fBdebug\fR variants can only be set to \fBtrue\fR or \fBfalse\fR; other values have undefined behavior. If a file action has both non-debug and debug versions, both versions must have the applicable \fBdebug\fR variant explicitly set, as shown in the following example:
+.sp
+.in +2
+.nf
+file group=sys mode=0644 overlay=allow owner=root \e
+ path=etc/motd pkg.csize=115 pkg.size=103 preserve=true \e
+ variant.debug.osnet=true
+
+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
+.fi
+.in -2
+
+.sp
+.LP
+The variant value must be set on the image in order for a package using the variant to be installed. The \fBarch\fR and \fBzone\fR variants are set by the program that creates the image and installs its initial contents. The \fBdebug.*\fR variants are \fBfalse\fR in the image by default.
.sp
.LP
-Images can have one or more properties associated with them. These properties can be used to store information about the purpose, content, and behavior of the image. See \fBpkg\fR(1) for a complete list.
+The facets and variants set on the image affect whether a particular action is installed.
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Actions with no facet or variant tags are always installed.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Actions with facet tags are installed unless all of the facets or facet patterns matching the tags are set to \fBfalse\fR on the image. If any facet is set to \fBtrue\fR or is not explicitly set (\fBtrue\fR is the default), then the action is installed.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Actions with variant tags are installed only if the values of all the variant tags are the same as the values set in the image.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Actions with both facet and variant tags are installed if both the facets and the variants allow the action to be installed.
+.RE
+.sp
+.LP
+You can create your own facet and variant tags. The following tags are in common use in Oracle Solaris.
+.sp
+
+.sp
+.TS
+tab();
+cw(2.75i) cw(2.75i)
+lw(2.75i) lw(2.75i)
+.
+Variant NamePossible Values
+_
+\fBvariant.arch\fR\fBsparc\fR, \fBi386\fR
+\fBvariant.opensolaris.zone\fR\fBglobal\fR, \fBnonglobal\fR
+\fBvariant.debug.*\fR\fBtrue\fR, \fBfalse\fR
+.TE
+
+.sp
+.LP
+The following list shows a small sample of the facet tags that are used in Oracle Solaris:
+.sp
+.in +2
+.nf
+facet.devel facet.doc
+facet.doc.html facet.doc.info
+facet.doc.man facet.doc.pdf
+facet.locale.de facet.locale.en_GB
+facet.locale.en_US facet.locale.fr
+facet.locale.ja_JP facet.locale.zh_CN
+.fi
+.in -2
+
.SH IMAGE POLICIES
.sp
.LP
-Policies are defined by image properties with boolean values. The supported policies include:
-.sp
-.ne 2
-.mk
-.na
-\fB\fBflush-content-cache-on-success\fR\fR
-.ad
-.sp .6
-.RS 4n
-When true, the cache of downloaded files is erased after a successful install of a package. Default value: \fBTrue\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBsend-uuid\fR\fR
-.ad
-.sp .6
-.RS 4n
-When true, a unique identifier (UUID) that identifies the image to the publisher is sent on all requests. Default value: \fBTrue\fR.
-.RE
-
+Image policies are defined by image properties with boolean values. See "Image Properties" in the \fBpkg\fR(1) man page for descriptions of the \fBflush-content-cache-on-success\fR and \fBsend-uuid\fR properties and information about how to view and modify their values.
.SH FILES
.sp
.LP
@@ -1104,8 +1304,8 @@
.na
\fB\fB$IMAGE_META/lost+found\fR\fR
.ad
-.RS 26n
-.rt
+.sp .6
+.RS 4n
Location of conflicting directories and files moved during a package operation.
.RE
@@ -1115,8 +1315,8 @@
.na
\fB\fB$IMAGE_META/publisher\fR\fR
.ad
-.RS 26n
-.rt
+.sp .6
+.RS 4n
Contains a directory for each publisher. Each directory stores publisher-specific metadata.
.RE
@@ -1145,7 +1345,16 @@
.SH SEE ALSO
.sp
.LP
-\fBpkg\fR(1), \fBpkgsend\fR(1), \fBpkg.depotd\fR(1M), \fBsvcadm\fR(1M), \fBpkginfo\fR(4)
+\fBpkg\fR(1), \fBpkg\fR(1), \fBpkg\fR(1M), \fBpkg\fR(1M), \fBsvcs\fR(1), \fBsvcadm\fR(1M)
+.sp
+.LP
+\fIAdding and Updating Oracle Solaris 11.1 Software Packages\fR
+.sp
+.LP
+\fICopying and Creating Oracle Solaris 11.1 Package Repositories\fR
+.sp
+.LP
+\fIPackaging and Delivering Software With the Oracle Solaris 11 Image Packaging System\fR
.sp
.LP
\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
--- a/src/man/pkg.depotd.1m Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkg.depotd.1m Mon Jun 25 09:24:54 2012 -0700
@@ -1,29 +1,30 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkg.depotd 1m "28 Jul 2011" "SunOS 5.11" "System Administration Commands"
+.TH pkg.depotd 1M "5 Jun 2012" "SunOS 5.11" "System Administration Commands"
.SH NAME
pkg.depotd \- Image Packaging System depot server
.SH SYNOPSIS
.LP
.nf
-/usr/lib/pkg.depotd [-a \fIaddress\fR] [-d \fIinst_root\fR] [-p \fIport\fR]
- [-s \fIthreads\fR] [-t \fIsocket_timeout\fR] [--add-content]
- [--cfg] [--content-root] [--debug feature_list]
- [--disable-ops=\fIop\fR[/1][,...]]
- [--log-access] [--log-errors] [--mirror]
- [--proxy-base \fIurl\fR] [--readonly] [--rebuild]
- [--ssl-cert-file] [--ssl-dialog] [--ssl-key-file]
- [--writable-root]
+/usr/lib/pkg.depotd [--cfg \fIsource\fR] [-a \fIaddress\fR]
+ [--content-root \fIroot_dir\fR] [-d \fIinst_root\fR]
+ [--debug \fIfeature_list\fR] [--disable-ops=\fIop\fR[/1][,...]]
+ [--image-root \fIpath\fR] [--log-access \fIdest\fR]
+ [--log-errors \fIdest\fR] [--mirror \fImode\fR] [-p \fIport\fR]
+ [--proxy-base \fIurl\fR] [--readonly \fImode\fR] [-s \fIthreads\fR]
+ [--sort-file-max-size \fIbytes\fR] [--ssl-cert-file \fIsource\fR]
+ [--ssl-dialog \fItype\fR] [--ssl-key-file \fIsource\fR]
+ [-t \fIsocket_timeout\fR] [--writable-root \fIpath\fR]
.fi
.SH DESCRIPTION
.sp
.LP
-\fBpkg.depotd\fR is the depot server for the image packaging system. It provides network access to the data contained within a package repository. Clients that do not support direct access to a repository through the file system, or for which network access is the only available or preferred method of transport, typically use the package depot.
+\fBpkg.depotd\fR is the depot server for the Image Packaging System. It provides network access to the data contained within a package repository. Clients that do not support direct access to a repository through the file system, or for which network access is the only available or preferred method of transport, typically use the package depot.
.sp
.LP
-Clients such as \fBpkg\fR(1), the retrieval client, can retrieve a list of packages and package metadata from a repository directly or through the depot server. \fBpkgsend\fR(1), the publication client, can send new versions of packages to a repository directly or through the depot server. \fBpkgrepo\fR(1) can be used to create repositories for use with the depot server, or to manage them both directly and through the depot server.
+Clients such as \fBpkg\fR, the retrieval client, can retrieve a list of packages and package metadata from a repository directly or through the depot server. \fBpkgsend\fR, the publication client, can send new versions of packages to a repository directly or through the depot server. \fBpkgrepo\fR can be used to create repositories for use with the depot server, or to manage them both directly and through the depot server.
.sp
.LP
\fBpkg.depotd\fR is typically run as a service on the system. Package and software developers might want to run private copies for testing.
@@ -33,7 +34,7 @@
.SH SMF PROPERTIES
.sp
.LP
-The \fBpkg.depot\fR server is generally configured via the \fBsmf\fR(5) properties associated with its service. The following properties are recognized:
+The \fBpkg.depot\fR server is generally configured via the SMF properties associated with its service. See the \fBsmf\fR(5) man page for information about SMF properties. The following properties are recognized:
.sp
.ne 2
.mk
@@ -108,7 +109,7 @@
.ad
.sp .6
.RS 4n
-(\fBastring\fR) The file system path at which the instance should find its repository data. Required unless \fBPKG_REPO\fR has been provided. The default value is \fB/var/pkgrepo\fR.
+(\fBastring\fR) The file system path at which the instance should find its repository data. Required unless \fBfile_root\fR or \fBPKG_REPO\fR has been provided. The default value is \fB/var/pkgrepo\fR.
.RE
.sp
@@ -119,7 +120,7 @@
.ad
.sp .6
.RS 4n
-(\fBastring\fR) The destination for any access related information logged by the depot process. Possible values are: \fBstderr\fR, \fBstdout\fR, \fBnone\fR, or an absolute path name. The default value is \fBstdout\fR if \fBstdout\fR is a \fBtty\fR. If \fBstdout\fR is not a \fBtty\fR, the default value is \fBnone\fR.
+(\fBastring\fR) The destination for any access related information logged by the depot process. Possible values are: \fBstderr\fR, \fBstdout\fR, \fBnone\fR, or an absolute path name. The default value is \fBstdout\fR if \fBstdout\fR is a \fBtty\fR. If \fBstdout\fR is not a \fBtty\fR, the default value is \fBnone\fR. If you run \fBpkg\fR as a service, the default value for \fBlog_access\fR is \fBnone\fR and output is written to \fB/var/svc/log/application-pkg-server:*\fR. See the \fBlogadm\fR(1M) man page for examples of managing large log files.
.RE
.sp
@@ -130,7 +131,7 @@
.ad
.sp .6
.RS 4n
-(\fBastring\fR) The destination for any errors or other information logged by the depot process. Possible values are: \fBstderr\fR, \fBstdout\fR, \fBnone\fR, or an absolute path name. The default value is \fBstderr\fR.
+(\fBastring\fR) The destination for any errors or other information logged by the depot process. Possible values are: \fBstderr\fR, \fBstdout\fR, \fBnone\fR, or an absolute path name. The default value is \fBstderr\fR. See the \fBlogadm\fR(1M) man page for examples of managing large log files.
.RE
.sp
@@ -174,7 +175,7 @@
.ad
.sp .6
.RS 4n
-(\fBboolean\fR) Sets whether modifying operations, such as those initiated by \fBpkgsend\fR(1), are disabled. Retrieval operations are still available. This property cannot be true when the \fBpkg/mirror\fR property is true. The default value is \fBtrue\fR.
+(\fBboolean\fR) Sets whether modifying operations, such as those initiated by \fBpkgsend\fR, are disabled. Retrieval operations are still available. This property cannot be true when the \fBpkg/mirror\fR property is true. The default value is \fBtrue\fR.
.RE
.sp
@@ -225,8 +226,8 @@
.na
\fB\fBbuiltin\fR\fR
.ad
-.RS 25n
-.rt
+.sp .6
+.RS 4n
Prompt for the passphrase. This is the default value.
.RE
@@ -236,8 +237,8 @@
.na
\fB\fBexec:\fI/path/to/program\fR\fR\fR
.ad
-.RS 25n
-.rt
+.sp .6
+.RS 4n
Execute the specified external program to obtain the passphrase. The first argument to the program is \fB\&''\fR, and is reserved. The second argument to the program is the port number of the server. The passphrase is printed to \fBstdout\fR.
.RE
@@ -247,8 +248,8 @@
.na
\fB\fBsmf:fmri\fR\fR
.ad
-.RS 25n
-.rt
+.sp .6
+.RS 4n
Attempt to retrieve the value of the property \fBpkg_secure/ssl_key_passphrase\fR from the service instance related to the FMRI.
.RE
@@ -284,7 +285,7 @@
.ad
.sp .6
.RS 4n
-(\fBastring\fR) The file system path to a directory to which the program has write access. This is used with the \fB-readonly\fR option to enable the depot server to create files, such as search indices, without needing write access to the package information.
+(\fBastring\fR) The file system path to a directory to which the program has write access. This is used with the \fB-readonly\fR option to enable the depot server to create files, such as search indexes, without needing write access to the package information.
.RE
.sp
@@ -307,8 +308,8 @@
.na
\fB\fBpkg_bui/feed_description\fR\fR
.ad
-.RS 28n
-.rt
+.sp .6
+.RS 4n
(\fBastring\fR) A descriptive paragraph for the RSS/Atom feed.
.RE
@@ -318,8 +319,8 @@
.na
\fB\fBpkg_bui/feed_icon\fR\fR
.ad
-.RS 28n
-.rt
+.sp .6
+.RS 4n
(\fBastring\fR) The path name of a small image used to visually represent the RSS/Atom feed. The path name should be relative to the \fBcontent_root\fR. The default value is \fBweb/_themes/pkg-block-icon.png\fR.
.RE
@@ -329,8 +330,8 @@
.na
\fB\fBpkg_bui/feed_logo\fR\fR
.ad
-.RS 28n
-.rt
+.sp .6
+.RS 4n
(\fBastring\fR) The path name of a large image that will be used to visually brand or identify the RSS/Atom feed. This value should be relative to the \fBcontent_root\fR. The default value is \fBweb/_themes/pkg-block-icon.png\fR.
.RE
@@ -340,8 +341,8 @@
.na
\fB\fBpkg_bui/feed_name\fR\fR
.ad
-.RS 28n
-.rt
+.sp .6
+.RS 4n
(\fBastring\fR) A short, descriptive name for RSS/Atom feeds generated by the depot serving the repository. The default value is "package repository feed".
.RE
@@ -351,25 +352,25 @@
.na
\fB\fBpkg_bui/feed_window\fR\fR
.ad
-.RS 28n
-.rt
+.sp .6
+.RS 4n
(\fBcount\fR) The number of hours before the feed for the repository was last generated, to include when generating the feed.
.RE
.sp
.LP
-The package depot is also able to act as a mirror server for local client images from \fBpkg\fR(5). This enables clients that share a subnet on a LAN to mirror their file caches. Clients can download files from one another, thereby reducing load on the package depot server. This functionality is available as an alternate depot service configured by \fBsmf\fR(5). It uses mDNS and \fBdns-sd\fR for service discovery.
+The package depot is also able to act as a mirror server for local client images from \fBpkg\fR(5). This enables clients that share a subnet on a LAN to mirror their file caches. Clients can download files from one another, thereby reducing load on the package depot server. This functionality is available as an alternate depot service configured by SMF. It uses mDNS and \fBdns-sd\fR for service discovery.
.sp
.LP
-The mDNS mirror is generally configured via the \fBsmf\fR(5) properties associated with its service. The following properties are recognized:
+The mDNS mirror is generally configured via the SMF properties associated with its service. The following properties are recognized:
.sp
.ne 2
.mk
.na
\fB\fBpkg/image_root\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
(\fBastring\fR) The path to the image whose file information will be used as a cache for file data. The default value is \fB/\fR.
.RE
@@ -379,24 +380,24 @@
.na
\fB\fBpkg/port\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
(\fBcount\fR) The port number on which the instance should listen for incoming package requests. The default value is 80.
.RE
.SH OPTIONS
.sp
.LP
-\fBpkg.depotd\fR can read its base configuration information from a file or from the property data of an existing \fBsmf\fR(5) service instance.
+\fBpkg.depotd\fR can read its base configuration information from a file or from the property data of an existing SMF service instance.
.sp
.ne 2
.mk
.na
\fB\fB--cfg\fR \fIsource\fR\fR
.ad
-.RS 16n
-.rt
-The path name of the file to use when reading and writing configuration data, or a string of the form \fBsmf:\fIfmri\fR\fR where \fIfmri\fR is the service fault management resource identifier (FMRI) of the instance to read configuration data from. See "Depot Configuration" below for details on the format of the file specified.
+.sp .6
+.RS 4n
+Specify the path name of a file to use when reading and writing configuration data, or a string of the form \fBsmf:\fIfmri\fR\fR where \fIfmri\fR is the service fault management resource identifier (FMRI) of the instance to read configuration data from. See "Depot Configuration" below for details on the format of the file specified.
.RE
.sp
@@ -408,8 +409,8 @@
.na
\fB\fB-a\fR \fIaddress\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/address\fR above.
.RE
@@ -419,8 +420,8 @@
.na
\fB\fB--content-root\fR \fIroot_dir\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/content_root\fR above.
.RE
@@ -430,8 +431,8 @@
.na
\fB\fB-d\fR \fIinst_root\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/inst_root\fR above.
.RE
@@ -439,10 +440,10 @@
.ne 2
.mk
.na
-\fB\fB--debug\fR \fIfeatures\fR\fR
+\fB\fB--debug\fR \fIfeature_list\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/debug\fR above.
.RE
@@ -450,10 +451,10 @@
.ne 2
.mk
.na
-\fB\fB--disable-ops\fR \fIop_list\fR\fR
+\fB\fB--disable-ops\fR=\fIop\fR[\fB/1\fR][,...]\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/disable_ops\fR above.
.RE
@@ -463,8 +464,8 @@
.na
\fB\fB--image-root\fR \fIpath\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/image_root\fR above.
.RE
@@ -474,8 +475,8 @@
.na
\fB\fB--log-access\fR \fIdest\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/log_access\fR above.
.RE
@@ -485,8 +486,8 @@
.na
\fB\fB--log-errors\fR \fIdest\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/log_errors\fR above.
.RE
@@ -494,10 +495,10 @@
.ne 2
.mk
.na
-\fB\fB--mirror\fR\fR
+\fB\fB--mirror\fR \fImode\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/mirror\fR above.
.RE
@@ -507,8 +508,8 @@
.na
\fB\fB-p\fR \fIport\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/port\fR above.
.RE
@@ -518,8 +519,8 @@
.na
\fB\fB--proxy-base\fR \fIurl\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/proxy_base\fR above. This option is ignored if an empty value is provided.
.RE
@@ -527,10 +528,10 @@
.ne 2
.mk
.na
-\fB\fB--readonly\fR\fR
+\fB\fB--readonly\fR \fImode\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/readonly\fR above.
.RE
@@ -540,8 +541,8 @@
.na
\fB\fB-s\fR \fIthreads\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/threads\fR above.
.RE
@@ -549,10 +550,10 @@
.ne 2
.mk
.na
-\fB\fB-s-ort-file-max-size\fR \fIbytes\fR\fR
+\fB\fB--sort-file-max-size\fR \fIbytes\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/sort_file_max_size\fR above.
.RE
@@ -562,8 +563,8 @@
.na
\fB\fB--ssl-cert-file\fR \fIsource\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/ssl_cert_file\fR above.
.RE
@@ -573,8 +574,8 @@
.na
\fB\fB--ssl-dialog\fR \fItype\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/ssl_dialog\fR above.
.RE
@@ -584,8 +585,8 @@
.na
\fB\fB--ssl-key-file\fR \fIsource\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/ssl_key_file\fR above.
.RE
@@ -595,8 +596,8 @@
.na
\fB\fB-t\fR \fIsocket_timeout\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/socket_timeout\fR above.
.RE
@@ -606,18 +607,33 @@
.na
\fB\fB--writable-root\fR \fIpath\fR\fR
.ad
-.RS 30n
-.rt
+.sp .6
+.RS 4n
See \fBpkg/writable_root\fR above.
.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.
+.RE
+
+.sp
.LP
-Additional administrative and management functionality for package repositories is provided by \fBpkgrepo\fR(1).
+Additional administrative and management functionality for package repositories is provided by \fBpkgrepo\fR.
.SH DEPOT CONFIGURATION
.sp
.LP
-When a configuration file is provided (instead of an \fBsmf\fR(5) FMRI) by using the \fB--cfg\fR option, the depot server reads and writes all configuration data in a simple text format. The configuration data is described in "SMF Properties" above. The configuration data consists of sections, lead by a \fB[\fIsection\fR]\fR header, and followed by \fBname = \fIvalue\fR\fR entries. Continuations are in the style of RFC 822. Values can be split over multiple lines by beginning continuation lines with whitespace.
+When a configuration file is provided (instead of an SMF FMRI) by using the \fB--cfg\fR option, the depot server reads and writes all configuration data in a simple text format. The configuration data is described in "SMF Properties" above. The configuration data consists of sections, lead by a \fB[\fIsection\fR]\fR header, and followed by \fBname = \fIvalue\fR\fR entries. Continuations are in the style of RFC 822. Values can be split over multiple lines by beginning continuation lines with whitespace.
.sp
.LP
Any required values not provided in the configuration file must be provided using the option listed in "Options" above. A sample configuration file might look like this:
@@ -700,7 +716,7 @@
.na
\fB\fB0\fR\fR
.ad
-.RS 6n
+.RS 13n
.rt
Successful operation.
.RE
@@ -711,7 +727,7 @@
.na
\fB\fB1\fR\fR
.ad
-.RS 6n
+.RS 13n
.rt
An error occurred.
.RE
@@ -722,7 +738,7 @@
.na
\fB\fB2\fR\fR
.ad
-.RS 6n
+.RS 13n
.rt
Invalid command line options were specified.
.RE
@@ -733,7 +749,7 @@
.na
\fB\fB99\fR\fR
.ad
-.RS 6n
+.RS 13n
.rt
An unanticipated exception occurred.
.RE
@@ -745,8 +761,8 @@
.na
\fB\fB/usr/share/lib/pkg\fR\fR
.ad
-.RS 22n
-.rt
+.sp .6
+.RS 4n
Default presentation content location. Modify \fBpkg/content_root\fR to select an alternate location.
.RE
@@ -772,7 +788,7 @@
.SH SEE ALSO
.sp
.LP
-\fBdns-sd\fR(1), \fBmdnsd\fR(1), \fBpkg\fR(1), \fBpkgrepo\fR(1), \fBpkgsend\fR(1), \fBsyslogd\fR(1M), \fBsmf\fR(5)
+\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
@@ -785,7 +801,7 @@
The mDNS mirror service is managed by SMF under the service identifier \fBsvc:/application/pkg/dynamic-mirror\fR.
.sp
.LP
-To control read access to the depot, you can use an HTTP reverse proxy in combination with authentication methods such as client based SSL certificate access, which \fBpkg\fR(1) natively supports.
+To control read access to the depot, you can use an HTTP reverse proxy in combination with authentication methods such as client based SSL certificate access, which \fBpkg\fR natively supports.
.sp
.LP
Changes to configuration, or changes to package data using file system based operations, require a restart of the depot server process so that the changes can be reflected in operations and output. Use one of the following methods to restart the depot server process:
@@ -793,13 +809,13 @@
.TP
.ie t \(bu
.el o
-Use \fBsvcadm\fR(1M) to restart the \fBapplication/pkg/server\fR instance.
+Use \fBsvcadm\fR to restart the \fBapplication/pkg/server\fR instance.
.RE
.RS +4
.TP
.ie t \(bu
.el o
-Send a \fBSIGUSR1\fR signal to the depot server process using \fBkill\fR(1). This executes a "graceful restart" that leaves the process intact but reloads all configuration, package, and search data:
+Send a \fBSIGUSR1\fR signal to the depot server process using \fBkill\fR. This executes a "graceful restart" that leaves the process intact but reloads all configuration, package, and search data:
.sp
.in +2
.nf
--- a/src/man/pkg.sysrepo.1m Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkg.sysrepo.1m Mon Jun 25 09:24:54 2012 -0700
@@ -1,13 +1,13 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkg.sysrepo 1m "28 Jul 2011" "SunOS 5.11" "System Administration Commands"
+.TH pkg.sysrepo 1M "27 May 2012" "SunOS 5.11" "System Administration Commands"
.SH NAME
pkg.sysrepo \- Image Packaging System system repository configuration
.SH SYNOPSIS
.LP
.nf
-pkg.sysrepo -p \fIport\fR [-c \fIcache_dir\fR] [-s \fIcache_size\fR]
+/usr/lib/pkg.sysrepo -p \fIport\fR [-c \fIcache_dir\fR] [-s \fIcache_size\fR]
[-w \fIhttp_proxy\fR] [-W \fIhttps_proxy\fR]
.fi
@@ -23,7 +23,7 @@
The system repository is primarily used in the global zone to allow non-global zones to access the repositories configured in the global zone. The SMF services \fBsvc:/application/pkg/zones-proxyd\fR and \fBsvc:/application/pkg/zones-proxy-client\fR are responsible for providing the transport between non-global zones and the global zone. This transport is only used by \fBpkg\fR(5).
.sp
.LP
-Note that only http, https, p5p and v4 file repositories are supported. Older file repository formats are not supported. See \fBpkgrepo\fR(1) for more information about repository versions.
+Note that only \fBhttp\fR, \fBhttps\fR, and \fBv4\fR file repositories and \fBp5p\fR archives are supported. Older file repository formats are not supported. See \fBpkgrepo\fR(1) for more information about repository versions.
.SH OPTIONS
.sp
.LP
@@ -34,9 +34,9 @@
.na
\fB\fB-c\fR \fIcache_dir\fR\fR
.ad
-.RS 18n
-.rt
-The absolute path to a directory that should be used by the system repository for caching responses from the publishers configured.
+.sp .6
+.RS 4n
+Specify the absolute path to a directory that should be used by the system repository for caching responses from the publishers configured.
.sp
By default, a file-cache is used. However, the special value \fBmemory\fR can be used to indicate the an in-memory cache should be used. The special value \fBNone\fR can be used to indicate that the system repository should not perform any caching. This setting should be configured using the \fBconfig/cache_dir\fR SMF property.
.RE
@@ -47,9 +47,9 @@
.na
\fB\fB-p\fR \fIport\fR\fR
.ad
-.RS 18n
-.rt
-The port that the system repository should use to listen for requests. This setting should be configured using the \fBconfig/port\fR SMF property.
+.sp .6
+.RS 4n
+Specify the port that the system repository should use to listen for requests. This setting should be configured using the \fBconfig/port\fR SMF property.
.RE
.sp
@@ -58,8 +58,8 @@
.na
\fB\fB-s\fR \fIcache_size\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
An integer value in megabytes that defines the maximum cache size of the system repository. This setting should be configured using the \fBconfig/cache_max\fR SMF property.
.RE
@@ -69,8 +69,8 @@
.na
\fB\fB-w\fR \fIhttp_proxy\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
A string of the form \fB\fIscheme\fR://\fIhostname\fR[:\fIport\fR]\fR that defines a web proxy that the system repository can use to access http-based package repositories. This setting can be configured using the \fBconfig/http_proxy\fR SMF property.
.RE
@@ -80,8 +80,8 @@
.na
\fB\fB-W\fR \fIhttps_proxy\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
A string of the form \fB\fIscheme\fR://\fIhostname\fR[:\fIport\fR]\fR that defines a web proxy that the system repository can use to access https-based package repositories. This setting can be configured using the \fBconfig/https_proxy\fR SMF property.
.RE
@@ -166,7 +166,7 @@
.SH SEE ALSO
.sp
.LP
-\fBpkg\fR(1), \fBpkgdepotd\fR(1M), \fBpkg\fR(5)
+\fBpkg\fR(1), \fBpkg.depotd\fR(1M), \fBpkg\fR(5)
.sp
.LP
\fBhttp://hub.opensolaris.org/bin/view/Project+pkg/\fR
--- a/src/man/pkgdepend.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgdepend.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgdepend 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgdepend 1 "22 Jun 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgdepend \- Image Packaging System dependency analyzer
.SH SYNOPSIS
@@ -13,19 +13,19 @@
.LP
.nf
/usr/bin/pkgdepend generate [-IMm] -d \fIdir\fR [-d \fIdir\fR]
- [-D \fIname\fR=\fIvalue\fR] [-k \fIpath\fR] \fImanifest_path\fR
+ [-D \fIname\fR=\fIvalue\fR] [-k \fIpath\fR] \fImanifest_file\fR
.fi
.LP
.nf
-/usr/bin/pkgdepend resolve [-EmoSv] [-d \fIoutput_dir\fR]
- [-e \fIexternal_package_file\fR] [-s \fIsuffix\fR] \fImanifest_path\fR ...
+/usr/bin/pkgdepend resolve [-moSv] [-d \fIoutput_dir\fR]
+ [-s \fIsuffix\fR] \fImanifest_file\fR ...
.fi
.SH DESCRIPTION
.sp
.LP
-\fBpkgdepend\fR is used to generate and resolve dependencies for packages. A package might depend on files from other packages. \fBpkgdepend\fR is typically used in two passes: file dependency generation and file-to-package resolution.
+The \fBpkgdepend\fR command generates and resolves dependencies for packages. A package might depend on files from other packages. The \fBpkgdepend\fR command is typically used in two passes: file dependency generation and file-to-package resolution.
.sp
.LP
The \fBgenerate\fR subcommand examines the content of a package and determines what external files the package needs.
@@ -43,7 +43,7 @@
.ad
.RS 14n
.rt
-ELF headers in delivered files are analyzed for dependency information, with the \fB-k\fR and \fB-D\fR options modifying the information obtained. For more details on ELF dependencies, see \fBldd\fR(1) and the \fILinker and Libraries Guide\fR.
+ELF headers in delivered files are analyzed for dependency information, with the \fB-k\fR and \fB-D\fR options modifying the information obtained. For more details on ELF dependencies, see \fBldd\fR and the \fILinker and Libraries Guide\fR.
.RE
.sp
@@ -98,22 +98,30 @@
.ne 2
.mk
.na
-\fB\fB-R\fR \fIdir\fR\fR
+\fB\fB-?\fR\fR
.ad
-.RS 16n
-.rt
-Operate on the image rooted at directory \fIdir\fR. If no directory was specified or determined based on environment, the default is /. See the "Environment Variables" section for more information.
+.br
+.na
+\fB\fB--help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB--help\fR or \fB-?\fR\fR
+\fB\fB-R\fR \fIdir\fR\fR
.ad
-.RS 16n
-.rt
-Displays a usage message.
+.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.
.RE
.SH SUB-COMMANDS
@@ -124,33 +132,84 @@
.ne 2
.mk
.na
-\fBgenerate\fR [\fB-IMm\fR] \fB-d\fR \fIdir\fR [\fB-d\fR \fIdir\fR] [\fB-D\fR \fIname\fR=\fIvalue\fR] [\fB-k\fR \fIpath\fR] \fImanifest_path\fR
+\fB\fBpkgdepend generate\fR [\fB-IMm\fR] \fB-d\fR \fIdir\fR [\fB-d\fR \fIdir\fR] [\fB-D\fR \fIname\fR=\fIvalue\fR] [\fB-k\fR \fIpath\fR] \fImanifest_file\fR\fR
+.ad
+.sp .6
+.RS 4n
+Produce the dependencies on files of the manifest specified by \fImanifest_file\fR.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-I\fR\fR
+.ad
+.sp .6
+.RS 4n
+Show the dependencies that are satisfied within \fImanifest_file\fR. Do not use the result of \fB-I\fR with \fBpkgdepend resolve\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-M\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a list of file types that could not be analyzed.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-m\fR\fR
.ad
.sp .6
.RS 4n
-Produce the dependencies on files of the manifest specified by \fImanifest_path\fR.
-.sp
-With \fB-I\fR, show the dependencies that are satisfied within the given manifest.
+Repeat the original manifest with any discovered dependencies added after.
+.RE
+
.sp
-With \fB-M\fR, display a list of file types that could not be analyzed.
-.sp
-With \fB-m\fR, repeat the original manifest with any discovered dependencies added after.
+.ne 2
+.mk
+.na
+\fB\fB-d\fR \fIdir\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add \fIdir\fR to a list of directories to search for the manifest's files.
+.RE
+
.sp
-With \fB-d\fR, add \fIdir\fR to a list of directories to search for the manifest's files.
-.sp
-For each \fB-D\fR, add the \fIvalue\fR as a way to expand the token \fIname\fR in run paths for ELF file dependencies.
+.ne 2
+.mk
+.na
+\fB\fB-D\fR \fIname\fR=\fIvalue\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add the \fIvalue\fR as a way to expand the token \fIname\fR in run paths for ELF file dependencies.
+.RE
+
.sp
-For each \fB-k\fR, add the \fIpath\fR to the list of run paths to search for kernel modules. Using the \fB-k\fR argument removes the default paths, which are \fB/kernel\fR and \fB/usr/kernel\fR.
+.ne 2
+.mk
+.na
+\fB\fB-k\fR \fIpath\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add the \fIpath\fR to the list of run paths to search for kernel modules. Using the \fB-k\fR option removes the default paths, which are \fB/kernel\fR and \fB/usr/kernel\fR.
.sp
-Run paths such as those specified by the \fB-k\fR option can also be specified per action or per manifest by using the action or manifest attribute \fBpkg.depend.runpath\fR. The value of the \fBpkg.depend.runpath\fR attribute is a colon-separated string of the paths to use.
-.sp
-The use of \fB-k\fR is overridden by any \fBpkg.depend.runpath\fR attributes set in the manifest or action.
+Run paths such as those specified by the \fB-k\fR option can also be specified per action or per manifest by using the action or manifest attribute \fBpkg.depend.runpath\fR. The value of the \fBpkg.depend.runpath\fR attribute is a colon-separated string of the paths to use. Setting any \fBpkg.depend.runpath\fR attributes in the manifest or action overrides paths specified with the \fB-k\fR option.
.sp
The special token \fB$PKGDEPEND_RUNPATH\fR can be used as one component of the \fBpkg.depend.runpath\fR attribute value in order to include the standard system run path for the file being analyzed.
-.sp
+.RE
+
In some cases, you might want to prevent automatic generation of dependencies. For example, if a package delivers a sample Python script that imports a set of modules, those modules imported by the sample script are not dependencies for the package that delivers the sample script. Use the action or manifest attribute \fBpkg.depend.bypass-generate\fR to prevent generating dependencies against the specified files.
.sp
-The \fBpkg.depend.bypass-generate\fR values are \fBperl5\fR regular expressions that match file names. The regular expressions are implicitly anchored at the start and end of the file path. The value given in the following example matches \fBthis/that\fR but does not match \fBsomething/this/that/the/other\fR.
+The \fBpkg.depend.bypass-generate\fR values are Python regular expressions that match file names. The regular expressions are implicitly anchored at the start and end of the file path. The value given in the following example matches \fBthis/that\fR but does not match \fBsomething/this/that/the/other\fR.
.sp
.in +2
.nf
@@ -158,33 +217,86 @@
.fi
.in -2
+For more information about Python regular expression syntax, use the command \fBpydoc re\fR or see more complete documentation at \fBhttp://docs.python.org/dev/howto/regex.html\fR.
+.sp
+When \fBpkgdepend generate\fR input manifests contain SMF manifest files, any SMF services or instances declared by those SMF manifest files are included in the \fBpkgdepend\fR output. These SMF services or instances are included in the form of a \fBset\fR action with the name \fBorg.opensolaris.smf.fmri\fR.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkgdepend resolve\fR [\fB-moSv\fR] [\fB-d\fR \fIoutput_dir\fR] [\fB-s\fR \fIsuffix\fR] \fImanifest_file\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Transform dependencies on files into dependencies on the packages that deliver those files. Dependencies are first resolved against the manifests given on the command line and then against the packages installed on the system. By default, the dependencies for each manifest are placed in a file named \fB\fImanifest_file\fR.res\fR.
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-m\fR\fR
+.ad
+.sp .6
+.RS 4n
+Repeat the manifest, with any dependencies produced by the \fBgenerate\fR step removed, before adding the resolved dependencies.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-o\fR\fR
+.ad
+.sp .6
+.RS 4n
+Write the results to standard output. This option is intended for human consumption. Appending this output to a file might result in an invalid manifest. The \fB-d\fR or \fB-s\fR options are strongly recommended instead of \fB-o\fR for use in a pipeline for manifest processing.
.RE
.sp
.ne 2
.mk
.na
-\fBresolve\fR [\fB-EmoSv\fR] [\fB-d\fR \fIoutput_dir\fR] [\fB-e\fR \fIexternal_package_file\fR] [\fB-s\fR \fIsuffix\fR] \fImanifest_path\fR ...\fR
+\fB\fB-d\fR \fIoutput_dir\fR\fR
+.ad
+.sp .6
+.RS 4n
+Write the resolved dependencies for each manifest provided in a separate file in \fIoutput_dir\fR. By default, each file has the same base name as the manifest that was the source of the dependencies written to that file.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIsuffix\fR\fR
.ad
.sp .6
.RS 4n
-Transform dependencies on files into dependencies on the packages that deliver those files. Dependencies are first resolved against the manifests given on the command line and then against the packages installed on the system. By default, the dependencies for each manifest are placed in a file named \fB\fImanifest_path\fR.res\fR.
-.sp
-With \fB-m\fR, repeat the manifest, with any dependencies produced by the \fBgenerate\fR step removed, before adding the resolved dependencies.
-.sp
-With \fB-o\fR, write the results to standard output. This option is intended for human consumption. Appending this output to a file might result in an invalid manifest. The \fB-d\fR or \fB-s\fR options are strongly recommended instead of \fB-o\fR for use in a pipe line for manifest processing.
-.sp
-With \fB-d\fR, write the resolved dependencies for each manifest provided in a separate file in \fIoutput_dir\fR. By default, each file has the same base name as the manifest that was the source of the dependencies written to that file.
+For each output file, append \fIsuffix\fR to the base name of the file that was the source of the resolved dependencies. If \fIsuffix\fR is not \fI\&.suffix\fR, a period (.) is prepended to \fIsuffix\fR.
+.RE
+
.sp
-With \fB-e\fR, only resolve against those packages from the system whose name matches a pattern in one of the \fIexternal_package_files\fR. Cannot be used with \fB-S\fR.
-.sp
-With \fB-E\fR, if \fB-e\fR was used, show those packages expected to be external dependencies that were not. If \fB-e\fR was not used, display the external dependencies of the resolved packages -- the packages, not named on the command line, which are targets of dependencies in the resolved packages.
+.ne 2
+.mk
+.na
+\fB\fB-S\fR\fR
+.ad
+.sp .6
+.RS 4n
+Only resolve against the manifests given on the command line and not against the manifests installed on the system.
+.RE
+
.sp
-With \fB-s\fR, for each output file, append \fIsuffix\fR to the base name of the file that was the source of the resolved dependencies. A "." is prepended to \fIsuffix\fR if it is not provided.
-.sp
-With \fB-S\fR, only resolve against the manifests given on the command line and not against the manifests installed on the system.
-.sp
-With \fB-v\fR, include additional package dependency debugging metadata.
+.ne 2
+.mk
+.na
+\fB\fB-v\fR\fR
+.ad
+.sp .6
+.RS 4n
+Include additional package dependency debugging metadata.
+.RE
+
.RE
.SH EXAMPLES
@@ -289,10 +401,10 @@
# Add runpath and bypass-generate attributes:
#
file NOHASH 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
- pkg.depend.bypass-generate=^usr/lib/python2.6/vendor-packages/xdg/.*$ \e
+ pkg.depend.bypass-generate=.*/test.py.* \e
+ pkg.depend.bypass-generate=.*/testmodule.so \e
+ pkg.depend.bypass-generate=.*/test.so \e
+ pkg.depend.bypass-generate=usr/lib/python2.6/vendor-packages/xdg/.* \e
pkg.depend.runpath=$PKGDEPEND_RUNPATH:/opt/python
$ \fBpkgdepend generate -d proto manifest.py\fR
--- a/src/man/pkgdiff.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgdiff.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgdiff 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgdiff 1 "27 May 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgdiff \- compare package manifests
.SH SYNOPSIS
@@ -24,8 +24,8 @@
.na
\fB+ \fIcomplete_action\fR\fR
.ad
-.RS 21n
-.rt
+.sp .6
+.RS 4n
This action is in \fIfile2\fR but not in \fIfile1\fR.
.RE
@@ -35,8 +35,8 @@
.na
\fB- \fIcomplete_action\fR\fR
.ad
-.RS 21n
-.rt
+.sp .6
+.RS 4n
This action is in \fIfile1\fR but not in \fIfile2\fR.
.RE
@@ -53,8 +53,8 @@
.na
\fB- \fIattribute1\fR=\fIvalue1\fR\fR
.ad
-.RS 23n
-.rt
+.sp .6
+.RS 4n
This \fIattribute\fR,\fIvalue\fR is in \fIfile1\fR but not in \fIfile2\fR.
.RE
@@ -64,8 +64,8 @@
.na
\fB+ \fIattribute2\fR=\fIvalue2\fR\fR
.ad
-.RS 23n
-.rt
+.sp .6
+.RS 4n
This \fIattribute\fR,\fIvalue\fR is in \fIfile2\fR but not in \fIfile1\fR.
.RE
@@ -80,10 +80,21 @@
.ne 2
.mk
.na
+\fB\fB--help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fB-i\fR \fIattribute\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
Ignore \fIattribute\fR if present during comparisons. File hash values can be ignored with \fB-i\fR \fIhash\fR. This option cannot be used with the \fB-o\fR option. This option can be repeated.
.RE
@@ -93,8 +104,8 @@
.na
\fB\fB-o\fR \fIattribute\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
Only report differences in \fIattribute\fR. This option cannot be used with the \fB-i\fR option. This option elides any action changes that do not affect \fIattribute\fR on an action.
.RE
@@ -104,8 +115,8 @@
.na
\fB\fB-v\fR \fIname\fR=\fIvalue\fR\fR
.ad
-.RS 17n
-.rt
+.sp .6
+.RS 4n
Only compute differences for this variant value. For example, only compute differences for \fBarch=sparc\fR. This variant tag is removed for all actions before comparison. Only one value can be specified per variant. This option can be repeated for different variants.
.RE
--- a/src/man/pkgfmt.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgfmt.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgfmt 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgfmt 1 "27 May 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgfmt \- format a package manifest
.SH SYNOPSIS
@@ -28,9 +28,24 @@
.ne 2
.mk
.na
+\fB\fB-?\fR\fR
+.ad
+.br
+.na
+\fB\fB--help\fR\fR
+.ad
+.RS 10n
+.rt
+Display a usage message.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fB-c\fR\fR
.ad
-.RS 6n
+.RS 10n
.rt
Check whether the manifest is formatted in the \fBpkgfmt\fR style.
.RE
@@ -41,7 +56,7 @@
.na
\fB\fB-d\fR\fR
.ad
-.RS 6n
+.RS 10n
.rt
Display manifest differences from the formatted version in unified form.
.RE
@@ -52,7 +67,7 @@
.na
\fB\fB-u\fR\fR
.ad
-.RS 6n
+.RS 10n
.rt
Do not wrap lines at 80 characters. This option is useful for applying traditional text processing tools to package manifests.
.RE
--- a/src/man/pkglint.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkglint.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,15 +1,15 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkglint 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkglint 1 "27 May 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkglint \- Image Packaging System package lint
.SH SYNOPSIS
.LP
.nf
-/usr/bin/pkglint [-c \fIdir\fR] [-r \fIuri\fR] [-p \fIregexp\fR]
- [-f \fIrcfile\fR] [-b \fIbuild_no\fR] [-v]
- [-l \fIuri\fR] | \fImanifest\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
.LP
@@ -23,7 +23,7 @@
\fBpkglint\fR runs a series of checks on one or more package manifests, optionally referencing another repository.
.sp
.LP
-\fBpkglint\fR should be used during the package authoring process, prior to package publication. \fBpkglint\fR performs exhaustive testing on the manifests that might be too expensive to perform during normal operation of \fBpkgsend\fR(1) or \fBpkg.depotd\fR(1M). \fBpkglint\fR checks include tests for duplicate actions, missing attributes, and unusual file permissions.
+\fBpkglint\fR should be used during the package authoring process, prior to package publication. \fBpkglint\fR performs exhaustive testing on the manifests that might be too expensive to perform during normal operation of \fBpkgsend\fR or \fBpkg.depotd\fR. \fBpkglint\fR checks include tests for duplicate actions, missing attributes, and unusual file permissions.
.sp
.LP
Manifests for linting can be passed as a space-separated list of local files on the command line, or manifests can be retrieved from a repository.
@@ -35,7 +35,7 @@
Subsequent invocations of \fBpkglint\fR can reuse the cache directory and can omit any \fB-r\fR or \fB-l\fR arguments.
.sp
.LP
-\fBpkglint\fR provides limited support for configuring publishers in the cache directory. Use \fBpkg\fR(1) to perform more complex publisher configuration on these images.
+\fBpkglint\fR provides limited support for configuring publishers in the cache directory. Use \fBpkg\fR to perform more complex publisher configuration on these images.
.sp
.LP
\fBpkglint\fR allows package authors to bypass checks for a given manifest or action. A manifest or action that contains the attribute \fBpkg.linted\fR set to \fBTrue\fR does not produce any lint output for that manifest or action.
@@ -56,10 +56,25 @@
.ne 2
.mk
.na
+\fB\fB-h\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-b\fR \fIbuild_no\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Specify a build number used to narrow the list of packages used during linting from lint and reference repositories. If no \fB-b\fR option is specified, the latest versions of packages are used. See also the \fBversion.pattern\fR configuration property.
.RE
@@ -69,8 +84,8 @@
.na
\fB\fB-c\fR \fIcache_dir\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Specify a local directory used for caching package metadata from the lint and reference repositories.
.RE
@@ -80,8 +95,8 @@
.na
\fB\fB-l\fR \fIlint_uri\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Specify a URI representing the location of the lint repository. Both HTTP and file system based publication are supported. If you specify \fB-l\fR, then you must also specify \fB-c\fR.
.RE
@@ -91,8 +106,8 @@
.na
\fB\fB-L\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
List the known and excluded lint checks and then exit. Display the short name and description of each check. When combined with the \fB-v\fR flag, display the method that implements the check instead of the description.
.RE
@@ -102,8 +117,8 @@
.na
\fB\fB-f\fR \fIconfig_file\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Configure the \fBpkglint\fR session using the \fIconfig_file\fR configuration file.
.RE
@@ -113,8 +128,8 @@
.na
\fB\fB-p\fR \fIregexp\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Specify a regular expression used to narrow the list of packages to be checked from the lint repository. All manifests from the reference repository are loaded (assuming they match the value for \fB-b\fR, if supplied), ignoring this pattern.
.RE
@@ -124,8 +139,8 @@
.na
\fB\fB-r\fR \fIrepo_uri\fR\fR
.ad
-.RS 18n
-.rt
+.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.
.RE
@@ -135,22 +150,11 @@
.na
\fB\fB-v\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Run \fBpkglint\fR in a verbose mode, overriding any \fBlog_level\fR settings in the configuration file.
.RE
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--help\fR or \fB-?\fR\fR
-.ad
-.RS 18n
-.rt
-Display a usage message.
-.RE
-
.SH FILES
.sp
.LP
@@ -161,8 +165,8 @@
.na
\fB\fBlog_level\fR\fR
.ad
-.RS 24n
-.rt
+.sp .6
+.RS 4n
The minimum level at which to emit lint messages. Lint messages lower than this level are discarded. The default value is \fBINFO\fR.
.sp
Log levels in order of least to most severe are \fBDEBUG\fR, \fBINFO\fR, \fBWARNING\fR, \fBERROR\fR, and \fBCRITICAL\fR.
@@ -174,8 +178,8 @@
.na
\fB\fBdo_pub_checks\fR\fR
.ad
-.RS 24n
-.rt
+.sp .6
+.RS 4n
If \fBTrue\fR, perform checks that might only make sense for published packages. The default value is \fBTrue\fR.
.RE
@@ -185,8 +189,8 @@
.na
\fB\fBpkglint.ext.\fR*\fR
.ad
-.RS 24n
-.rt
+.sp .6
+.RS 4n
The plugin mechanism of \fBpkglint\fR allows for additional lint modules to be added at runtime. Any key that starts with \fBpkglint.ext.\fR takes a value that must be a fully-specified Python module. See the "Developers" section for more information.
.RE
@@ -196,8 +200,8 @@
.na
\fB\fBpkglint.exclude\fR\fR
.ad
-.RS 24n
-.rt
+.sp .6
+.RS 4n
A space-separated list of fully specified Python modules, classes, or function names to omit from the set of checks performed.
.RE
@@ -207,8 +211,8 @@
.na
\fB\fBuse_progress_tracker\fR\fR
.ad
-.RS 24n
-.rt
+.sp .6
+.RS 4n
If \fBTrue\fR, use a progress tracker when iterating over manifests during lint runs. The default value is \fBTrue\fR.
.RE
@@ -218,8 +222,8 @@
.na
\fB\fBversion.pattern\fR\fR
.ad
-.RS 24n
-.rt
+.sp .6
+.RS 4n
A version pattern, used when specifying a build number to lint against (\fB-b\fR). If not specified in the configuration file, the \fB-b\fR option uses the pattern \fB*,5.11-0.\fR, matching all components of the 5.11 build, with a branch prefix of 0.
.RE
--- a/src/man/pkgmerge.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgmerge.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgmerge 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgmerge 1 "27 May 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgmerge \- Image Packaging System package merging utility
.SH SYNOPSIS
@@ -30,11 +30,26 @@
.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-d\fR \fIdest_repo\fR\fR
.ad
.sp .6
.RS 4n
-The file system path or URI of the target repository to publish the merged packages to. The target repository must already exist. New repositories can be created using \fBpkgrepo\fR(1).
+Specify the file system path or URI of the target repository to publish the merged packages to. The target repository must already exist. New repositories can be created using \fBpkgrepo\fR.
.RE
.sp
@@ -56,18 +71,7 @@
.ad
.sp .6
.RS 4n
-The variant name and value to use for packages from this source, followed by the file system path or URI of the source repository or package archive to retrieve packages from. Multiple variants can be specified separated by commas. The same variants must be named for all sources. This option can be specified multiple times.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--help\fR or \fB-?\fR\fR
-.ad
-.sp .6
-.RS 4n
-Displays a usage message.
+Specify the variant name and value to use for packages from this source, followed by the file system path or URI of the source repository or package archive to retrieve packages from. Multiple variants can be specified separated by commas. The same variants must be named for all sources. This option can be specified multiple times.
.RE
.SH ENVIRONMENT VARIABLES
--- a/src/man/pkgmogrify.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgmogrify.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgmogrify 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgmogrify 1 "4 Jun 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgmogrify \- Image Packaging System manifest transmogrifier
.SH SYNOPSIS
@@ -45,11 +45,26 @@
.ne 2
.mk
.na
-\fB\fB-D\fR \fIname\fR=\fIvalue\fR\fR
+\fB\fB-?\fR\fR
+.ad
+.br
+.na
+\fB\fB--help\fR\fR
.ad
.sp .6
.RS 4n
-Defines \fIname\fR as a macro, with the value \fIvalue\fR. Macros appear in the input file as \fB$(macro)\fR. Substitution is repeated until no more translations are found. Common idioms include:
+Display a usage message.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-D\fR \fImacro\fR=\fIvalue\fR\fR
+.ad
+.sp .6
+.RS 4n
+Define \fImacro\fR as a macro, with the value \fIvalue\fR. Macros appear in the input file as \fB$(macro)\fR. Substitution is repeated until no more translations are found. Common idioms include:
.RS +4
.TP
.ie t \(bu
@@ -84,11 +99,11 @@
.ne 2
.mk
.na
-\fB\fB-I\fR \fIinclude_directory\fR\fR
+\fB\fB-I\fR \fIincludedir\fR\fR
.ad
.sp .6
.RS 4n
-Adds the specified directory to the search path for both files specified on the command line and embedded include directives.
+Add the specified directory to the search path for both files specified on the command line and embedded include directives.
.RE
.sp
@@ -135,17 +150,6 @@
Write comments into the output manifest showing the effect of transforms. This information can aid in debugging.
.RE
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--help\fR or \fB-?\fR\fR
-.ad
-.sp .6
-.RS 4n
-Displays a usage message.
-.RE
-
.SH EMBEDDED DIRECTIVES
.sp
.LP
@@ -182,13 +186,13 @@
.sp
.in +2
.nf
-[\fIaction-type\fR ... ] [\fIattribute\fR=<\fIvalue-regexp\fR> ...]
+[\fIaction-name\fR ... ] [\fIattribute\fR=<\fIvalue-regexp\fR> ...]
.fi
.in -2
.sp
.LP
-One of the \fIaction-types\fR specified must match. All of the \fIattributes\fR specified must match. The regular expression syntax used is that of Python. For more information about Python regular expression syntax, use the command \fBpydoc re\fR or see more complete documentation at \fBhttp://docs.python.org/dev/howto/regex.html\fR. The regular expression is anchored at the beginning but not at the end. Therefore, a regular expression matching files by their extensions must include a leading \fB\&.*\fR and should include a trailing \fB$\fR.
+At least one specified \fIaction-name\fR must match. Every specified \fIattribute\fR must match. Action names and attributes are listed in "Actions" in the \fBpkg\fR(5) man page. The regular expression syntax used is that of Python. For more information about Python regular expression syntax, use the command \fBpydoc re\fR or see more complete documentation at \fBhttp://docs.python.org/dev/howto/regex.html\fR. The regular expression is anchored at the beginning but not at the end. Therefore, a regular expression matching files by their extensions must include a leading \fB\&.*\fR and should include a trailing \fB$\fR.
.sp
.LP
Multiple criteria can be specified, separated by spaces.
@@ -317,7 +321,7 @@
.RE
.sp
.LP
-Three synthetic attributes are similar to ones used in \fBpkg\fR(1):
+Three synthetic attributes are similar to ones used in \fBpkg\fR:
.RS +4
.TP
.ie t \(bu
@@ -334,7 +338,7 @@
.TP
.ie t \(bu
.el o
-\fBaction.name\fR refers to the name of the action type.
+\fBaction.name\fR refers to the name of the action.
.RE
.sp
.LP
@@ -350,7 +354,7 @@
It is useful not only to reference package attributes as if they were action attributes, but also to match on them, and even temporarily modify them. Therefore a synthetic action name, \fBpkg\fR, is available (only in the context of \fBpkgmogrify\fR) for use in these situations.
.sp
.LP
-When \fBpkgmogrify\fR finishes reading a manifest specified on the command line and that manifest defined a \fBpkg.fmri\fR package attribute, \fBpkgmogrify\fR creates this synthetic \fBpkg\fR action, whose attributes are the package's attributes. A \fB<transform>\fR directive can then match on this action, just like any other action type.
+When \fBpkgmogrify\fR finishes reading a manifest specified on the command line and that manifest defined a \fBpkg.fmri\fR package attribute, \fBpkgmogrify\fR creates this synthetic \fBpkg\fR action, whose attributes are the package's attributes. A \fB<transform>\fR directive can then match on this action, just as it can match on any other action.
.sp
.LP
Operations on a \fBpkg\fR action are special in that they take place only in memory and do not directly affect the emitted manifest. For instance, trying to set an attribute on a \fBpkg\fR action via the \fBadd\fR, \fBdefault\fR, or \fBset\fR operations does not result in a \fBset\fR action being added to the manifest, though it will be available for other \fB<transform>\fR directives to match on. Attempting to \fBemit\fR a \fBpkg\fR action causes an error. To add a package attribute, \fBemit\fR a \fBset\fR action instead.
@@ -580,6 +584,7 @@
.rt
Unexpected processing error.
.RE
+
.SH FILES
.sp
.ne 2
@@ -589,8 +594,8 @@
.ad
.sp .6
.RS 4n
-This directory contains files with useful transforms to set facets,
-actuators and other attributes.
+This directory contains files with useful transforms to set facets, actuators, and other attributes.
+.RE
.SH ATTRIBUTES
.sp
--- a/src/man/pkgrecv.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgrecv.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgrecv 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgrecv 1 "11 Jun 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgrecv \- Image Packaging System content retrieval utility
.SH SYNOPSIS
@@ -20,7 +20,10 @@
.SH DESCRIPTION
.sp
.LP
-\fBpkgrecv\fR allows the user to retrieve packages from a \fBpkg\fR(5) repository or package archive. \fBpkgrecv\fR can also optionally republish the retrieved packages to a different package repository or archive them. By default, packages are retrieved in package repository format suitable for use with \fBpkg\fR(1), \fBpkg.depotd\fR(1M), and package publication tools.
+\fBpkgrecv\fR allows the user to retrieve packages from a \fBpkg\fR(5) repository or package archive. \fBpkgrecv\fR can also optionally republish the retrieved packages to a different package repository or archive them. By default, packages are retrieved in package repository format suitable for use with \fBpkg\fR, \fBpkg.depotd\fR, and package publication tools.
+.sp
+.LP
+After a \fBpkgrecv\fR operation, run \fBpkgrepo refresh\fR or \fBpkgrepo rebuild\fR on the repository to build search indexes.
.SH OPTIONS
.sp
.LP
@@ -29,10 +32,21 @@
.ne 2
.mk
.na
+\fB\fB-h\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
\fB\fB-a\fR\fR
.ad
-.RS 19n
-.rt
+.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.
.RE
@@ -42,31 +56,20 @@
.na
\fB\fB-c\fR \fIcache_dir\fR\fR
.ad
-.RS 19n
-.rt
-The path to a directory that will be used to cache downloaded content. If this directory is not supplied, the client automatically selects a cache directory. In the case where a download is interrupted, and a cache directory was automatically chosen, use this option to resume the download. See the "Environment Variables" section below for details about how to set the location used for temporary data storage.
+.sp .6
+.RS 4n
+Specify the path to a directory that will be used to cache downloaded content. If this directory is not supplied, the client automatically selects a cache directory. In the case where a download is interrupted, and a cache directory was automatically chosen, use this option to resume the download. See the "Environment Variables" section below for details about how to set the location used for temporary data storage.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-d\fR \fIpath_or_uri\fR\fR
+\fB\fB-d\fR (\fIpath\fR|\fIdest_uri\fR)\fR
.ad
-.RS 19n
-.rt
-The file system path or URI of the target to republish packages to. The target must already exist. New repositories can be created using \fBpkgrepo\fR(1). If \fB-a\fR is specified, the target is assumed to be a new package archive.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-h\fR\fR
-.ad
-.RS 19n
-.rt
-Display a usage message.
+.sp .6
+.RS 4n
+Specify the file system path or URI of the target to republish packages to. If \fB-a\fR is specified, the target is a new package archive that cannot already exist. Otherwise, the target must be a package repository that already exists. New repositories can be created using \fBpkgrepo\fR.
.RE
.sp
@@ -75,9 +78,9 @@
.na
\fB\fB-k\fR\fR
.ad
-.RS 19n
-.rt
-Keep the retrieved package content compressed. This option is ignored when republishing. Compressed package content should not be used with \fBpkgsend\fR(1).
+.sp .6
+.RS 4n
+Keep the retrieved package content compressed. This option is ignored when republishing. Compressed package content should not be used with \fBpkgsend\fR.
.RE
.sp
@@ -86,17 +89,17 @@
.na
\fB\fB-m\fR \fImatch\fR\fR
.ad
-.RS 19n
-.rt
-Controls matching behavior using the following values:
+.sp .6
+.RS 4n
+Control matching behavior using the following values:
.sp
.ne 2
.mk
.na
\fB\fBall-timestamps\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Includes all matching timestamps, not just the latest (implies \fBall-versions\fR).
.RE
@@ -106,8 +109,8 @@
.na
\fB\fBall-versions\fR\fR
.ad
-.RS 18n
-.rt
+.sp .6
+.RS 4n
Includes all matching versions, not just the latest.
.RE
@@ -119,8 +122,8 @@
.na
\fB\fB-n\fR\fR
.ad
-.RS 19n
-.rt
+.sp .6
+.RS 4n
Perform a trial run with no changes made.
.RE
@@ -130,30 +133,30 @@
.na
\fB\fB-r\fR\fR
.ad
-.RS 19n
-.rt
-Recursively retrieves all dependencies for the provided list of packages.
+.sp .6
+.RS 4n
+Recursively retrieve all dependencies for the provided list of packages.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-s\fR \fIsrc_repo_uri\fR\fR
+\fB\fB-s\fR \fIsrc_uri\fR\fR
.ad
-.RS 19n
-.rt
-A URI representing the location of a \fBpkg\fR(5) repository or package archive from which to receive package data.
+.sp .6
+.RS 4n
+Specify a URI representing the location of a \fBpkg\fR(5) repository or package archive from which to receive package data.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB--cert\fR \fIfile\fR\fR
+\fB\fB--cert\fR \fIcertfile\fR\fR
.ad
-.RS 19n
-.rt
+.sp .6
+.RS 4n
Specify a client SSL certificate file to use for package retrieval from an HTTPS repository.
.RE
@@ -161,10 +164,10 @@
.ne 2
.mk
.na
-\fB\fB--key\fR \fIfile\fR\fR
+\fB\fB--key\fR \fIkeyfile\fR\fR
.ad
-.RS 19n
-.rt
+.sp .6
+.RS 4n
Specify a client SSL key file to use for package retrieval from an HTTPS repository.
.RE
@@ -174,8 +177,8 @@
.na
\fB\fB--newest\fR\fR
.ad
-.RS 19n
-.rt
+.sp .6
+.RS 4n
List the most recent versions of the packages available from the specified repository and exit. (All other options except \fB-s\fR are ignored.)
.RE
@@ -185,8 +188,8 @@
.na
\fB\fB--raw\fR\fR
.ad
-.RS 19n
-.rt
+.sp .6
+.RS 4n
Retrieve and store the raw package data in a set of directory structures by stem and version at the location specified by \fB-d\fR. This option can be used only with file system based destinations. This package data can be used to conveniently modify and republish packages, perhaps by correcting file contents or providing additional package metadata. This option cannot be combined with \fB-a\fR.
.RE
@@ -201,10 +204,9 @@
.in +2
.nf
$ \fBpkgrecv -s http://test --newest\fR
-pkg:/[email protected],5.11-0.79:20080221T125720Z
-pkg:/[email protected],5.11-0.79:20080221T123955Z
-pkg:/[email protected],5.11-0.79:20080221T125728Z
-pkg:/[email protected],5.11-0.79:20080221T125730Z
+pkg://solaris/system/library/[email protected],5.11-0.175.0.0.0.2.1:20120921T190358Z
+pkg://solaris/system/library/[email protected],5.11-0.175.1.0.0.7.1234:20120109T215840Z
+pkg://solaris/system/library/[email protected],5.11-0.175.0.0.0.2.1:20120921T190432Z
.fi
.in -2
.sp
@@ -213,17 +215,20 @@
\fBExample 2 \fRRetrieve Raw Package Data
.sp
.LP
-Receive the \fBSUNWlibC\fR, \fBSUNWfreetype\fR, and \fBSUNWlibm\fR packages from Example 1 in a format suitable for use with \fBpkgsend include\fR.
+Receive the \fBc++-runtime\fR package from Example 1 in a format suitable for use with \fBpkgsend publish\fR.
.sp
.in +2
.nf
$ \fBpkgrecv -s http://test \e\fR
-\[email protected],5.11-0.79:20080221T125720Z --raw\fR
[email protected],5.11-0.79:20080221T123955Z
[email protected],5.11-0.79:20080221T125728Z
-$ \fBls -d SUNW*\fR
-SUNWfreetype2 SUNWlibC SUNWlibm
+\fB-d /local/repo --raw \e\fR
+\[email protected],5.11-0.175.0.0.0.2.1:20120921T190358Z\fR
+Processing packages for publisher solaris ...
+Retrieving and evaluating 1 package(s)...
+PROCESS ITEMS GET (MB) SEND (MB)
+Completed 1/1 3.5/3.5 0.0/0.0
+$ \fBls /local/repo\fR
+pkg5.repository publisher system%2Flibrary%2Fc%2B%2B-runtime
.fi
.in -2
.sp
@@ -232,12 +237,12 @@
\fBExample 3 \fRRetrieve Dependencies From a System
.sp
.LP
-Receive the package \fBSUNWvim\fR and all of its dependencies from the system named \fBtest\fR.
+Receive the package \fBeditor/vim\fR and all of its dependencies from the system named \fBtest\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://test -r SUNWvim\fR
+$ \fBpkgrecv -s http://test -d /local/repo -r editor/vim\fR
.fi
.in -2
.sp
@@ -246,88 +251,97 @@
\fBExample 4 \fRRetrieve All Versions
.sp
.LP
-Receive all versions of the package \fBSUNWvim\fR from the system named \fBtest\fR.
+Receive all versions of the package \fBeditor/vim\fR from the system named \fBtest\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://test -m all-versions SUNWvim\fR
+$ \fBpkgrecv -s http://test -d /local/repo -m all-versions \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
.fi
.in -2
.sp
.LP
-\fBExample 5 \fRRetrieve All Versions and Republish Locally
+\fBExample 5 \fRRetrieve All Versions and Republish Remotely
.sp
.LP
-Receive all versions of the package \fBSUNWvim\fR from the system named \fBtest\fR and republish it to a local repository.
+Receive all versions of the package \fBlibrary/zlib\fR from the system named \fBtest\fR and republish it to a remote repository on the system named \fBremote\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://test -d /local/repo SUNWvim\fR
+$ \fBpkgrecv -s http://test -d http://remote:10000 \e\fR
+\fB-m all-versions library/zlib\fR
.fi
.in -2
.sp
.LP
-\fBExample 6 \fRRetrieve All Versions and Republish Remotely
+\fBExample 6 \fRRetrieve Dependencies From a Repository
.sp
.LP
-Receive all versions of the package \fBSUNWzlib\fR from the system named \fBtest\fR and republish it to a remote repository on the system named \fBremote\fR.
+Receive the package \fBeditor/gnu-emacs\fR and all of its dependencies from the repository located at \fB/export/repo\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://test -d http://remote:10000 SUNWzlib\fR
+$ \fBpkgrecv -s /export/repo -d /local/repo -r editor/gnu-emacs\fR
.fi
.in -2
.sp
.LP
-\fBExample 7 \fRRetrieve Dependencies From a Repository
+\fBExample 7 \fRRetrieve Additional Packages and Changed Content
.sp
.LP
-Receive the package \fBSUNWemacs\fR and all of its dependencies from the repository located at \fB/export/repo\fR.
+Receive all packages that do not already exist and all changed content from the repository located at \fBhttp://pkg.oracle.com/solaris/release/\fR to the repository located at \fB/export/repoSolaris11\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s /export/repo -r SUNWemacs\fR
+$ \fBpkgrecv -s http://pkg.oracle.com/solaris/release/ \e\fR
+\fB-d /export/repoSolaris11 -m all-timestamps '*'\fR
+.fi
+.in -2
+.sp
+
+.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.
+
+.sp
+.in +2
+.nf
+$ \fBpkgrecv -s http://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
.fi
.in -2
.sp
.LP
-\fBExample 8 \fRRetrieve Additional Packages
+\fBExample 8 \fRCreate a Package Archive
.sp
.LP
-Receive all packages that do not already exist from the repository located at \fBhttp://example.com:10000\fR.
+Create a package archive containing the package \fBeditor/gnu-emacs\fR and all of its dependencies from the repository located at \fBhttp://example.com:10000\fR.
.sp
.in +2
.nf
-$ \fBpkgrecv -s http://example.com:10000 -d /my/pkg/repo '*'\fR
+$ \fBpkgrecv -s http://example.com:10000 -d /my/emacs.p5p -a \e\fR
+\fB-r editor/gnu-emacs\fR
.fi
.in -2
.sp
.LP
-\fBExample 9 \fRCreate a Package Archive
-.sp
-.LP
-Create a package archive containing the package \fBSUNWemacs\fR and all of its dependencies from the repository located at \fBhttp://example.com:10000\fR.
-
-.sp
-.in +2
-.nf
-$ \fBpkgrecv -s http://example.com:10000 -d /my/emacs.p5p -a -r SUNWemacs\fR
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 10 \fRCopy Packages From an Archive to a Repository
+\fBExample 9 \fRCopy Packages From an Archive to a Repository
.sp
.LP
Copy all of the packages in a package archive to an existing repository located at \fB/export/repo\fR.
--- a/src/man/pkgrepo.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgrepo.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgrepo 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgrepo 1 "22 Jun 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgrepo \- Image Packaging System repository management utility
.SH SYNOPSIS
@@ -17,7 +17,7 @@
.LP
.nf
-/usr/bin/pkgrepo get [-F \fIformat\fR] [-p \fIpublisher\fR ...]
+/usr/bin/pkgrepo get [-F \fIformat\fR] [-H] [-p \fIpublisher\fR ...]
-s \fIrepo_uri_or_path\fR [\fIsection/property\fR ...]
.fi
@@ -30,7 +30,7 @@
.LP
.nf
/usr/bin/pkgrepo list [-F \fIformat\fR] [-H] [-p \fIpublisher\fR ...]
- -s \fIrepo_uri_or_path\fR \fIpkg_fmri_pattern\fR ...
+ -s \fIrepo_uri_or_path\fR [\fIpkg_fmri_pattern\fR ...]
.fi
.LP
@@ -54,7 +54,12 @@
.LP
.nf
/usr/bin/pkgrepo set [-p \fIpublisher\fR] -s \fIrepo_uri_or_path\fR
- \fIsection/property\fR=[\fIvalue\fR] ... or
+ \fIsection/property\fR=[\fIvalue\fR]
+.fi
+
+.LP
+.nf
+/usr/bin/pkgrepo set [-p \fIpublisher\fR] -s \fIrepo_uri_or_path\fR
\fIsection/property\fR=([\fIvalue\fR]) ...
.fi
@@ -71,7 +76,7 @@
.SH DESCRIPTION
.sp
.LP
-\fBpkgrepo\fR provides the ability to create and manage \fBpkg\fR(5) package repositories. Package repositories are a predefined set of directories and files that permit the storage and retrieval of package data by \fBpkg\fR(1) and publication clients such as \fBpkgsend\fR(1) or \fBpkgrecv\fR(1). In addition, when network-based access to a package repository is needed, \fBpkg.depotd\fR(1m) can provide clients access to the repository to store and/or retrieve package data.
+\fBpkgrepo\fR provides the ability to create and manage \fBpkg\fR(5) package repositories. Package repositories are a predefined set of directories and files that permit the storage and retrieval of package data by \fBpkg\fR and publication clients such as \fBpkgsend\fR or \fBpkgrecv\fR. In addition, when network-based access to a package repository is needed, \fBpkg.depotd\fR can provide clients access to the repository to store and/or retrieve package data.
.SH OPTIONS
.sp
.LP
@@ -80,11 +85,15 @@
.ne 2
.mk
.na
-\fB--help\fR or \fB-?\fR
+\fB\fB-?\fR\fR
.ad
-.RS 16n
-.rt
-Displays a usage message.
+.br
+.na
+\fB\fB--help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
.RE
.SH SUB-COMMANDS
@@ -95,30 +104,45 @@
.ne 2
.mk
.na
-\fBcreate\fR [\fB--version\fR \fIver\fR] \fIuri_or_path\fR
+\fB\fBpkgrepo create\fR [\fB--version\fR \fIver\fR] \fIuri_or_path\fR\fR
.ad
.sp .6
.RS 4n
-Creates a \fBpkg\fR(5) repository at the specified location.
+Create a \fBpkg\fR(5) repository at the specified location.
.sp
This subcommand can be used only with file system based repositories.
.sp
-With \fB--version\fR, create a repository in a format compatible with the specified version. By default, version 4 repositories are created. Supported versions are:
+.ne 2
+.mk
+.na
+\fB\fB--version\fR\fR
+.ad
+.sp .6
+.RS 4n
+Create a repository in a format compatible with the specified version. By default, version 4 repositories are created. Supported versions are:
.sp
+.ne 2
+.mk
+.na
+\fB3\fR
+.ad
+.RS 5n
+.rt
+Supports storage of packages for a single publisher, catalog version 1, and search version 1.
+.RE
.sp
-.TS
-tab();
-lw(.33i) lw(5.17i)
-lw(.33i) lw(5.17i)
-.
-3T{
-Supports storage of packages for a single publisher, catalog version 1, and search version 1.
-T}
-4T{
+.ne 2
+.mk
+.na
+\fB4\fR
+.ad
+.RS 5n
+.rt
Supports storage of packages for multiple publishers, catalog version 1, and search version 1.
-T}
-.TE
+.RE
+
+.RE
.RE
@@ -126,11 +150,11 @@
.ne 2
.mk
.na
-\fBadd-publisher\fR \fB-s\fR \fIrepo_uri_or_path\fR \fIpublisher\fR ...\fR
+\fB\fBpkgrepo add-publisher\fR \fB-s\fR \fIrepo_uri_or_path\fR \fIpublisher\fR ...\fR
.ad
.sp .6
.RS 4n
-Adds the specified publishers to the repository. The new publishers have no packages or content.
+Add the specified publishers to the repository. The new publishers have no packages or content.
.sp
This subcommand can be used only with version 4 file system based repositories.
.RE
@@ -139,11 +163,11 @@
.ne 2
.mk
.na
-\fBget\fR [\fB-F\fR \fIformat\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fIsection/property\fR ...]\fR
+\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 [\fIsection/property\fR ...]\fR
.ad
.sp .6
.RS 4n
-Displays the property information for the repository or its publishers.
+Display the property information for the repository or its publishers.
.sp
By default, each property and its value are printed on separate lines. Empty ASCII string values are represented by a pair of double quotation marks (\fB""\fR). The following Bourne shell metacharacters, and newline, space, and tab, in ASCII string values must be escaped by backslash characters (\fB\e\fR):
.sp
@@ -153,106 +177,297 @@
.fi
.in -2
-See the "Examples" section.
+See the "Examples" section for examples displaying publisher and repository properties.
+.sp
+For a list of properties and the purpose and value of each property, see the \fBset\fR subcommand below.
.sp
-For a list of possible properties and the purpose and value of each property, see the \fBset\fR subcommand below.
+.ne 2
+.mk
+.na
+\fB\fB-F\fR \fIformat\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify an alternative output format. The value of \fIformat\fR can be \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), or \fBjson-formatted\fR (JavaScript Object Notation, formatted for readability).
+.RE
+
.sp
-With \fB-F\fR, specify an alternative output format. Supported formats are: \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), and \fBjson-formatted\fR (same as the previous, formatted for readability).
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
.sp
-With \fB-H\fR, omit the headers from the listing.
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display the property information for the given publisher. The special value \fBall\fR displays the properties for all publishers. This option can be specified multiple times.
+.RE
+
.sp
-With \fB-p\fR, display the property information for the given publisher. The special value \fBall\fR displays the properties for all publishers. This option can be specified multiple times.
+.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
-With \fB-s\fR, operate on the repository located at the given URI or file system path.
+.ne 2
+.mk
+.na
+\fB\fIsection/property\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display values for only the specified properties, such as \fBpublisher/prefix\fR or \fBrepository/version\fR. See the \fBset\fR subcommand for a complete list of properties.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBinfo\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR
+\fB\fBpkgrepo info\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a listing of the package publishers known by the repository. The listing includes the number of packages for each publisher, when the publisher's package data was last updated, and the status of the publisher's package data (such as whether it is currently being processed).
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-F\fR \fIformat\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify an alternative output format. The value of \fIformat\fR can be \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), or \fBjson-formatted\fR (JavaScript Object Notation, formatted for readability).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
.ad
.sp .6
.RS 4n
-Displays a listing of the package publishers known by the repository. The listing includes the number of packages for each publisher, when the publisher's package data was last updated, and the status of the publisher's package data (such as whether it is currently being processed).
+Only display the data for the given publisher. If not provided, the data for all publishers is displayed. This option can be specified multiple times.
+.RE
+
.sp
-With \fB-F\fR, specify an alternative output format. Supported formats are: \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), and \fBjson-formatted\fR (same as the previous, formatted for readability).
+.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
+
+.RE
+
.sp
-With \fB-H\fR, omit the headers from the listing.
+.ne 2
+.mk
+.na
+\fB\fBpkgrepo list\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fIpkg_fmri_pattern\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+List the packages in the \fIrepo_uri_or_path\fR repository that match the specified \fIpkg_fmri_pattern\fR patterns. If no patterns are specified, all packages in the repository are listed.
.sp
-With \fB-p\fR, only display the data for the given publisher. If not provided, the data for all publishers is displayed. This option can be specified multiple times.
+In the default output, the first column contains the name of the publisher of the package. The second column contains the name of the package. The third column is a flag that shows the status of the package. A value of \fBo\fR in the status column indicates the package is obsolete. A value of \fBr\fR in the status column indicates the package has been renamed, which is a form of obsoletion. The fourth column contains the release and branch versions of the package. See \fBpkg\fR(5) for information about release and branch versions.
.sp
-With \fB-s\fR, operate on the repository located at the given URI or file system path.
+.ne 2
+.mk
+.na
+\fB\fB-F\fR \fIformat\fR\fR
+.ad
+.sp .6
+.RS 4n
+Specify an alternative output format. The value of \fIformat\fR can be \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), or \fBjson-formatted\fR (JavaScript Object Notation, formatted for readability).
.RE
.sp
.ne 2
.mk
.na
-\fBlist\fR [\fB-F\fR \fIformat\fR] [\fB-H\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR \fIpkg_fmri_pattern\fR ...\fR
+\fB\fB-H\fR\fR
+.ad
+.sp .6
+.RS 4n
+Omit the headers from the listing.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Only display the packages for the given publisher. If not provided, the packages for all publishers are displayed. This option can be specified multiple times.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
.ad
.sp .6
.RS 4n
-List the packages matching the specified patterns in the repository. If no patterns are specified, all packages will be listed. To list the latest version of a package, use \fBlatest\fR for the pattern version (e.g. \fBvim@latest\fR).
+Operate on the repository located at the given URI or file system path.
+.RE
+
+.RE
+
.sp
-In the default output, the first column contains the name of the publisher of the package. The second column contains the name of the package. The third column is a flag showing the status of the package, where \fBo\fR indicates it is obsolete, and an \fBr\fR shows that it has been renamed (a form of obsoletion). The last column contains the release and branch versions of the package (see \fBpkg\fR(5)).
-.sp
-With \fB-F\fR, specify an alternative output format. Supported formats are: \fBtsv\fR (Tab Separated Values), \fBjson\fR (JavaScript Object Notation as a single line), and \fBjson-formatted\fR (same as the previous, formatted for readability).
+.ne 2
+.mk
+.na
+\fB\fBpkgrepo rebuild\fR [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Discard all catalog, search, and other cached information found in the repository, and then recreates it based on the current contents of the repository.
.sp
-With \fB-H\fR, omit the headers from the listing.
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform the operation only for the given publisher. If not provided, or if the special value \fBall\fR is specified, the operation is performed for all publishers. This option can be specified multiple times.
+.RE
+
.sp
-With \fB-p\fR, only display the packages for the given publisher. If not provided, the packages for all publishers will be displayed. This option can be specified multiple times.
-.sp
-With \fB-s\fR, operate on the repository located at the given URI or file system path.
+.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
-\fBrebuild\fR [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
+\fB\fB--no-catalog\fR\fR
.ad
.sp .6
.RS 4n
-Discards all catalog, search, and other cached information found in the repository, and then recreates it based on the current contents of the repository.
-.sp
-With \fB-p\fR, perform the operation only for the given publisher. If not provided, or if the special value \fBall\fR is specified, the operation is performed for all publishers. This option can be specified multiple times.
+Do not rebuild package data.
+.RE
+
.sp
-With \fB-s\fR, operate on the repository located at the given URI or file system path.
-.sp
-With \fB--no-catalog\fR, do not rebuild package data.
-.sp
-With \fB--no-index\fR, do not rebuild search indexes.
+.ne 2
+.mk
+.na
+\fB\fB--no-index\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not rebuild search indexes.
+.RE
+
.RE
.sp
.ne 2
.mk
.na
-\fBrefresh\fR [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
+\fB\fBpkgrepo refresh\fR [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR [\fB--no-catalog\fR] [\fB--no-index\fR]\fR
.ad
.sp .6
.RS 4n
-Catalogs any new packages found in the repository and updates all search indexes. This is intended for use with deferred publication (\fB--no-catalog\fR or \fB--no-index\fR options of \fBpkgsend\fR).
-.sp
-With \fB-p\fR, perform the operation only for the given publisher. If not provided, or if the special value \fBall\fR is specified, the operation is performed for all publishers. This option can be specified multiple times.
+Catalog any new packages found in the repository and updates all search indexes. This is intended for use with deferred publication (\fB--no-catalog\fR or \fB--no-index\fR options of \fBpkgsend\fR).
.sp
-With \fB-s\fR, operate on the repository located at the given URI or file system path.
-.sp
-With \fB--no-catalog\fR, do not add any new packages.
-.sp
-With \fB--no-index\fR, do not update search indexes.
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform the operation only for the given publisher. If not provided, or if the special value \fBall\fR is specified, the operation is performed for all publishers. This option can be specified multiple times.
.RE
.sp
.ne 2
.mk
.na
-\fBremove\fR [\fB-n\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR \fIpkg_fmri_pattern\fR ...\fR
+\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--no-catalog\fR\fR
.ad
.sp .6
.RS 4n
-Removes the packages matching the specified patterns from the repository, including any files they reference that are not in use by any other package.
+Do not add any new packages.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB--no-index\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not update search indexes.
+.RE
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkgrepo remove\fR [\fB-n\fR] [\fB-p\fR \fIpublisher\fR ...] \fB-s\fR \fIrepo_uri_or_path\fR \fIpkg_fmri_pattern\fR ...\fR
+.ad
+.sp .6
+.RS 4n
+Remove the packages matching the specified patterns from the repository, including any files they reference that are not in use by any other package.
.LP
Note -
.sp
@@ -266,29 +481,78 @@
.RS 2
This operation is not reversible and should not be used while other clients are accessing the repository since it might cause them to fail during retrieval operations.
.RE
-With \fB-n\fR, perform a trial run of the operation with no package changes made. A list of the packages to be removed is displayed before exiting.
.sp
-With \fB-p\fR, only remove matching packages for the given publisher. If not provided, any matching packages are removed for all publishers. This option can be specified multiple times.
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform a trial run of the operation with no package changes made. A list of the packages to be removed is displayed before exiting.
+.RE
+
.sp
-With \fB-s\fR, operate on the repository located at the given URI or file system path.
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Only remove matching packages for the given publisher. If not provided, any matching packages are removed for all publishers. This option can be specified multiple times.
.RE
.sp
.ne 2
.mk
.na
-\fBset\fR [\fB-p\fR \fIpublisher\fR] \fB-s\fR \fIrepo_uri_or_path\fR \fIsection/property\fR=[\fIvalue\fR] ... or \fIsection/property\fR=([\fIvalue\fR]) ...\fR
+\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
+
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkgrepo set\fR [\fB-p\fR \fIpublisher\fR] \fB-s\fR \fIrepo_uri_or_path\fR \fIsection/property\fR=[\fIvalue\fR] ...\fR
+.ad
+.br
+.na
+\fB\fBset\fR [\fB-p\fR \fIpublisher\fR] \fB-s\fR \fIrepo_uri_or_path\fR \fIsection/property\fR=([\fIvalue\fR]) ...\fR
.ad
.sp .6
.RS 4n
-Sets the value of the specified properties for the repository or publisher.
+Set the value of the specified properties for the repository or publisher.
.sp
This subcommand can be used only with file system based repositories.
.sp
-With \fB-p\fR, only set property data for the given publisher. If the publisher does not already exist, it is added. The special value \fBall\fR can be used to set the property for all publishers.
+.ne 2
+.mk
+.na
+\fB\fB-p\fR \fIpublisher\fR\fR
+.ad
+.sp .6
+.RS 4n
+Only set property data for the given publisher. If the publisher does not already exist, it is added. The special value \fBall\fR can be used to set the property for all publishers.
+.RE
+
.sp
-With \fB-s\fR, operate on the repository located at the given URI or file system path.
-.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
+
Properties and values can be specified using one of the following forms:
.sp
.ne 2
@@ -328,33 +592,11 @@
.ne 2
.mk
.na
-\fB\fIpublisher\fR/\fIprefix\fR\fR
-.ad
-.sp .6
-.RS 4n
-A string that represents the name of the default publisher. The first character must be a-z, A-Z, or 0-9. The remainder of the string can only contain the characters 0-9, -, ., a-z, and A-Z. This value indicates the publisher that should be used when more than one publisher's packages are present, or when packages are published to the repository and a publisher is not specified.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fIpublisher\fR/\fIsigning_ca_certs\fR\fR
+\fB\fBpublisher/prefix\fR\fR
.ad
-.sp .6
-.RS 4n
-A list of strings that contain the hashes of signing CA certificates that should be used for this publisher.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fIpublisher\fR/\fIintermediate_certs\fR\fR
-.ad
-.sp .6
-.RS 4n
-A list of strings that contain the hashes of intermediate certificates that should be used for this publisher.
+.RS 20n
+.rt
+A string that represents the name of the default publisher. The first character must be a-z, A-Z, or 0-9. The remainder of the string can only contain the characters 0-9, -, ., a-z, and A-Z. This value indicates the publisher that should be used when more than one publisher's packages are present, or when packages are published to the repository and a publisher is not specified.
.RE
For repository versions 3 and 4, the following properties can be set for individual publishers in the repository:
@@ -362,7 +604,7 @@
.ne 2
.mk
.na
-\fB\fIpublisher\fR/\fIalias\fR\fR
+\fB\fBpublisher/alias\fR\fR
.ad
.sp .6
.RS 4n
@@ -373,7 +615,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIcollection_type\fR\fR
+\fB\fBrepository/collection_type\fR\fR
.ad
.sp .6
.RS 4n
@@ -388,7 +630,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIdescription\fR\fR
+\fB\fBrepository/description\fR\fR
.ad
.sp .6
.RS 4n
@@ -399,7 +641,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIdetailed_url\fR\fR
+\fB\fBrepository/detailed_url\fR\fR
.ad
.sp .6
.RS 4n
@@ -410,7 +652,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIlegal_uris\fR\fR
+\fB\fBrepository/legal_uris\fR\fR
.ad
.sp .6
.RS 4n
@@ -421,7 +663,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fImirrors\fR\fR
+\fB\fBrepository/mirrors\fR\fR
.ad
.sp .6
.RS 4n
@@ -432,7 +674,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIname\fR\fR
+\fB\fBrepository/name\fR\fR
.ad
.sp .6
.RS 4n
@@ -443,7 +685,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIorigins\fR\fR
+\fB\fBrepository/origins\fR\fR
.ad
.sp .6
.RS 4n
@@ -454,7 +696,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIrefresh_seconds\fR\fR
+\fB\fBrepository/refresh_seconds\fR\fR
.ad
.sp .6
.RS 4n
@@ -465,7 +707,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIregistration_uri\fR\fR
+\fB\fBrepository/registration_uri\fR\fR
.ad
.sp .6
.RS 4n
@@ -476,7 +718,7 @@
.ne 2
.mk
.na
-\fB\fIrepository\fR/\fIrelated_uris\fR\fR
+\fB\fBrepository/related_uris\fR\fR
.ad
.sp .6
.RS 4n
@@ -490,11 +732,22 @@
.ne 2
.mk
.na
-\fBversion\fR
+\fB\fBpkgrepo help\fR\fR
.ad
.sp .6
.RS 4n
-Displays a unique string that identifies the version of the \fBpkg\fR(5) system. The values produced by the \fBversion\fR operation are not sortable and are not safe for comparison beyond equality.
+Display a usage message.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fBpkgrepo version\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a unique string that identifies the version of the \fBpkg\fR(5) system. The values produced by the \fBversion\fR operation are not sortable and are not safe for comparison beyond equality.
.RE
.SH EXAMPLES
@@ -561,12 +814,16 @@
.sp
.in +2
.nf
-$ \fBpkgrepo get -s /my/repository\fR
-SECTION PROPERTY VALUE
-publisher prefix ""
-repository version 4
+$ \fBpkgrepo get -s /export/repoSolaris11\fR
+SECTION PROPERTY VALUE
+publisher prefix solaris
+repository description Local\e copy\e of\e the\e Oracle\e Solaris\e 11\e repository
+repository name Oracle\e Solaris\e 11
+repository version 4
$ \fBpkgrepo get -s http://pkg.oracle.com/solaris/release/\fR
SECTION PROPERTY VALUE
+deployment content s11_11-11
+deployment pubdate 20111102T222051Z
publisher prefix solaris
repository version 4
.fi
@@ -583,7 +840,8 @@
solaris publisher alias
solaris publisher prefix solaris
solaris repository collection-type core
-solaris repository description This\e repository\e serves\e the\e Oracle\e Solaris\e 11\e Package\e repository.
+solaris repository description This\e repository\e serves\e the\e Oracle\e
+Solaris\e 11\e Package\e repository.
solaris repository legal-uris ()
solaris repository mirrors (http://pkg-cdn1.oracle.com/solaris.release/)
solaris repository name Oracle\e Solaris\e 11\e Package\e Repository
@@ -634,7 +892,7 @@
.ne 2
.mk
.na
-\fB0\fR
+\fB\fB0\fR\fR
.ad
.RS 6n
.rt
@@ -645,7 +903,7 @@
.ne 2
.mk
.na
-\fB1\fR
+\fB\fB1\fR\fR
.ad
.RS 6n
.rt
@@ -656,7 +914,7 @@
.ne 2
.mk
.na
-\fB2\fR
+\fB\fB2\fR\fR
.ad
.RS 6n
.rt
@@ -667,7 +925,7 @@
.ne 2
.mk
.na
-\fB3\fR
+\fB\fB3\fR\fR
.ad
.RS 6n
.rt
@@ -678,7 +936,7 @@
.ne 2
.mk
.na
-\fB4\fR
+\fB\fB4\fR\fR
.ad
.RS 6n
.rt
@@ -689,7 +947,7 @@
.ne 2
.mk
.na
-\fB99\fR
+\fB\fB99\fR\fR
.ad
.RS 6n
.rt
--- a/src/man/pkgsend.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgsend.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgsend 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgsend 1 "22 Jun 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgsend \- Image Packaging System publication client
.SH SYNOPSIS
@@ -18,7 +18,7 @@
.LP
.nf
-/usr/bin/pkgsend publish [-b \fIbundle\fR ...] [-d \fIsource\fR ...]
+/usr/bin/pkgsend publish [-b \fIbundle\fR ...] [-d \fIsource\fR ...]
[-s \fIrepo_uri_or_path\fR] [-T \fIpattern\fR] [--no-catalog]
[\fImanifest\fR ...]
.fi
@@ -27,6 +27,9 @@
.sp
.LP
\fBpkgsend\fR enables the publication of new packages and new package versions to an image packaging repository using package manifests. To create or manage repositories, see \fBpkgrepo\fR(1). To create package archives from packages in an existing repository, see \fBpkgrecv\fR(1). For more information about package manifests, see \fBpkg\fR(5).
+.sp
+.LP
+After a \fBpkgsend\fR operation, run \fBpkgrepo refresh\fR or \fBpkgrepo rebuild\fR on the repository to build search indexes.
.SH OPTIONS
.sp
.LP
@@ -35,11 +38,15 @@
.ne 2
.mk
.na
-\fB--help\fR or \fB-?\fR
+\fB\fB-?\fR\fR
.ad
-.RS 16n
-.rt
-Displays a usage message.
+.br
+.na
+\fB\fB--help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
.RE
.SH SUB-COMMANDS
@@ -50,11 +57,16 @@
.ne 2
.mk
.na
-\fBgenerate\fR [\fB-T\fR \fIpattern\fR] [\fB--target\fR \fIfile\fR] \fIsource\fR ...\fR
+\fB\fBpkgsend generate\fR [\fB-T\fR \fIpattern\fR] [\fB--target\fR \fIfile\fR] \fIsource\fR ...\fR
.ad
.sp .6
.RS 4n
-Read each \fIsource\fR (such as an SVR4 package, a directory, or a \fBtar\fR file) and emit the manifest that describes the \fIsource\fR to \fBstdout\fR. The output manifest can then be annotated, have dependencies added or analyzed using \fBpkgdepend\fR(1), and have its correctness verified using \fBpkglint\fR(1) before being passed to the \fBpublish\fR subcommand. The following are supported sources:
+Read each \fIsource\fR (such as an SVR4 package, a directory, or a \fBtar\fR file) and emit the manifest that describes the \fIsource\fR to \fBstdout\fR. In the output manifest, \fBfile\fR and \fBdir\fR actions have owner set to \fBroot\fR and group set to \fBbin\fR.
+.sp
+The output manifest can then be annotated, have dependencies added or analyzed using \fBpkgdepend\fR, and have its correctness verified using \fBpkglint\fR before being passed to the \fBpublish\fR subcommand.
+.sp
+.LP
+The following are supported sources:
.RS +4
.TP
.ie t \(bu
@@ -86,7 +98,7 @@
.na
\fB*\fR
.ad
-.RS 20n
+.RS 10n
.rt
Matches everything.
.RE
@@ -97,7 +109,7 @@
.na
\fB?\fR
.ad
-.RS 20n
+.RS 10n
.rt
Matches any single character.
.RE
@@ -108,7 +120,7 @@
.na
\fB[\fIseq\fR]\fR
.ad
-.RS 20n
+.RS 10n
.rt
Matches any character in \fIseq\fR.
.RE
@@ -119,7 +131,7 @@
.na
\fB![\fIseq\fR]\fR
.ad
-.RS 20n
+.RS 10n
.rt
Matches any character not in \fIseq\fR.
.RE
@@ -135,21 +147,58 @@
.ne 2
.mk
.na
-\fBpublish\fR [\fB-b\fR \fIbundle\fR ...] [\fB-d\fR \fIsource\fR ...] [\fB-s\fR \fIrepo_uri_or_path\fR] [\fB-T\fR \fIpattern\fR] [\fB--no-catalog\fR] [\fImanifest\fR ...]\fR
+\fB\fBpkgsend publish\fR [\fB-b\fR \fIbundle\fR ...] [\fB-d\fR \fIsource\fR ...] [\fB-s\fR \fIrepo_uri_or_path\fR] [\fB-T\fR \fIpattern\fR] [\fB--no-catalog\fR] [\fImanifest\fR ...]\fR
+.ad
+.sp .6
+.RS 4n
+Publish a package using the specified package manifests to the target package repository, retrieving files for the package from the provided sources. If multiple manifests are specified, they are joined in the order provided. If a manifest is not specified, the manifest is read from \fBstdin\fR.
+.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
+.ne 2
+.mk
+.na
+\fB\fB-b\fR \fIbundle\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add the specified bundle to the list of sources to search when looking for files in the manifest. Bundles are sources such as tar files and SVR4 packages. If this option is specified multiple times, sources are searched in the order they appear on the command line. If both \fB-b\fR and \fB-d\fR are specified, \fB-d\fR sources are searched first. For a description of supported bundles and how they are used, refer to the \fBgenerate\fR subcommand above.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-d\fR \fIsource\fR\fR
.ad
.sp .6
.RS 4n
-Publishes a package using the specified package manifests to the target package repository, retrieving files for the package from the provided sources. If multiple manifests are specified, they are joined in the order provided. If a manifest is not specified, the manifest is read from \fBstdin\fR.
-.sp
-With \fB-b\fR, add the specified bundle to the list of sources to search when looking for files in the manifest. Bundles are sources such as tar files and SVR4 packages. If this option is specified multiple times, sources are searched in the order they appear on the command line. If both \fB-b\fR and \fB-d\fR are specified, \fB-d\fR sources are searched first. For a description of supported bundles and how they are used, refer to the \fBgenerate\fR subcommand above.
-.sp
-With \fB-d\fR, add the specified directory to the list of sources to search when looking for files in the manifest. If this option is specified multiple times, sources are searched in the order they appear on the command line. For a description of supported sources and how they are used, refer to the \fBgenerate\fR subcommand above.
+Add the specified directory to the list of sources to search when looking for files in the manifest. If this option is specified multiple times, sources are searched in the order they appear on the command line. For a description of supported sources and how they are used, refer to the \fBgenerate\fR subcommand above.
+.RE
+
.sp
-With \fB-s\fR, publish the package to the repository located at the given URI or file system path. See the "Notes" section below for more information about restrictions and suggestions for publication. See also the "Environment Variables" section.
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIrepo_uri_or_path\fR\fR
+.ad
+.sp .6
+.RS 4n
+Publish the package to the repository located at the given URI or file system path. See the "Notes" section below for more information about restrictions and suggestions for publication. See also the "Environment Variables" section.
+.RE
+
.sp
-With \fB--no-catalog\fR, 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(1) can be used to add the new packages to the respective publisher catalogs.
-.sp
-For all other options, refer to the \fBgenerate\fR subcommand above for usage and their effects.
+.ne 2
+.mk
+.na
+\fB\fB--no-catalog\fR\fR
+.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.
+.RE
+
+For a descriptions of the \fB-T\fR option, see the \fBgenerate\fR subcommand above.
.RE
.SH ENVIRONMENT VARIABLES
@@ -157,7 +206,7 @@
.ne 2
.mk
.na
-\fBPKG_REPO\fR
+\fB\fBPKG_REPO\fR\fR
.ad
.RS 12n
.rt
@@ -262,7 +311,7 @@
.ne 2
.mk
.na
-\fB0\fR
+\fB\fB0\fR\fR
.ad
.RS 6n
.rt
@@ -273,7 +322,7 @@
.ne 2
.mk
.na
-\fB1\fR
+\fB\fB1\fR\fR
.ad
.RS 6n
.rt
@@ -284,7 +333,7 @@
.ne 2
.mk
.na
-\fB2\fR
+\fB\fB2\fR\fR
.ad
.RS 6n
.rt
@@ -295,7 +344,7 @@
.ne 2
.mk
.na
-\fB99\fR
+\fB\fB99\fR\fR
.ad
.RS 6n
.rt
--- a/src/man/pkgsign.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pkgsign.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pkgsign 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pkgsign 1 "27 May 2012" "SunOS 5.11" "User Commands"
.SH NAME
pkgsign \- Image Packaging System signing utility
.SH SYNOPSIS
@@ -24,32 +24,104 @@
.LP
The following options are supported:
.sp
-.LP
-With \fB-a\fR, use the signature algorithm \fIhash_algorithm\fR instead of the default. The default signature algorithm is \fBrsa-sha256\fR. Supported signature algorithms are \fBrsa-sha256\fR, \fBrsa-sha384\fR, \fBrsa-sha512\fR, \fBsha256\fR, \fBsha384\fR, and \fBsha512\fR. A signature algorithm that only specifies a hash algorithm causes the signature value to be the hash of the manifest of the package. A signature algorithm that specifies \fBrsa\fR and a hash algorithm causes the signature value to be the hash of the manifest signed with the private key provided (see the \fB-c\fR and \fB-k\fR options).
+.ne 2
+.mk
+.na
+\fB\fB--help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
+.RE
+
.sp
-.LP
-With \fB-c\fR, add the certificate \fIpath_to_signing_certificate\fR as the certificate to use when verifying the value of the signature in the action. The \fB-c\fR option can only be used with the \fB-k\fR option.
+.ne 2
+.mk
+.na
+\fB\fB-a\fR \fIhash_algorithm\fR\fR
+.ad
+.sp .6
+.RS 4n
+Use the signature algorithm \fIhash_algorithm\fR instead of the default. The default signature algorithm is \fBrsa-sha256\fR. Supported signature algorithms are \fBrsa-sha256\fR, \fBrsa-sha384\fR, \fBrsa-sha512\fR, \fBsha256\fR, \fBsha384\fR, and \fBsha512\fR. A signature algorithm that only specifies a hash algorithm causes the signature value to be the hash of the manifest of the package. A signature algorithm that specifies \fBrsa\fR and a hash algorithm causes the signature value to be the hash of the manifest signed with the private key provided (see the \fB-c\fR and \fB-k\fR options).
+.RE
+
.sp
-.LP
-With \fB-i\fR, add the certificate \fIpath_to_intermediate_cert\fR as a certificate to use when validating the certificate \fIpath_to_signing_certificate\fR given as an argument to \fB-c\fR. Multiple certificates can be provided by specifying \fB-i\fR multiple times.
+.ne 2
+.mk
+.na
+\fB\fB-c\fR \fIpath_to_signing_certificate\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add the certificate \fIpath_to_signing_certificate\fR as the certificate to use when verifying the value of the signature in the action. The \fB-c\fR option can only be used with the \fB-k\fR option.
+.RE
+
.sp
-.LP
-With \fB-k\fR, use the private key stored in \fIpath_to_private_key\fR to sign the manifest. The \fB-k\fR option can only be used with the \fB-c\fR option. If \fB-k\fR is not set, then the signature value is the hash of the manifest.
+.ne 2
+.mk
+.na
+\fB\fB-i\fR \fIpath_to_intermediate_cert\fR\fR
+.ad
+.sp .6
+.RS 4n
+Add the certificate \fIpath_to_intermediate_cert\fR as a certificate to use when validating the certificate \fIpath_to_signing_certificate\fR given as an argument to \fB-c\fR. Multiple certificates can be provided by specifying \fB-i\fR multiple times.
+.RE
+
.sp
-.LP
-With \fB-n\fR, perform a trial run that does not change the repository in any way.
+.ne 2
+.mk
+.na
+\fB\fB-k\fR \fIpath_to_private_key\fR\fR
+.ad
+.sp .6
+.RS 4n
+Use the private key stored in \fIpath_to_private_key\fR to sign the manifest. The \fB-k\fR option can only be used with the \fB-c\fR option. If \fB-k\fR is not set, then the signature value is the hash of the manifest.
+.RE
+
.sp
-.LP
-With \fB-s\fR, sign packages in the repository at \fIpath_or_uri\fR.
+.ne 2
+.mk
+.na
+\fB\fB-n\fR\fR
+.ad
+.sp .6
+.RS 4n
+Perform a trial run that does not change the repository in any way.
+.RE
+
.sp
-.LP
-With \fB--help\fR, display a usage message.
+.ne 2
+.mk
+.na
+\fB\fB-s\fR \fIpath_or_uri\fR\fR
+.ad
+.sp .6
+.RS 4n
+Sign packages in the repository at \fIpath_or_uri\fR.
+.RE
+
.sp
-.LP
-With \fB--no-index\fR, do not update the repository search indices after the signed manifest has been republished.
+.ne 2
+.mk
+.na
+\fB\fB--no-index\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not update the repository search indexes after the signed manifest has been republished.
+.RE
+
.sp
-.LP
-With \fB--no-catalog\fR, do not update the repository catalog after the signed manifest has been republished.
+.ne 2
+.mk
+.na
+\fB\fB--no-catalog\fR\fR
+.ad
+.sp .6
+.RS 4n
+Do not update the repository catalog after the signed manifest has been republished.
+.RE
+
.SH EXAMPLES
.LP
\fBExample 1 \fRSign Using the Hash Value of the Manifest
@@ -163,7 +235,7 @@
.SH SEE ALSO
.sp
.LP
-\fBpkg\fR(1), \fBpkgrecv\fR(1), \fBpkgsend\fR(1), \fBpkgrepo\fR(1M), \fBpkg\fR(5)
+\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
--- a/src/man/pm-updatemanager.1 Mon Jun 25 09:51:09 2012 -0700
+++ b/src/man/pm-updatemanager.1 Mon Jun 25 09:24:54 2012 -0700
@@ -1,7 +1,7 @@
'\" te
-.\" Copyright (c) 2007, 2011, Oracle and/or its
+.\" Copyright (c) 2007, 2012, Oracle and/or its
.\" affiliates. All rights reserved.
-.TH pm-updatemanager 1 "28 Jul 2011" "SunOS 5.11" "User Commands"
+.TH pm-updatemanager 1 "27 May 2012" "SunOS 5.11" "User Commands"
.SH NAME
pm-updatemanager \- application to update packages
.SH SYNOPSIS
@@ -12,8 +12,8 @@
.LP
.nf
-/usr/bin/pm-updatemanager [-hdR] [--help] [--debug]
- [--image-dir \fIdir\fR]
+/usr/bin/pm-updatemanager [-h | --help] [-d | --debug]
+ [-R \fIdir\fR | --image-dir \fIdir\fR]
.fi
.SH DESCRIPTION
@@ -34,32 +34,44 @@
.ne 2
.mk
.na
-\fB\fB-h\fR or \fB--help\fR\fR
+\fB\fB-h\fR\fR
.ad
-.RS 25n
-.rt
-Displays a usage message.
+.br
+.na
+\fB\fB--help\fR\fR
+.ad
+.sp .6
+.RS 4n
+Display a usage message.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-d\fR or \fB--debug\fR\fR
+\fB\fB-d\fR\fR
.ad
-.RS 25n
-.rt
-Runs \fBpm-updatemanager\fR in debug mode.
+.br
+.na
+\fB\fB--debug\fR\fR
+.ad
+.sp .6
+.RS 4n
+Run \fBpm-updatemanager\fR in debug mode.
.RE
.sp
.ne 2
.mk
.na
-\fB\fB-R\fR or \fB--image-dir\fR \fIdir\fR\fR
+\fB\fB-R\fR \fIdir\fR\fR
.ad
-.RS 25n
-.rt
+.br
+.na
+\fB\fB--image-dir\fR \fIdir\fR\fR
+.ad
+.sp .6
+.RS 4n
Operate on the image rooted at \fIdir\fR, rather than on the image discovered automatically.
.RE