diff options
author | christos <christos@pkgsrc.org> | 2010-11-13 20:07:01 +0000 |
---|---|---|
committer | christos <christos@pkgsrc.org> | 2010-11-13 20:07:01 +0000 |
commit | eaee84f4ded431f35f1ea395000228d5a437b4bf (patch) | |
tree | a4b0d33910c26923e743b63370518bcfc3e6f590 | |
parent | d875bc08fb73920a5e3f9f00aacaea8cf0974e11 (diff) | |
download | pkgsrc-eaee84f4ded431f35f1ea395000228d5a437b4bf.tar.gz |
mention that lists are space-separated.
-rw-r--r-- | pkgtools/pkg_install/files/lib/pkg_install.conf.5.in | 9 | ||||
-rw-r--r-- | pkgtools/pkg_install/files/lib/pkg_install.conf.cat.in | 14 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in index bf4c703750f..11b2044d43d 100644 --- a/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in +++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_install.conf.5.in,v 1.14 2010/06/16 23:02:49 joerg Exp $ +.\" $NetBSD: pkg_install.conf.5.in,v 1.15 2010/11/13 20:07:01 christos Exp $ .\" .\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 16, 2010 +.Dd November 13, 2010 .Dt PKG_INSTALL.CONF 5 .Os .Sh NAME @@ -52,7 +52,7 @@ Those are marked by (*). The following variables are supported: .Bl -tag -width indent .It Dv ACCEPTABLE_LICENSES -List of licenses packages are allowed to carry. +Space-separated list of licenses packages are allowed to carry. License names are case-sensitive. .It Dv ACTIVE_FTP Force the use of active FTP. @@ -117,7 +117,8 @@ See .Xr fetch 3 for further details .It Dv DEFAULT_ACCEPTABLE_LICENSES -List of common Free and Open Source licenses packages are allowed to carry. +Space-separated list of common Free and Open Source licenses packages are +allowed to carry. The default value contains all OSI approved licenses in pkgsrc on the date pkg_install was released. License names are case-sensitive. diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat.in b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat.in index 3ce11405194..9d17ae9078b 100644 --- a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat.in +++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat.in @@ -18,8 +18,8 @@ DDEESSCCRRIIPPTTIIOONN The following variables are supported: ACCEPTABLE_LICENSES - List of licenses packages are allowed to carry. License names - are case-sensitive. + Space-separared list of licenses packages are allowed to carry. + License names are case-sensitive. ACTIVE_FTP Force the use of active FTP. @@ -83,10 +83,10 @@ DDEESSCCRRIIPPTTIIOONN tions to the host as well. See fetch(3) for further details DEFAULT_ACCEPTABLE_LICENSES - List of common Free and Open Source licenses packages are allowed - to carry. The default value contains all OSI approved licenses - in pkgsrc on the date pkg_install was released. License names - are case-sensitive. + Space-separated list of common Free and Open Source licenses + packages are allowed to carry. The default value contains all + OSI approved licenses in pkgsrc on the date pkg_install was + released. License names are case-sensitive. GPG Path to gpg(1), which can be used to verify the signature in the _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s file when running @@ -170,4 +170,4 @@ FFIILLEESS SSEEEE AALLSSOO pkg_add(1), pkg_admin(1) pkg_create(1), pkg_delete(1), pkg_info(1) -NetBSD 5.0 June 16, 2010 NetBSD 5.0 +NetBSD 5.0 November 13, 2010 NetBSD 5.0 |