[patch] the diff

emerge.1.diff (text/plain), 7.06 KB, created by Gregorio Guidi (RETIRED) on 2003-03-26 16:40:52 UTC

--- emerge.1.orig	2003-03-26 18:15:28.000000000 +0100
+++ emerge.1	2003-03-26 19:15:01.000000000 +0100
@@ -84,7 +84,7 @@
 clean binutils\fR cleans out old versions of binutils;
 \fBemerge clean net\-www/mozilla\-0.9.9\-r2\fR cleans out that
 specific version of Mozilla.  This is generally safe to use.
-\fBNote that\fR clean \fBdoes not remove unslotted packages.\fR
+\fBNote that\fR clean \fBdoes not remove slotted packages.\fR
 .TP
 \fBdepclean\fR
 Determines all packages installed on the system that have no
@@ -146,7 +146,7 @@
 \fBsync\fR
 Initiates a portage tree update with one of the rsync.gentoo.org
 mirrors.  \fBNote that any changes you have made to the portage
-tree will be erased\fR.  Except for in special circumstances,
+tree will be erased\fR.  Except for special circumstances,
 this uses \fBrsync\fR to do the update. See make.conf's description
 of PORTDIR_OVERLAY for a method to avoid deletions.
 .TP
@@ -169,7 +169,7 @@
 \fI${PKGDIR}\fR/All directory.
 .TP
 \fB\-\-columns\fR
-Used along side \fI--pretend\fR to causes the package, new version,
+Used along side \fI--pretend\fR causes the package, new version
 and old version to be displayed in an aligned format for easy cut\-n\-paste.
 .TP
 \fB\-\-debug\fR (\fB\-d\fR)
@@ -188,12 +188,12 @@
 \fB\-\-emptytree\fR (\fB\-e\fR)
 Virtually tweaks the tree of installed packages to only contain glibc;
 this is great to use together with \-\-pretend. This allows developers
-to get a complete overview of the complete dependency tree of a package,
+to get an overview of the complete dependency tree of a package,
 and it enables complete trees to be rebuilt using the latest libraries.
 .TP
 \fB\-\-fetchonly\fR (\fB\-f\fR)
 Instead of doing any package building, just perform fetches for all
-packages (the main package as well as all dependencies.)
+packages (the main package as well as all dependencies).
 .TP
 \fB\-\-noconfmem\fR
 Causes portage to disregard merge records indicating that a config file
@@ -207,8 +207,8 @@
 the build may fail if the dependencies aren't satisfied.
 .TP
 \fB\-\-noreplace\fR (\fB\-n\fR)
-Skips the packages specified on the command\-line that have already
-been installed.  Without this option, any packages, ebuilds, or deps
+Skips the packages specified on the command\-line that are already
+installed.  Without this option, any packages, ebuilds, or deps
 you specify on on the command\-line *will* cause Portage to remerge
 the package, even if it is already installed. Note that Portage will
 not remerge dependencies by default.
@@ -222,15 +222,16 @@
 for later updating.
 .TP
 \fB\-\-onlydeps\fR (\fB\-o\fR)
-Only merge (or pretend to merge) the dependencies of the packages
-specified, not the packages themselves.
+Only merge (or pretend to merge) the dependencies of the specified
+packages, not the packages themselves.
 .TP
 \fB\-\-pretend\fR (\fB\-p\fR)
 Instead of actually performing the merge, simply display what *would*
 have been installed if \-\-pretend weren't used.  Using \-\-pretend
 is strongly recommended before installing an unfamiliar package. In
 the printout, N = new, U = upgrading, R = replacing, B = blocked by
-an already installed package.
+an already installed package, D = the upgrade really is a downgrade
+of an installed package.
 .TP
 \fB\-\-searchdesc\fR (\fB\-S\fR)
 Matches the search string against the description field as well as
