From 41a043f196a142f1d816129fc52526f3c73a77c8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 2 Sep 2010 13:55:59 -0700 Subject: [PATCH] Adjust package sets documentation to match behavior in the stable branch. --- doc/config.docbook | 2 +- man/emerge.1 | 12 +++--------- man/portage.5 | 10 ---------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/doc/config.docbook b/doc/config.docbook index 88009dfc6..c5326b363 100644 --- a/doc/config.docbook +++ b/doc/config.docbook @@ -1,5 +1,5 @@ Configuration &config_bashrc; -&config_set; + diff --git a/man/emerge.1 b/man/emerge.1 index f453d4505..44684177e 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -60,14 +60,11 @@ would like to query the owners of one or more files or directories. A \fIset\fR is a convenient shorthand for a large group of packages. Three sets are currently always available: \fBselected\fR, \fBsystem\fR and \fBworld\fR. \fBselected\fR contains the user-selected -"world" packages that are listed in \fB/var/lib/portage/world\fR, -and nested sets that may be listed -in \fB/var/lib/portage/world_sets\fR. \fBsystem\fR refers to a set of +"world" packages that are listed in \fB/var/lib/portage/world\fR. +\fBsystem\fR refers to a set of packages deemed necessary for your system to run properly. \fBworld\fR encompasses both the \fBselected\fR and \fBsystem\fR sets. [See -\fBFILES\fR below for more information.] Other sets can exist depending -on the current configuration. The default set configuration is located -in the \fB/usr/share/portage/config/sets\fR directory. Note that a \fIset\fR +\fBFILES\fR below for more information.] Note that a \fIset\fR is generally used in conjunction with \fB\-\-update\fR. When used as arguments to \fBemerge\fR sets have to be prefixed with \fB@\fR to be recognized. Use the \fB\-\-list\-sets\fR action to display a list of @@ -871,9 +868,6 @@ Zac Medico Here is a common list of files you will probably be interested in. For a complete listing, please refer to the \fBportage\fR(5) man page. .TP -.B /usr/share/portage/config/sets/ -Contains the default set configuration. -.TP .B /var/lib/portage/world Contains a list of all user\-specified packages. You can safely edit this file, adding packages that you want to be considered in \fBworld\fR diff --git a/man/portage.5 b/man/portage.5 index d10ef0db0..477d8239c 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -103,7 +103,6 @@ database to track installed packages .nf config world -world_sets .fi .SH "GLOSSARY" In the following sections, some terminology may be foreign to you or used @@ -964,15 +963,6 @@ games\-misc/fortune\-mod\-gentoo\-dev dev\-libs/uclibc app\-cdr/cdemu .fi -.TP -.BR world_sets -This is like the world file but instead of package atoms it contains -packages sets which always begin with the @ character. - -.I Example: -.nf -@kde -.fi .RE .SH "REPORTING BUGS" Please report bugs via http://bugs.gentoo.org/ -- 2.26.2