diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-07-25 14:36:02 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-07-25 14:36:02 +0000 |
| commit | b47bf389e25fdcae96a565bcfc8867a0a9c70bce (patch) | |
| tree | 409597df206dd6d314094b651fec81f416ebec6a | |
| parent | 48f9786341c56a2142211bb48576b1b1a957a9d3 (diff) | |
Correct and clarify the description of special sequences
that are expanded in paths.
Manpage bug found together with Richard Marbach <richie at usta dot de>.
Using feeback from jmc@, sthen@, and espie@.
OK ajacoutot@ jmc@ sthen@
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index c5b40d825af..50672d78d53 100644 --- a/usr.sbin/pkg_add/pkg_add.1 +++ b/usr.sbin/pkg_add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_add.1,v 1.149 2017/05/30 13:56:07 tb Exp $ +.\" $OpenBSD: pkg_add.1,v 1.150 2017/07/25 14:36:01 schwarze Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -15,7 +15,7 @@ .\" Jordan K. Hubbard .\" .\" -.Dd $Mdocdate: May 30 2017 $ +.Dd $Mdocdate: July 25 2017 $ .Dt PKG_ADD 1 .Os .Sh NAME @@ -222,37 +222,33 @@ and .Sq Nm Ar python Ns % Ns Ar 3.4 , respectively. .Pp -All paths recognize special sequences -.Sq %a , -.Sq %m , -.Sq %c , -.Sq %v , -which will be expanded to -.Sq package architecture , -.Sq OS version or snapshots , -.Sq full mirror path -and -.Sq OS version -respectively. +All paths recognize certain special sequences, +which are expanded as follows: +.Bl -tag -width "%m" +.It %a +The package architecture. +.It %v +The operating system version. +.It %c +Expands to the string +.Qq snapshots +when running a -current or -beta kernel, or if the command line option +.Fl D Cm snap +is specified. +Otherwise, %c expands to %v, which selects a release version. +.It %m +The full mirror path, +.Qq /pub/OpenBSD/%c/packages/%a/ . +.El .Pp -The sequences -.Sq %c -and -.Sq %m -are slightly more magical. -One can force them to expand to -.Sq snapshots -on a release kernel by using -.Fl D Ar snap . -Otherwise, on a -.Sq -stable -system, they will expand -.Sq %c/packages -into -two directories: -.Pa <VERSION>/packages-stable -and -.Pa <VERSION>/packages . +If the resulting path contains +.Qq %c/packages +and %c is not +.Qq snapshots , +then a second directory is also searched, which is constructed by replacing +.Qq packages +with +.Qq packages-stable . .Pp The following examples are valid: .Bd -literal -offset indent |