document %m, sort %.

2 files changed, 12 insertions, 8 deletions

diff --git a/usr.sbin/pkg_add/pkg.conf.5 b/usr.sbin/pkg_add/pkg.conf.5
index 92fad96ec77..360b55891e6 100644
--- a/usr.sbin/pkg_add/pkg.conf.5
+++ b/usr.sbin/pkg_add/pkg.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg.conf.5,v 1.6 2015/04/16 13:40:56 espie Exp $
+.\"	$OpenBSD: pkg.conf.5,v 1.7 2015/04/16 14:11:29 espie Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie
 .\"
@@ -72,17 +72,20 @@ Used for accessing packages if the environment variable
 is not defined and no further options are defined.
 .Pp
 Special sequences
+.Sq %a ,
 .Sq %c ,
-.Sq %v ,
-.Sq %a 
+.Sq %m ,
+.Sq %v
 will be expanded to 
+.Sq package architecture ,
 .Sq OS version or snapshots ,
-.Sq OS version ,
+.Sq full mirror path
 and
-.Sq package architecture
+.Sq OS version
 respectively, e.g,
 .Bd -literal -offset indent
 installpath = http://somesite/pub/OpenBSD/%c/packages/%a/
+installpath += http://othersite/%m/
 .Ed
 .Pp
 should work.
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index ea1766a98b2..ed7a9b12df6 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.130 2015/04/16 13:40:56 espie Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.131 2015/04/16 14:11:29 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -759,9 +759,10 @@ implicitly by an empty directory name, or explicitly by a single
 period
 .Pq Ql \&./ .
 Special sequences
+.Sq %a ,
 .Sq %c ,
-.Sq %v ,
-.Sq %a 
+.Sq %m ,
+.Sq %v
 will be expanded with the same semantics as
 .Ar installpath
 in