Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.net/openembedded into org.openembedded.dev

2 files changed, 18 insertions, 12 deletions

diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml
index e8d1f2cc9d..4ec5fecb1f 100644
--- a/docs/usermanual/chapters/getting_oe.xml
+++ b/docs/usermanual/chapters/getting_oe.xml
@@ -30,9 +30,9 @@ $ <command>cd</command> $OEBASE</screen>
 	you to build your applications and images.
     </para>
 
-	<para>The <varname>$OEBASE</varname> will also contain both bitbake/ and
-	openembedded/ directories. These will be discussed in
-	<xref linkend="gettingoe_getting_bitbake"/> and
+	<para>The <varname>$OEBASE</varname> will also contain both of the
+	<literal>bitbake/<literal> and <literal>openembedded/</literal> directories.
+	These will be discussed in <xref linkend="gettingoe_getting_bitbake"/> and
 	<xref linkend="gettingoe_getting_oe"/>.
 	</para>
   </section>
@@ -47,19 +47,19 @@ $ <command>cd</command> $OEBASE</screen>
     directory of <literal>openembedded/</literal>
     and <literal>build/</literal> directories. Indeed, as bitbake is written
     in python it does not need compilation for being used. You'll just have to
-    set the PATH variable so that the BitBake tools are accessible (see
-    <xref linkend="gettingoe_configuring_oe"/>).</para>
+    set the <varname>PATH</varname> variable so that the BitBake tools are
+    accessible (see <xref linkend="gettingoe_configuring_oe"/>).</para>
 
 	<section><title>Downloading a <application>BitBake</application> release</title>
 	  <para>Releases are available from the berlios project website. The current
           release series is <application>BitBake</application> <emphasis>1.8</emphasis>
-          and the current release is <emphasis>1.8.12</emphasis>. To download execute
+          and the current release is <emphasis>1.8.16</emphasis>. To download execute
 	  the following commands:
 		<screen>
 $ <command>cd</command> $OEBASE
-$ <command>wget</command>http://download.berlios.de/bitbake/bitbake-1.8.12.tar.gz
-$ <command>tar</command> -xvzf bitbake-1.8.12.tar.gz
-$ <command>mv</command> bitbake-1.8.12 bitbake
+$ <command>wget</command> http://download.berlios.de/bitbake/bitbake-1.8.16.tar.gz
+$ <command>tar</command> -xvzf bitbake-1.8.16.tar.gz
+$ <command>mv</command> bitbake-1.8.16 bitbake
 </screen>
 	  </para>
 
@@ -257,7 +257,13 @@ MACHINE = "om-gta01"</screen>
         If your system does not provide
         the <filename>/etc/sysctl.conf</filename> mechanism, you can try adding
         the above <command>echo</command> command line to
-        your <filename>/etc/rc.local</filename>.
+        your <filename>/etc/rc.local</filename>.  But that's not all.
+
+        On some systems (such as Fedora 11), changing that kernel setting
+        will cause an SELinux violation if you're running SELinux in enforcing
+        mode. If that's the case, you can either disable SELinux or run:
+
+        <screen>$ setsebool -P allow_unconfirmed_mmap_low 1</screen>
       </para>
     </note>
 
@@ -270,7 +276,7 @@ MACHINE = "om-gta01"</screen>
       BitBake file is a logical unit of tasks to be executed. Normally this is
       a package to be built. Inter-recipe dependencies are obeyed. The recipes
       are located by BitBake via the <varname>BBFILES</varname> variable (set
-      in your <filename>$OEBASE/build/conf/local/conf</filename>), which is a
+      in your <filename>$OEBASE/build/conf/local.conf</filename>), which is a
       space separated list of <filename>.bb</filename> files, and does handle
       wildcards.
     </para>
diff --git a/docs/usermanual/chapters/introduction.xml b/docs/usermanual/chapters/introduction.xml
index 31f1f1f516..28e7725add 100644
--- a/docs/usermanual/chapters/introduction.xml
+++ b/docs/usermanual/chapters/introduction.xml
@@ -30,7 +30,7 @@
         </listitem>
 
         <listitem>
-          <para>Must be able to emit packages (tar, rpm, deb,ipk)</para>
+          <para>Must be able to emit packages (tar, rpm, deb, ipk)</para>
         </listitem>
 
         <listitem>