Add some cross references between emerge's new parallel build options and

MAKEOPTS.

svn path=/main/trunk/; revision=11063

diff --git a/man/emerge.1 b/man/emerge.1
index fdf94c13c3a53faa6822ba1a3e4e9a6c0cbdf4f1..bc9a7efc8ac6e023c095d5698ed806ceaa5e71a3 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -335,6 +335,10 @@ the related \fB\-\-skipfirst\fR option.
 .BR \-\-load\-average=LOAD
 Specifies that no new builds should be started if there are other builds
 running and the load average is at least LOAD (a floating-point number).
+This option is recommended for use in combination with \fB\-\-jobs\fR in
+order to avoid excess load. See \fBmake\fR(1) for information about
+analogous options that should be configured via \fBMAKEOPTS\fR in
+\fBmake.conf\fR(5).
 .TP
 .BR "\-\-newuse " (\fB\-N\fR)
 Tells emerge to include installed packages where USE flags have changed since 

diff --git a/man/make.conf.5 b/man/make.conf.5
index 2fa95f7242d499e6a4c203e2436537f0c2092235..b3dc3c49d5dd2d8072760edb5d9cc54b7498cedc 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -378,8 +378,10 @@ package.
 Use this variable if you want to use parallel make.  For example, if you
 have a dual\-processor system, set this variable to "\-j2" or "\-j3" for 
 enhanced build performance with many packages. Suggested settings are
-between \fICPUs+1\fR and \fI2*CPUs+1\fR.
-For more information, see \fBmake\fR(1).
+between \fICPUs+1\fR and \fI2*CPUs+1\fR. In order to avoid
+excess load, the \fB\-\-load\-average\fR option is recommended.
+For more information, see \fBmake\fR(1). Also see \fBemerge\fR(1) for
+information about analogous \fB\-\-jobs\fR and \fB\-\-load\-average\fR options.
 .TP
 \fBNOCOLOR\fR = \fI["true" | "false"]\fR
 Defines if color should be disabled by default.

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 756f9156bf253ba04752f3384c7b828bfe3d0e33..bf6a1383462a84783410434d8c7ab507b3c19f67 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -319,7 +319,14 @@ def help(myaction,myopts,havecolor=1):
                desc = "Specifies that no new builds should " + \
                        "be started if there are other builds " + \
                        "running and the load average is at " + \
-                       "least LOAD (a floating-point number)."
+                       "least LOAD (a floating-point number). " + \
+                       "This option is recommended for use " + \
+                       "in combination with --jobs in " + \
+                       "order to avoid excess load. See " + \
+                       "make(1) for information about " + \
+                       "analogous options that should be " + \
+                       "configured via MAKEOPTS in " + \
+                       "make.conf(5)."
                for line in wrap(desc, desc_width):
                        print desc_indent + line
                print