@@ -238,13 +239,16 @@
 matched as regular expressions.
 .TP
 \fB\-\-update\fR (\fB\-u\fR)
-Updates packages to the most recent version available.  \fBNote that\fR \-\-update \fBdoes not have full functionality yet\fR.  It will not automatically update dependencies of packages in the \fBworld\fR file, unless they too are in the \fBworld\fR file.
+Updates packages, along with their dependencies, to the most recent version
+available.
 .TP
 \fB\-\-usepkg\fR (\fB\-k\fR) 
 Tells emerge to use binary packages (from $PKGDIR) if they are available, thus possibly avoiding some time\-consuming compiles. This option is useful for CD installs; you can export PKGDIR=/mnt/cdrom/packages and then use this option to have emerge "pull" binary packages from the CD in order to satisfy dependencies.
 .TP
 \fB\-\-verbose\fR (\fB\-v\fR)
-Tell emerge to run in verbose mode.  Currently this flag causes emerge to print out GNU info errors, if any.
+Tell emerge to run in verbose mode. This flag causes emerge to print out GNU info errors, if any.
+If used in conjunction with \-\-pretend, it displays the USE variables enabled for the
+build process.
 .TP
 \fB\-\-version\fR
 Displays the version number of \fBemerge\fR.  It cannot be used in
@@ -252,7 +256,7 @@
 is a convention.
 .SH "OUTPUT"
 While utilizing emerge and the pretend/verbose flags, the output
-may be a little hard to understand for the first time.  This section
+may be a little hard to understand the first time.  This section
 exists to explain what the shorthanded information means.
 .TP
 .B [blocks B     ] app-text/dos2unix (from pkg app-text/hd2u-0.8.0)
@@ -296,6 +300,12 @@
 we see that nmap can use the \fBUSE\fR variables gtk and gnome, but that your current
 settings have gtk and gnome disabled.  So optional support for gtk and gnome will
 not be enabled in nmap when you emerge it.
+.TP
+.B [ebuild    U ] media-video/nvidia-kernel-1.0.3123-r2 [1.0.4191-r2]
+If you run the command, the selected package will be installed.
+A newer version is already present, but the D flag is not displayed,
+this means that the package will be installed in a different SLOT
+and will peacefully coexist with the installed one.
 .SH "NOTES"
 You should almost always precede any package install or update
 attempt with a \fB\-\-pretend\fR install or update.  This lets
@@ -305,10 +315,6 @@
 update a large number of packages if the portage tree has
 been particularly active.
 .LP 
-You also want to typically use \fB\-\-update\fR, which ignores
-packages that are already fully updated but upgrades those that
-are not.
-.LP 
 When you install a package with uninstalled dependencies and do
 not explicitly state those dependencies in the list of parameters,
 they will not be added to the world file.  If you want them to be
@@ -321,12 +327,6 @@
 flags specified on the command line are NOT remembered\fR.  For
 example, \fBUSE="\-x \-gnome" emerge mc\fR will emerge mc with
 those USE settings.
-.LP 
-If \fBemerge \-\-update system\fR or \fB emerge \-\-update world\fR
-fail with an error message, it may be that an ebuild uses some
-newer feature not present in this version of \fBemerge\fR.  You
-can use \fBemerge \-\-update portage\fR to upgrade to the lastest
-version, which should support any necessary new features.
 .SH "MASKED PACKAGES"
 \fINOTE: Please use caution when using development packages. Problems
 and bugs resulting from misusing masked packages drains Gentoo
@@ -395,8 +395,8 @@
 edit this file\fR.
 .TP
 \fB/etc/make.profile/use.defaults\fR
-Contains the USE flags that are enabled by default. \fBDo not edit this
-file\fR.
+Contains packages that, if installed, cause respective USE flag to be enabled by default.
+\fBDo not edit this file\fR.
 .TP
 \fB/usr/portage/profiles/use.desc\fR 
 Contains the master list of USE flags with descriptions of their