Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Merge pull request #1069 from felderado/master
Matthew Seaman committed 11 years ago
commit 350b3f513d9a46a18e6fc211085bc6a9fad29266
parent 61f1d7c
25 files changed +191 -181
modified docs/pkg-audit.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd July 12, 2014
+
.Dd October 30, 2014
.Dt PKG-AUDIT 8
.Os
.Sh NAME
.Nm "pkg audit"
-
.Nd Audits installed packages against known vulnerabilities.
+
.Nd audit installed packages against known vulnerabilities
.Sh SYNOPSIS
.Nm
.Op Fl Fqr
@@ -76,7 +76,7 @@ Be ``quiet''.
Prints only the requested information without
displaying many hints.
.It Fl r , Cm --recursive
-
Prints packages that depend on vulnerable packages and are thus 
+
Prints packages that depend on vulnerable packages and are thus
potentially vulnerable as well.
.El
.Sh ENVIRONMENT
modified docs/pkg-check.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd September 26, 2014
+
.Dd October 30, 2014
.Dt PKG-CHECK 8
.Os
.Sh NAME
@@ -82,7 +82,7 @@ matching against
.Ar pattern
case insensitive.
This is the default, unless modified by setting
-
.Ev CASE_SENSITIVE_MATCH 
+
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
.It Fl n , Cm --dry-run
modified docs/pkg-clean.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 25, 2014
+
.Dd October 30, 2014
.Dt PKG-CLEAN 8
.Os
.Sh NAME
.Nm "pkg clean"
-
.Nd Cleans the local cache of fetched remote packages.
+
.Nd clean the local cache of fetched remote packages
.Sh SYNOPSIS
.Nm
.Op Fl anqy
@@ -40,7 +40,7 @@ The following options are supported by
.It Fl a , Cm --all
Delete all cached packages.
.It Fl n , Cm --dry-run
-
Does not delete any package files from the cache, but show what
+
Do not delete any package files from the cache, but show what
would be done instead.
Forces the preview of the packages that would be deleted to be shown,
even when used with
@@ -55,7 +55,7 @@ All output is suppressed if
is also used.
.It Fl y , Cm --yes
Assume a yes answer instead of asking for confirmation before deleting
-
any out-of-date or redundant packages from the cache.
+
any out of date or redundant packages from the cache.
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
modified docs/pkg-create.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd September 5, 2014
+
.Dd October 30, 2014
.Dt PKG-CREATE 8
.Os
.\" ---------------------------------------------------------------------------
@@ -144,7 +144,7 @@ It can be one of
.Ar txz , tbz , tgz
or
.Ar tar
-
which are currently the only supported format.
+
which are currently the only supported formats.
If an invalid or no format is specified
.Ar txz
is assumed.
@@ -154,7 +154,7 @@ Specify the directory containing the package manifest,
and optionally three other files; one containing a message to be
displayed on package installation,
.Pa +DISPLAY .
-
Another containing the description for the packages,
+
Another containing the description for the package,
.Pa +DESC .
The last containing an mtree specification,
.Pa +MTREE_DIRS ,
@@ -192,7 +192,7 @@ or
.Fl x
options.
.It Fl n , Cm --no-clobber
-
Do not overwrite already existing packages
+
Do not overwrite already existing packages.
.It Fl o Ar outdir , Cm --out-dir Ar outdir
Set
.Ar outdir
@@ -214,7 +214,7 @@ Only has any effect when used with
.Ar metadatadir .
See
.Sx "PLIST FORMAT"
-
for details
+
for details.
.It Fl r Ar rootdir , Cm --root-dir Ar rootdir
.Ar rootdir
specifies the top-level directory to be treated as the root of the
@@ -244,7 +244,7 @@ This entry sets the package's origin to
.Ar pkg-origin .
This is a string of the form
.Pa category/port-dir
-
which designate the port this package was built from.
+
which designates the port this package was built from.
.It Cm comment Ar comment-string
.Ar comment-string
is a one-line description of this package.
@@ -411,9 +411,9 @@ Set default group ownership for all subsequent files to
Use without an arg to set back to default (wheel)
group ownership.
.It Cm @comment Ar string
-
The line will be ignored when packing
+
The line will be ignored when packing.
.It Cm @dirrm Ar name
-
Declare directory
+
Declare directory.
.Pa name
to be deleted at deinstall time.
By default, directories created by a package installation are not
modified docs/pkg-fetch.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 20, 2014
+
.Dd October 30, 2014
.Dt PKG-FETCH 8
.Os
.Sh NAME
.Nm "pkg fetch"
-
.Nd Fetches remote packages.
+
.Nd fetch remote packages
.Sh SYNOPSIS
.Nm
.Op Fl r Ar reponame
@@ -115,7 +115,7 @@ See
Fetch all available updates for the currently installed packages.
.It Fl U , Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
-
from remote. 
+
from remote.
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
modified docs/pkg-info.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 26, 2014
+
.Dd October 30, 2014
.Dt PKG-INFO 8
.Os
.Sh NAME
.Nm "pkg info"
-
.Nd displays information for packages
+
.Nd display information for packages
.Sh SYNOPSIS
.Nm
.Ar pkg-name
@@ -75,7 +75,8 @@ This is the default.
Display the full manifest (raw) for the packages matching
.Ar pkg-name .
.It Fl -raw-format Ar format
-
Allow to chose the output format for the raw output, format can be:
+
Choose the format of the raw output.
+
The format can be:
json, json-conpact, yaml (default).
.It Fl e , Cm --exists
If
modified docs/pkg-install.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 14, 2014
+
.Dd October 30, 2014
.Dt PKG-INSTALL 8
.Os
.Sh NAME
.Nm "pkg install"
-
.Nd installs packages from remote package repositories or local archives
+
.Nd install packages from remote package repositories or local archives
.Sh SYNOPSIS
.Nm
.Op Fl AfIMnFqRUy
@@ -36,14 +36,14 @@
.Ar <pkg-origin|pkg-name|pkg-name-version> ...
.Sh DESCRIPTION
.Nm
-
is used for installation of packages from a package repository or
+
is used for installation of packages from package repositories or
local archives.
Multiple package names can be specified on the command line, either
explicitly or by matching against package names (or origins) in the repository
catalogues using shell globbing or regular expressions.
.Pp
.Nm
-
first updates any out-of-date repository catalogues, unless
+
first updates any out of date repository catalogues, unless
.Cm REPO_AUTOUPDATE
has been set to
.Sy NO
@@ -104,7 +104,7 @@ Package repository catalogues will be automatically updated whenever
is run by a user ID with write access to the package database,
unless disabled by the
.Fl U
-
flag  or setting
+
flag or setting
.Cm REPO_AUTOUPDATE
to
.Sy NO
@@ -118,7 +118,7 @@ The following options are supported by
Mark the installed packages as orphan.
Will be automatically removed if no other packages depend on them.
For more information please refer to
-
.Xr pkg-autoremove 8
+
.Xr pkg-autoremove 8 .
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
@@ -171,7 +171,7 @@ status from
.Pa repo.conf .
.It Fl U , Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
-
from remote. 
+
from remote.
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
modified docs/pkg-query.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 10, 2014
+
.Dd October 30, 2014
.Dt PKG-QUERY 8
.Os
.Sh NAME
@@ -90,7 +90,7 @@ of
.Xr re_format 7 .
.El
.Sh QUERY FORMAT
-
There are two type of keyword for the query format: the multiline and the normal
+
There are two types of keywords for the query format: the multiline and the normal
one. Only one type of multiline pattern is accepted for a given query.
.Ss Normal patterns:
.Bl -tag -width F1
@@ -111,13 +111,13 @@ Description of the matched package
.It Cm \&%w
Home page of the matched package
.It Cm \&%l
-
license logic of the matched package - nothing for single, & for AND, and | for OR
+
License logic of the matched package - nothing for single, & for AND, and | for OR
.It Cm \&%s Ns Op bh
-
The flat size of the matched package, where
+
Flat size of the matched package, where
.Cm b
is in bytes, and
.Cm h
-
is in human readable format.
+
is in human readable format
.It Cm \&%a
Returns 1 if the matched package is an orphan package and can be pkg-autoremove(1)'d, 0 otherwise
.It Cm \&%q
@@ -129,10 +129,10 @@ message contained in the matched package
.It Cm \&%t
Timestamp that the package was installed
.It Cm \&%R
-
The name of the repository from which the package was installed if
+
Name of the repository from which the package was installed if
available, or
.Dq unknown-repository
-
otherwise.
+
otherwise
.It Cm \&%? Ns Op drCFODLUGBbA
Returns 0 if the list is empty and 1 if the list has information to display
.Bl -tag -width indent
modified docs/pkg-register.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 25, 2014
+
.Dd October 30, 2014
.Dt PKG-REGISTER 8
.Os
.Sh NAME
.Nm "pkg register"
-
.Nd registers a package into the local package database
+
.Nd register a package into the local package database
.Sh SYNOPSIS
.Nm
.Op Fl dlOt
@@ -46,15 +46,15 @@
is used for registering a package into the local package database.
.Pp
.Nm
-
assembles a full set of package meta-data from various possible inputs,
-
and writes the meta-data into the package registry database.
+
assembles a full set of package metadata from various possible inputs,
+
and writes the metadata into the package registry database.
This is one of the final steps when installing software from ports:
the package files are installed into the filesystem, and then
.Nm
is called to record what was installed into the package database.
.Pp
.Nm
-
can derive package meta-data from a number of different sources:
+
can derive package metadata from a number of different sources:
.Bl -bullet
.It
The package manifest
@@ -66,8 +66,8 @@ Direct analysis of files installed by the package
.Pp
The package manifest is a
.Cm UCL
-
format listing of package meta-data.
-
It can contain all of the necessary meta-data needed by the package,
+
format listing of package metadata.
+
It can contain all of the necessary metadata needed by the package,
but the more usual approach is to provide selected items via the
manifest, and fill in the rest, either from legacy files such as
.Fa pkg-plist ,
@@ -95,7 +95,7 @@ with the old style
command.
.Pp
Reading in a complete and comprehensive manifest from one file is a
-
simpler alternative, but requires all the meta-data to have been
+
simpler alternative, but requires all the metadata to have been
assembled beforehand.
.Pp
Direct analysis of the installed files can be suppressed by use of
@@ -109,17 +109,17 @@ itself, and should not be routinely used.
The following options are supported by
.Nm :
.Bl -tag -width metadata
-
.It Fl A , Cm --automatic 
+
.It Fl A , Cm --automatic
Mark the package to be automatically removed if no other packages
depend on it.
For more information please refer to
.Xr pkg-autoremove 8
-
.It Fl d , Cm --debug 
+
.It Fl d , Cm --debug
Enable debugging output.
.It Fl f Ar plist-file , Cm --plist Ar plist-file
Specifies a
.Fa pkg-plist
-
style packing list file
+
style packing list file.
.It Fl i Ar input-path , Cm --root Ar input-path
Specifies the package input path or staging directory.
.It Fl l , Cm --legacy
@@ -133,7 +133,7 @@ database.
.It  Fl M Ar manifest , Cm --manifest Ar manifest
Specifies the package manifest file.
Use of this option means that the only file which will be used as a
-
source of package meta-data is the named
+
source of package metadata is the named
.Ar manifest
file.
The
@@ -141,7 +141,7 @@ The
option is mutually exclusive with
.Fl m .
.It  Fl m Ar metadatadir , Cm --metadata Ar metadatadir
-
Specifies the meta data directory to use when registering the package.
+
Specifies the metadata directory to use when registering the package.
This directory will hold the package manifest, and optionally may contain
a number of other old-style metadata input files.
The
modified docs/pkg-repo.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 19, 2014
+
.Dd October 30, 2014
.Dt PKG-REPO 8
.Os
.Sh NAME
.Nm "pkg repo"
-
.Nd creates a package repository catalogue
+
.Nd create a package repository catalogue
.Sh SYNOPSIS
.Nm
.Op Fl lqL
@@ -123,9 +123,9 @@ The following options are supported by
.Nm :
.Bl -tag -width quiet
.It Fl q , Cm --quiet
-
Force quiet output
+
Force quiet output.
.It Fl L , Cm --legacy
-
Create repostory compatible with pkg 1.2
+
Create repostory compatible with pkg 1.2.
.It Fl m Ar meta-file , Cm --meta-file Ar meta-file
Use the specified file as repository meta file instead of the default settings.
.It Fl l , Cm --list-files
modified docs/pkg-repository.5
@@ -15,13 +15,13 @@
.\"     @(#)pkg-repository.5
.\" $FreeBSD$
.\"
-
.Dd September 30, 2013
+
.Dd October 30, 2014
.Dt PKG-REPOSITORY 5
.Os
.Sh NAME
.Nm "package repository"
.Nd format and operation of package repositories used by
-
.Xr pkg 8 .
+
.Xr pkg 8
.Sh DESCRIPTION
.Nm "Package repositories"
used by the
@@ -256,7 +256,7 @@ pkg install example-1.0.0
will actually result in
.Pa example-1.0.1
being installed.
-
To override this behaviour, on first installation of the package,
+
To override this behaviour, on first installation of the package
select the repository with the appropriate version:
.Bd -literal -offset indent
pkg install -r repo-a example-1.0.0
modified docs/pkg-rquery.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 12, 2014
+
.Dd October 30, 2014
.Dt PKG-RQUERY 8
.Os
.Sh NAME
@@ -72,7 +72,7 @@ Package repository catalogues will be automatically updated whenever
is run by a user ID with write access to the package database,
unless disabled by the
.Fl U
-
flag  or setting
+
flag or setting
.Cm REPO_AUTOUPDATE
to
.Sy NO
@@ -83,7 +83,7 @@ The following options are supported by
.Nm :
.Bl -tag -width repository
.It Fl a , Cm --all
-
Match all packages from the database
+
Match all packages from the database.
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
@@ -141,7 +141,7 @@ of
.Xr re_format 7 .
.El
.Sh QUERY FORMAT
-
There are two type of keyword for the query format: the multiline and the normal
+
There are two types of keywords for the query format: the multiline and the normal
one. Only one type of multiline pattern is accepted for a given query.
.Ss Normal patterns:
.Bl -tag -width F1
modified docs/pkg-search.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 14, 2014
+
.Dd October 30, 2014
.Dt PKG-SEARCH 8
.Os
.Sh NAME
@@ -55,7 +55,7 @@
.Nm
is used for searching package repository catalogues.
Packages available for installation can be matched by name, by name
-
and version, by origin or by text in the package comments or package
+
and version, by origin, or by text in the package comments or package
descriptions.
The output defaults to displaying the field matched by the search
term, but any of the searchable fields may be displayed.
@@ -67,7 +67,7 @@ Package repository catalogues will be automatically updated whenever
is run by a user ID with write access to the package database,
unless disabled by the
.Fl U
-
flag  or setting
+
flag or setting
.Cm REPO_AUTOUPDATE
to
.Sy NO
@@ -77,8 +77,8 @@ in
Package repositories are defined in the
.Fa pkg.conf
file or by creating repository definitions in
-
.Pa /usr/local/etc/pkg/repos ;
-
see
+
.Pa /usr/local/etc/pkg/repos.
+
See
.Xr pkg.conf 5
for details.
.Sh OPTIONS
@@ -196,7 +196,8 @@ See the
.Qq Sx Search and Label Options
sections for more details.
.It Fl -raw-format Ar format
-
Allow to chose the output format for the raw output, format can be:
+
Choose the format of the raw output.
+
The format can be:
json, json-conpact, yaml (default).
.It Fl s , Cm --size
Display the installed size of matched packages.
@@ -204,7 +205,7 @@ Equivalent to
.Fl "Q size" .
.It Fl U, Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
-
from remote. 
+
from remote.
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
modified docs/pkg-shlib.8
@@ -15,16 +15,16 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 26, 2014
+
.Dd October 30, 2014
.Dt PKG-SHLIB 8
.Os
.Sh NAME
.Nm "pkg shlib"
-
.Nd displays which installed packages provide a specfic shared library,
-
and those which require it by containg binaries that link to it
+
.Nd display which installed package provides a specfic shared library,
+
and the installed packages which require it
.Pp
.Ar library
-
is the filename of the library, without any leading path, but
+
is the filename of the library without any leading path, but
including the ABI version number.
Only exact matches are handled.
.Sh SYNOPSIS
@@ -47,7 +47,7 @@ The following mutually exclusive options are supported by
.Nm :
.Bl -tag -width provides
.It Fl P , Cm --provides
-
Show only the installed packages which provide the named
+
Show only the installed packages which provide
.Ar library .
.It Fl R , Cm --requires
Show only the installed packages which require
modified docs/pkg-ssh.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd March 12, 2014
+
.Dd October 30, 2014
.Dt PKG-SSH 8
.Os
.Sh NAME
@@ -25,12 +25,12 @@
.Nm
.Sh DESCRIPTION
.Nm
-
provides a minimal package server and it's most commonly used with the SSH
-
transport protocol.
+
provides a minimal package server.
+
It is most commonly used with the SSH transport protocol.
.Pp
This command is not meant to be used by the user.
.Xr pkg 8
-
will do start the server automatically through
+
will start the server automatically through
.Xr ssh 1
when the ssh:// scheme is specified in the repository configuration.
.Sh OPTIONS
modified docs/pkg-stats.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd February 25, 2013
+
.Dd October 30, 2014
.Dt PKG-STATS 8
.Os
.Sh NAME
.Nm "pkg stats"
-
.Nd package database statistics
+
.Nd display package database statistics
.Sh SYNOPSIS
.Nm
.Op Fl qlrb
modified docs/pkg-update.8
@@ -15,13 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 14, 2014
+
.Dd October 30, 2014
.Dt PKG-UPDATE 8
.Os
.Sh NAME
.Nm "pkg update"
-
.Nd updates the local copies of repository catalogues from the configured
-
package repositories
+
.Nd update the local catalogues of the enabled package repositories
.Sh SYNOPSIS
.Nm
.Op Fl fq
@@ -32,8 +31,8 @@ package repositories
.Op Cm --repository Ar reponame
.Sh DESCRIPTION
.Nm
-
is used for updating the local copy of a repository catalogue from
-
each of the package repository databases.
+
is used for updating the local copy of the repository catalogues
+
from the remote package repository databases.
Updates to catalogues are normally downloaded only when the master
copy on the remote package repository is newer than the local copy.
.Pp
@@ -75,10 +74,10 @@ The following options are supported by
.Nm :
.Bl -tag -width quiet
.It Fl q , Cm --quiet
-
Force quiet output
+
Force quiet output.
.It Fl f , Cm --force
Force a full download of the repository catalogue without regard to the
-
respective ages of the local and remote copies of the catalogue
+
respective ages of the local and remote copies of the catalogue.
.It Fl r Ar reponame , Cm --repository Ar reponame
Download the catalogue for the named repository only.
This will update only the named repository, irrespective of the configured
modified docs/pkg-updating.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 26, 2013
+
.Dd October 30, 2014
.Dt PKG-UPDATING 8
.Os
.Sh NAME
.Nm "pkg updating"
-
.Nd displays UPDATING entries of software packages
+
.Nd display UPDATING entries of software packages
.Sh SYNOPSIS
.Nm
.Op Fl d Ar date
@@ -41,7 +41,7 @@ Alternativly a list of pkg-names could be passed.
The following options are supported by
.Nm :
.Bl -tag -width file
-
.It Ar pkg-name ... 
+
.It Ar pkg-name ...
UPDATING entries for the named packages are displayed.
.It Fl d Ar date , Cm --date Ar date
Only entries newer than
modified docs/pkg-upgrade.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd August 14, 2014
+
.Dd October 30, 2014
.Dt PKG-UPGRADE 8
.Os
.Sh NAME
.Nm "pkg upgrade"
-
.Nd performs upgrades of package software distributions
+
.Nd perform upgrades of package software distributions
.Sh SYNOPSIS
.Nm
.Op Fl fInFqUy
@@ -41,14 +41,15 @@ is used for upgrading packaged software distributions.
.Nm
compares the versions of all or specific packages installed on the system
to what is available in the configured package repositories.
-
Any out-of-date packages are added to a work list for processing.
-
The difference to 
+
Any out of date packages are added to a work list for processing.
+
The difference to
.Xr pkg-install 8
is that
.Nm
tries to upgrade dependencies of packages matched as well while
.Xr pkg-install 8
-
is more conservative during dependencies upgrade. Moreover,
+
is more conservative during dependencies upgrade.
+
Moreover,
.Nm
cannot install new packages, so a caller should ensure that patterns specified
as arguments have installed candidates for matching.
@@ -153,7 +154,7 @@ to true in
Dry-run mode: show what packages have updates available, but do not perform
any upgrades.
Repository catalogues will be updated as usual unless the
-
.Fl U 
+
.Fl U
option is also given.
.It Fl q , Cm --quiet
Force quiet output, except when
@@ -167,7 +168,7 @@ status from
.Pa repo.conf .
.It Fl U , Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
-
from remote. 
+
from remote.
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
modified docs/pkg-version.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 26, 2014
+
.Dd October 30, 2014
.Dt PKG-VERSION 8
.Os
.Sh NAME
@@ -84,7 +84,7 @@ is the OS major version number.)
.Pp
When
.Fl R
-
is used, 
+
is used,
package repository catalogues will be automatically updated whenever
.Nm
is run by a user ID with write access to the package database,
@@ -105,7 +105,7 @@ The installed version of the package is current.
The installed version of the package is older than the current version.
.It Li \&>
The installed version of the package is newer than the current version.
-
This situation can arise with an out-of-date index file, or when
+
This situation can arise with an out of date index file, or when
testing new ports.
.It Li \&?
The installed package does not appear in the index.
@@ -129,7 +129,7 @@ matching against
case sensitive.
.It Fl h , Cm --help
Displays usage information
-
.It Fl I Op Ar index 
+
.It Fl I Op Ar index
.It Cm --index Op Ar index
Use
.Pa index
@@ -179,7 +179,7 @@ Less output will be produced.
Be verbose.
.It Fl l Ar limchar , Cm --like Ar limchar
Display only the packages which status flag matches the one specified by
-
.Ar limchar
+
.Ar limchar.
.It Fl L Ar limchar , Cm --not-like Ar limchar
Does the opposite of
.Fl l
@@ -209,7 +209,7 @@ Only display the packages that match the glob expression.
Only display the packages that exactly match the string.
.It Fl O Ar origin , Cm --match-origin Ar origin
Display only the packages which origin matches
-
.Ar origin
+
.Ar origin.
.It Fl t Ar version1 Ar version2 , Cm --test-version Ar version1 Ar version2
Test a pair of version number strings and exit.
The output consists of one of the single characters
@@ -252,7 +252,7 @@ file is searched for in
or if that is not set,
.Ev PORTSDIR .
.Ev INDEXFILE
-
is the name of the 
+
is the name of the
.Pa index
relative to that directory.
If
modified docs/pkg-which.8
@@ -15,12 +15,12 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd March 26, 2014
+
.Dd October 30, 2014
.Dt PKG-WHICH 8
.Os
.Sh NAME
.Nm "pkg which"
-
.Nd displays which package installed a specific file
+
.Nd display which package installed a specific file
.Sh SYNOPSIS
.Nm
.Op Fl gopq
@@ -42,11 +42,11 @@ Treat
.Ao file Ac
as a glob pattern.
.It Fl o , Cm --origin
-
Shows the origin of the package instead of name-version
+
Show the origin of the package instead of name-version.
.It Fl p , Cm --path-search
Search for the filename in PATH.
.It Fl q , Cm --quiet
-
Be quiet
+
Be quiet.
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
modified docs/pkg.8
@@ -15,14 +15,14 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd September 13, 2014
+
.Dd October 30, 2014
.Dt PKG 8
.Os
.\" ---------------------------------------------------------------------------
.Sh NAME
.Nm pkg ,
.Nm pkg-static
-
.Nd a utility for manipulating packages
+
.Nd manipulate packages
.\" ---------------------------------------------------------------------------
.Sh SYNOPSIS
.Nm
@@ -48,8 +48,9 @@
.Ao command Ac Ao Ar flags Ac
.\" ---------------------------------------------------------------------------
.Sh DESCRIPTION
-
provides an interface for manipulating packages - registering,
-
adding, removing and upgrading of packages.
+
.Nm pkg
+
provides an interface for manipulating packages: registering,
+
adding, removing and upgrading packages.
.Nm pkg-static
is a statically linked variant of
.Nm
@@ -65,10 +66,10 @@ The following options are supported by
.Nm :
.Bl -tag -width indent
.It Fl v , Cm --version
-
Displays the current version of
-
.Nm
+
Display the current version of
+
.Nm .
.It Fl d , Cm --debug
-
Show debug information
+
Show debug information.
.It Fl l , Cm --list
List all the available command names, and exit without performing any
other action.
@@ -82,8 +83,9 @@ will override any other command line arguments.
.It Fl o Ao option=value Ac , Cm --option Ao option=value Ac
Set configuration option for
.Nm
-
from the command line. Options that are set from the environment are
-
redefined. It is permitted to specify this option multiple times. 
+
from the command line.
+
Options that are set from the environment are redefined.
+
It is permitted to specify this option multiple times.
.It Fl N
Activation status check mode.
Prevent
@@ -163,10 +165,10 @@ and
.Nm
will chroot in the
.Ao chroot path Ac
-
Environment
+
environment.
.It Fl C Ao configuration file Ac , Cm --config Ao configuration file Ac
.Nm
-
will use the specified file as a configuration file
+
will use the specified file as a configuration file.
.It Fl R Ao repo conf dir Ac , Cm --repo-conf-dir Ao repo conf dir Ac
.Nm
will search the directory for per-repository configuration files.
@@ -197,7 +199,7 @@ Currently supported protocols are FTP, HTTP and HTTPS.
.It Ic annotate
Add, modify or delete tag-value style annotations on packages.
.It Ic audit
-
Audits installed packages against known vulnerabilities.
+
Audit installed packages against known vulnerabilities.
.It Ic autoremove
Delete packages which were automatically installed as dependencies and are not required any more.
.It Ic backup
@@ -220,17 +222,17 @@ This is not supported on FreeBSD 8.3 as it did not have
.It Ic check
Sanity checks installed packages.
.It Ic clean
-
Cleans the local cache of fetched remote packages.
+
Clean the local cache of fetched remote packages.
.It Ic convert
Convert to and from the old
.Xr pkg_add 1
format.
.It Ic create
-
Create a package
+
Create a package.
.It Ic delete
Delete a package from the database and the system.
.It Ic fetch
-
Fetches packages from a remote repository.
+
Fetch packages from a remote repository.
.It Ic info
Display information about installed packages.
.It Ic install
@@ -257,19 +259,19 @@ repositories.
.It Ic set
Modify information in the installed database.
.It Ic shell
-
Fires up a sqlite shell to the local or remote database.
+
Open a sqlite shell to the local or remote database.
Extreme care should be taken when using this command.
.It Ic shlib
Displays which packages link to a specific shared library.
.It Ic stats
Display package database statistics.
.It Ic unlock
-
Unlocks packages, allowing them to be modified or deleted
+
Permit modification or deletion of a package.
.It Ic update
Update the available remote repositories as listed in
.Xr pkg.conf 5 .
.It Ic updating
-
Displays UPDATING entries of installed packages.
+
Display UPDATING entries of installed packages.
.It Ic upgrade
Upgrade a package to a newer version.
.It Ic version
modified docs/pkg.conf.5
@@ -15,12 +15,12 @@
.\"     @(#)pkg.1
.\" $FreeBSD$
.\"
-
.Dd September 13, 2014
+
.Dd October 30, 2014
.Dt PKG.CONF 5
.Os
.Sh NAME
.Nm "pkg.conf"
-
.Nd System-wide configuration file for
+
.Nd system-wide configuration file for
.Xr pkg 1
.Sh DESCRIPTION
.Nm
@@ -51,7 +51,7 @@ The following options can be defined in
.Nm :
.Bl -tag -width ".Cm ABI: string"
.It Cm ABI: string
-
the abi of the package you want to install.
+
The ABI of the package you want to install.
Default: derived from the ABI of the /bin/sh binary.
.It Cm ALIAS: key/value list
Define local aliases for various
@@ -80,14 +80,14 @@ which require user confirmation before doing anything, as if it
the
.Fl y
flag was specified.
-
Default: no.
+
Default: NO.
.It Cm CUDF_SOLVER: string
Experimental: tells pkg to use an external CUDF solver.
Default: not set.
.It Cm CASE_SENSITIVE_MATCH: boolean
Match package names or regular expressions given on the command line
against values in the database in a case sensitive way.
-
Default: no.
+
Default: NO.
.It Cm DEBUG_LEVEL: integer
Incremental values from 1 to 4 produce successively more verbose
debugging output.
@@ -98,7 +98,7 @@ command line option.
Default: 0.
.It Cm DEBUG_SCRIPTS: boolean
Activate debug mode for scripts (aka set -x)
-
Default: no.
+
Default: NO.
.It Cm DEVELOPER_MODE: boolean
Makes certain errors immediately fatal.
Adds various warnings and
@@ -106,7 +106,7 @@ suggestions to the output of
.Xr pkg 1
as an aide to port maintainers, including indicating when the port
might be marked as architecture independent.
-
Default: no.
+
Default: NO.
.It Cm EVENT_PIPE: string
Send all event messages to the specified fifo or Unix socket.
Events messages should be formatted as JSON.
@@ -117,7 +117,7 @@ Default: 3.
.It Cm FETCH_TIMEOUT: integer
Maximum number of seconds to wait for any one file to download from the
network, either by SSH or any of the protocols supported by
-
.Xr fetch 3 
+
.Xr fetch 3
functions.
Default: 30.
.It Cm HANDLE_RC_SCRIPTS: boolean
@@ -125,7 +125,7 @@ When enabled, this option will automatically perform start/stop of
services during package installation and deinstallation.
Services are only started on installation if they are enabled in
.Pa /etc/rc.conf .
-
Default: no.
+
Default: NO.
.It Cm INDEXDIR: string
If set, the directory to search for
.Cm INDEXFILE
@@ -158,15 +158,16 @@ Hostname or IPv4 or IPv6 address of name server to use for DNS
resolution, overriding the system defaults in
.Pa /etc/resolv.conf .
When given as a hostname, will be converted to a list of IPv4 or IPv6
-
addresses by the default mechanisms configured on the system. See
+
addresses by the default mechanisms configured on the system.
+
See
.Xr getaddrinfo 3 .
.It Cm PERMISSIVE: boolean
-
Ignore conflicts while registering a package. Note that the
-
conflicting files will not be recorded as owned by the new package.
-
Default: no.
+
Ignore conflicts while registering a package.
+
Note that the conflicting files will not be recorded as owned by the new package.
+
Default: NO.
.It Cm PKG_CACHEDIR: string
Specifies the cache directory for packages.
-
Default: 
+
Default:
.Pa /var/cache/pkg
.It Cm PKG_DBDIR: string
Specifies the directory to use for storing the package
@@ -175,9 +176,9 @@ Default:
.Pa /var/db/pkg
.It Cm PKG_ENABLE_PLUGINS: boolean
When set to
-
.Dq yes ,
+
.Dq YES ,
activate plugin support.
-
Default: yes.
+
Default: YES.
.It Cm PKG_ENV: Key/Value list
This tells
.Xr pkg 8
@@ -203,9 +204,10 @@ Default: not set.
Directory containing definitions of plist keywords.
Default: not set.
.It Cm PLIST_ACCEPT_DIRECTORIES: boolean
-
Accept directories listed like plain files in plist (default: NO)
+
Accept directories listed like plain files in plist.
+
Default: NO.
.It Cm PLUGINS: array
-
List of plugins that 
+
List of plugins that
.Xr pkg 8
should load.
Default: not set.
@@ -219,7 +221,7 @@ Default:
.Pa /usr/ports
.It Cm READ_LOCK: boolean
Use read locking for query database.
-
Default: no.
+
Default: NO.
.It Cm REPOS_DIR: array
List of directories to search for repository configuration files.
Default:
@@ -236,30 +238,30 @@ when running one of:
.Nm pkg upgrade ,
or
.Nm pkg version -R .
-
Default: yes.
+
Default: YES.
.It Cm RUN_SCRIPTS: boolean
Run pre-/post-installation action scripts.
-
Default: yes.
+
Default: YES.
.It Cm SAT_SOLVER: string
Experimental: tells pkg to use and external SAT solver.
Default: not set.
.It Cm SQLITE_PROFILE: boolean
Profile sqlite queries.
-
Default: no.
+
Default: NO.
.It Cm SSH_RESTRICT_DIR: string
Directory which the ssh subsystem will be restricted to.
Default: not set.
.It Cm SYSLOG: boolean
Log all the installation/deinstallation/upgrade operation via
.Xr syslog 3 .
-
Default: yes.
+
Default: YES.
.It Cm UNSET_TIMESTAMP: boolean
-
Do not include timestamps in the package 
+
Do not include timestamps in the package
.Xr tar 1
archive.
Normally, timestamps are copied from the staging directory the
package is created from.
-
Default: no.
+
Default: NO.
.It Cm VULNXML_SITE: string
Specifies the URL to fetch the
.Pa vuln.xml
@@ -267,7 +269,8 @@ vulnerability database from.
Default:
.Pa http://www.vuxml.org/freebsd/vuln.xml.bz2 .
.It Cm WORKERS_COUNT: integer
-
How many workers are used for pkg-repo. If set to 0,
+
How many workers are used for pkg-repo.
+
If set to 0,
.Va hw.ncpu
is used.
Default: 0.
@@ -297,9 +300,11 @@ A repository file is in UCL format and has the following form:
.It Cm URL: string
URL for this repository only.
.It Cm ENABLED: boolean
-
The repository will be used only if this option is enabled. (default: YES)
+
The repository will be used only if this option is enabled.
+
Default: YES.
.It Cm MIRROR_TYPE: string
-
MIRROR_TYPE for this repository only. (default: NONE).
+
MIRROR_TYPE for this repository only.
+
Default: NONE.
Any of
.Dv HTTP
or
@@ -422,12 +427,12 @@ same directory processed in alphabetical order.
Earlier files take precedence, meaning that packages will be downloaded
from them preferentially where the same package is available from several
repositories.
-
This behaviour may be overridden per-package by adding a 
+
This behaviour may be overridden per-package by adding a
.Sy repository
annotation to the installed package.
See
.Xr pkg-repository 8
-
for details. 
+
for details.
.Pp
It is possible to specify more than one repository per file.
.Sh ENVIRONMENT
modified docs/pkg_printf.3
@@ -30,7 +30,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-
.Dd November 29, 2013
+
.Dd October 30, 2014
.Dt PKG_PRINTF 3
.Os
.Sh NAME
@@ -747,10 +747,10 @@ is expanded to contain the conversion result.
Effective format modifiers:
.Bl -tag -width ".So \  Sc" -offset indent
.It Cm \&?
-
1st Alternate Form: 0 if the array is empty, 1 if it has any number
+
First Alternate Form: 0 if the array is empty, 1 if it has any number
of elements within it
.It Cm #
-
2nd Alternate Form: The number of elements in the array
+
Second Alternate Form: The number of elements in the array
.El
.Ss STRING VALUES
Effective format modifiers:
@@ -764,9 +764,9 @@ Effective format modifiers:
.It Cm \-
Left align
.It Cm \&?
-
1st Alternate Form: humanized number (decimal)
+
First Alternate Form: humanized number (decimal)
.It Cm #
-
2nd Alternate Form: humanized number (binary)
+
Second Alternate Form: humanized number (binary)
.It Cm 0
Zero pad
.It So "\ " Sc
@@ -794,9 +794,9 @@ The second alternate form produces no output for
Effective format modifiers:
.Bl -tag -width ".Cm #" -offset indent
.It Cm \&?
-
1st Alternate Form
+
First Alternate Form
.It Cm #
-
2nd Alternate Form
+
Second Alternate Form
.It Cm \-
Left align
.El
@@ -829,11 +829,11 @@ Effective format modifiers (all forms):
Left align
.El
.Pp
-
Additionally, when the value is printed as an integer (ie. plain
+
Additionally, when the value is printed as an integer (i.e., plain
or alternate form 1), these additional modifiers take effect:
.Bl -tag -width ".So \  Sc" -offset indent
.It Cm \&?
-
1st Alternate Form: add leading zero to octal integer
+
First Alternate Form: add leading zero to octal integer
.It Cm 0
Zero pad
.El
@@ -858,9 +858,9 @@ and 2 specified using format modifiers.
Effective format modifiers:
.Bl -tag -width ".Cm #" -offset indent
.It Cm \&?
-
1st Alternate Form
+
First Alternate Form
.It Cm #
-
2nd Alternate Form
+
Second Alternate Form
.It Cm \-
Left align
.El
@@ -884,7 +884,7 @@ Effective format modifiers:
Left align
.El
.Pp
-
Additionally, when the value is printed as an integer (ie. without
+
Additionally, when the value is printed as an integer (i.e., without
.Xr strftime 3
format codes enclosed in
.Cm %{
@@ -893,9 +893,9 @@ and
the following format modifiers are also effective:
.Bl -tag -width ".So \  Sc" -offset indent
.It Cm \&?
-
1st Alternate Form: humanized number (decimal)
+
First Alternate Form: humanized number (decimal)
.It Cm #
-
2nd Alternate Form: humanized number (binary)
+
Second Alternate Form: humanized number (binary)
.It Cm 0
Zero pad
.It So "\ " Sc
modified docs/pkg_repos.3
@@ -1,4 +1,4 @@
-
.Dd November 29, 2013
+
.Dd October 30, 2014
.Dt PKG_REPOS 3
.Os
.Sh NAME
@@ -42,11 +42,11 @@
.Fn pkg_repo_find_name "const char *name";
.Sh DESCRIPTION
.Fn pkg_repos
-
Takes the address of a pointer to the repository. The pointer should be
-
initialized to NULL before being passed to the function, on each iteration
-
the r will point to the next repository. Returns EPKG_FATAL if an error
-
occured, otherwise return EPKG_OK until the last repository is found in that
-
case EPKG_END is returned.
+
Takes the address of a pointer to the repository.
+
The pointer should be initialized to NULL before being passed to the
+
function, on each iteration the r will point to the new repository.
+
Returns EPKG_FATAL if an error occurred, otherwise return EPKG_OK until
+
the last repository is found in that case EPKG_END is returned.
.Pp
.Fn pkg_repos_total_count
returns the total number of defined repositories.
@@ -72,12 +72,13 @@ of the repository.
.Pp
.Fn pkg_repo_key
takes a pointer to a repository as argument and returns the path to
-
the public key. If the repository is not signed by a public key, NULL
-
will be returned.
+
the public key.
+
If the repository is not signed by a public key, NULL will be returned.
.Pp
.Fn pkg_repo_fingerprints
takes a pointer to a repository as argument and returns the path to
-
the fingerprints. If the repository is not signed using the
+
the fingerprints.
+
If the repository is not signed using the
.Qq FINGERPRINT
method, NULL will be returned.
.Pp
@@ -86,7 +87,7 @@ Take a pointer to a repository as argument and return the type of
signature it uses.
.Bl -tag -width SIG_FINGERPRINT
.It Cm SIG_NONE
-
The repository isn't signed
+
The repository is not signed
.It Cm SIG_PUBKEY
The repository is signed using the PUBKEY method
.It Cm SIG_FINGERPRINT
@@ -120,5 +121,5 @@ a reprository. If no repository matches, NULL is returned.
.Fn pkg_repo_find_name
Take a repository
.Qq name
-
as argument and return a pointer to a reprository. If no repository matches,
-
NULL is returned.
+
as argument and return a pointer to a reprository.
+
If no repository matches, NULL is returned.