diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-06-26 22:32:52 +0400 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-06-26 22:32:52 +0400 |
| commit | c91a54aef8a39e7cbb2571574f56f2cf12104ff1 (patch) | |
| tree | e68102d093c111affd9208b78df9c18aa837c3b8 /docs/usermanual | |
| parent | 323edc5ef4c3d8572ee0b4fd185ca6e3166d6b45 (diff) | |
| parent | 84efca2e2ad21d3d7cea68c0327f91aaf773eb67 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Conflicts:
recipes/musicpd/mpd_0.14.2.bb
Diffstat (limited to 'docs/usermanual')
| -rw-r--r-- | docs/usermanual/chapters/getting_oe.xml | 2 | ||||
| -rw-r--r-- | docs/usermanual/reference/class_rootfs_ipkg.xml | 8 | ||||
| -rw-r--r-- | docs/usermanual/usermanual.xml | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml index a04e233d36..83fbad1fab 100644 --- a/docs/usermanual/chapters/getting_oe.xml +++ b/docs/usermanual/chapters/getting_oe.xml @@ -244,7 +244,7 @@ MACHINE = "om-gta01"</screen> <para>The primary interface to the build system is the <command>bitbake</command> command (see - the <ulink url="http://subversion.tigris.org/faq.html#proxy">BitBake + the <ulink url="http://bitbake.berlios.de/manual/">BitBake users manual</ulink>). BitBake will download and patch files from the internet, so it helps if you are on a well connected machine. </para> diff --git a/docs/usermanual/reference/class_rootfs_ipkg.xml b/docs/usermanual/reference/class_rootfs_ipkg.xml index b60adf8e70..fde8a38c03 100644 --- a/docs/usermanual/reference/class_rootfs_ipkg.xml +++ b/docs/usermanual/reference/class_rootfs_ipkg.xml @@ -41,7 +41,7 @@ <listitem> <para>Installs the list of requested <command>.ipkg</command> packages, - <command>${IPKG_INSTALL}</command>;</para> + <command>${PACKAGE_INSTALL}</command>;</para> </listitem> <listitem> @@ -89,7 +89,7 @@ <variablelist> <varlistentry> - <term>IPKG_INSTALL</term> + <term>PACKAGE_INSTALL</term> <listitem> <para>The list of packages which will be installed into the root @@ -114,7 +114,7 @@ </varlistentry> <varlistentry> - <term>PACKAGE_ARCH</term> + <term>PACKAGE_ARCHS</term> <listitem> <para>Defines the list of architectures that are support by the target @@ -212,4 +212,4 @@ which is executed without <xref linkend="fakeroot" /> and therefore can be used from other classes, such as <xref linkend="image_class" />, that are already running under the control of <xref linkend="fakeroot" />.</para> -</section>
\ No newline at end of file +</section> diff --git a/docs/usermanual/usermanual.xml b/docs/usermanual/usermanual.xml index ca2e7a93ac..dc38abaa34 100644 --- a/docs/usermanual/usermanual.xml +++ b/docs/usermanual/usermanual.xml @@ -44,6 +44,8 @@ <year>2008</year> + <year>2009</year> + <holder>Holger Hans Peter Freyther</holder> <holder>Koen Kooi</holder> |