Merged revisions 5189-5198 via svnmerge from

https://svn.o-hand.com/repos/poky/trunk

........
  r5189 | richard | 2008-09-11 23:41:08 +0100 (Thu, 11 Sep 2008) | 1 line
  
  local.conf.sample: Make the parallel threads documentation more visible and update with a quadcore example
........
  r5190 | richard | 2008-09-12 00:02:51 +0100 (Fri, 12 Sep 2008) | 1 line
  
  handbook/quickstart: Improve documentation on the options available in local.conf
........
  r5191 | richard | 2008-09-12 00:11:45 +0100 (Fri, 12 Sep 2008) | 1 line
  
  handbook/faq.xml: Add a QA about proxy server setup
........
  r5192 | ross | 2008-09-12 16:43:10 +0100 (Fri, 12 Sep 2008) | 1 line
  
  ref-variables.xml: Add POKY_EXTRA_INSTALL
........
  r5193 | ross | 2008-09-16 10:00:50 +0100 (Tue, 16 Sep 2008) | 1 line
  
  poky-fixed-revisions.inc: bump matchbox-wm-2
........
  r5194 | ross | 2008-09-16 16:36:32 +0100 (Tue, 16 Sep 2008) | 1 line
  
  poky-fixed-revisions: bump libowl srvrev
........
  r5195 | ross | 2008-09-16 17:24:31 +0100 (Tue, 16 Sep 2008) | 1 line
  
  poky-fixed-revisions.inc: bump matchbox-desktop srvrev
........
  r5196 | richard | 2008-09-16 20:14:49 +0100 (Tue, 16 Sep 2008) | 1 line
  
  bitbake parse/__init_.py: Add missing update_mtime function fixing bitbake shell reparse failures
........
  r5197 | richard | 2008-09-16 21:09:03 +0100 (Tue, 16 Sep 2008) | 1 line
  
  ConfHandler.py: revert accidental commit
........
  r5198 | ross | 2008-09-18 10:35:14 +0100 (Thu, 18 Sep 2008) | 1 line
  
  poky-eabi.conf: add dialer to as-needed blacklist
........


git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5284 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 42 insertions, 4 deletions

diff --git a/handbook/faq.xml b/handbook/faq.xml
index 061ed563ce..4bd1b7a493 100644
--- a/handbook/faq.xml
+++ b/handbook/faq.xml
@@ -226,6 +226,24 @@
             </para>
         </answer>
     </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                I'm behind a firewall and need to use a proxy server. How do I do that?
+            </para>
+        </question>
+        <answer>
+            <para>
+                Most source fetching by Poky is done by wget and you therefore need to specify the proxy 
+                settings in a .wgetrc file in your home directory. Example settings in that file would be
+                'http_proxy = http://proxy.yoyodyne.com:18023/' and 'ftp_proxy = http://proxy.yoyodyne.com:18023/'.
+                Poky also includes a site.conf.sample file which shows how to configure cvs and git proxy servers
+                if needed.
+            </para>
+        </answer>
+    </qandaentry>
+
+
 </qandaset>
 </appendix>
 <!-- 
diff --git a/handbook/introduction.xml b/handbook/introduction.xml
index 291ed5d214..7de74673fb 100644
--- a/handbook/introduction.xml
+++ b/handbook/introduction.xml
@@ -196,9 +196,14 @@ $ runqemu qemuarm
 
         <para>
             To build for other machines see the <glossterm><link
-                    linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf
-            which also contains other configuration information. The images/kernels built
-            by Poky are placed in the <filename class="directory">tmp/deploy/images</filename>
+                    linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf.
+            This file contains other useful configuration information and the default version
+            has examples of common setup needs and is worth 
+            reading. To take advantage of multiple processor cores to speed up builds for example, set the 
+            <glossterm><link linkend='var-BB_NUMBER_THREADS'>BB_NUMBER_THREADS</link></glossterm>
+            and <glossterm><link linkend='var-PARALLEL_MAKE'>PARALLEL_MAKE</link></glossterm> variables.
+
+            The images/kernels built by Poky are placed in the <filename class="directory">tmp/deploy/images</filename>
             directory.
         </para>
 
diff --git a/handbook/ref-variables.xml b/handbook/ref-variables.xml
index a3590e1072..5d821a2108 100644
--- a/handbook/ref-variables.xml
+++ b/handbook/ref-variables.xml
@@ -66,7 +66,7 @@
 
         <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm>
             <glossdef>
-                <para>Number of BitBake threads</para>
+                <para>The maximum number of tasks BitBake should run in parallel at any one time</para>
             </glossdef>
         </glossentry>
 
@@ -483,6 +483,14 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-PARALLEL_MAKE'><glossterm>PARALLEL_MAKE</glossterm>
+            <glossdef>
+                <para>Extra options that are passed to the make command during the 
+                    compile tasks. This is usually of the form '-j 4' where the number
+                    represents the maximum number of parallel threads make can run.</para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-PN'><glossterm>PN</glossterm>
             <glossdef>
                 <para>Name of package.
@@ -532,6 +540,13 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-POKY_EXTRA_INSTALL'><glossterm>POKY_EXTRA_INSTALL</glossterm>
+            <glossdef>
+                <para>List of packages to be added to the image. This should
+                only be set in <filename>local.conf</filename>.</para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm>
             <glossdef>
                 <para>Libc implementation selector - glibc or uclibc can be selected.</para>