aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-10-05 12:05:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-06 18:51:21 +0100
commit720446629bec50ff9dbfb2641585610da3579b43 (patch)
tree2b66324f6691de14c6bd1ff731a6187308d0b498
parentdb9d36f1965a87752fcd5f750cac9ea03b815ec6 (diff)
downloadpoky-720446629bec50ff9dbfb2641585610da3579b43.tar.gz
poky-720446629bec50ff9dbfb2641585610da3579b43.tar.bz2
poky-720446629bec50ff9dbfb2641585610da3579b43.zip
documentation/yocto-project-qs/yocto-project-qs.xml: release name and misc.
I somehow had either dreamed the word "einstein" into the release for 1.1 and had it in there as part of the tarball name, etc. I have replaced this obviously with "edison." Other edits involved making the references to outside documents more consistent. (From yocto-docs rev: 2407b7dd89712c489d515e97d44e3c7dc0b64d20) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/yocto-project-qs/yocto-project-qs.xml27
1 files changed, 14 insertions, 13 deletions
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 3c092e5701..71fb0ab729 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -36,9 +36,9 @@
<para>
Finally, you might find the Frequently Asked Questions (FAQ) for the Yocto Project
at <ulink url='https://wiki.yoctoproject.org/wiki/FAQ'>Yocto Project FAQ</ulink> and
- the FAQ appendix located in the
+ the FAQ appendix located in
<ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
- Yocto Project Reference Manual</ulink> helpful.
+ The Yocto Project Reference Manual</ulink> helpful.
</para>
<note>
Due to production processes, there could be differences between the Yocto Project
@@ -316,16 +316,16 @@
through a set of locations.
If you encounter problems with the Yocto Project finding and downloading source code, see
the FAQ entry "How does Poky obtain source code and will it work behind my
- firewall or proxy server?" in the
+ firewall or proxy server?" in
<ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
- Yocto Project Reference Manual</ulink>.
+ The Yocto Project Reference Manual</ulink>.
</para></note>
<para>
<literallayout class='monospaced'>
- $ wget http://www.yoctoproject.org/downloads/poky/poky-einstein-6.0.tar.bz2
- $ tar xjf poky-einstein-6.0.tar.bz2
- $ source poky-einstein-6.0/oe-init-build-env einstein-6.0-build
+ $ wget http://www.yoctoproject.org/downloads/poky/poky-edison-6.0.tar.bz2
+ $ tar xjf poky-edison-6.0.tar.bz2
+ $ source poky-edison-6.0/oe-init-build-env edison-6.0-build
</literallayout>
</para>
@@ -333,7 +333,7 @@
To help conserve disk space during builds, you can add the following statement
to your <filename>local.conf</filename> file in the Yocto Project build
directory, which for this example
- is <filename>einstein-6.0-build</filename>.
+ is <filename>edison-6.0-build</filename>.
Adding this statement deletes the work directory used for building a package
once the package is built.
<literallayout class='monospaced'>
@@ -349,14 +349,14 @@
<ulink url='http://www.yoctoproject.org'>Yocto Project website</ulink> downloads
area to retrieve the tarball.</para></listitem>
<listitem><para>The second command extracts the files from the tarball and places
- them into a directory named <filename>poky-einstein-6.0</filename> in the current
+ them into a directory named <filename>poky-edison-6.0</filename> in the current
directory.
</para></listitem>
<listitem><para>The third command runs the Yocto Project environment setup script.
Running this script defines Yocto Project build environment settings needed to
complete the build.
The script also creates the Yocto Project
- build directory, which is <filename>einstein-6.0-build</filename> in this case.
+ build directory, which is <filename>edison-6.0-build</filename> in this case.
After the script runs, your current working directory is set
to the build directory.
Later, when the build completes, the build directory contains all the files
@@ -410,15 +410,16 @@
<filename>core-image-sato</filename> in this example.
For information on the <filename>-k</filename> option use the
<filename>bitbake --help</filename> command or see the
- "<ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>BitBake</ulink>" section in the Yocto Project Reference Manual.
+ "<ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>BitBake</ulink>" section in
+ <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>The Yocto Project Reference Manual</ulink>.
<literallayout class='monospaced'>
$ bitbake -k core-image-sato
</literallayout>
<note><para>
BitBake requires Python 2.6 or 2.7. For more information on this requirement,
- see the FAQ appendix in the
+ see the FAQ appendix in
<ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
- Yocto Project Reference Manual</ulink>.
+ The Yocto Project Reference Manual</ulink>.
</para></note>
The final command runs the image:
<literallayout class='monospaced'>