3 files changed, 9 insertions, 9 deletions

diff --git a/handbook/development.xml b/handbook/development.xml
index 637d279d4d..d36f7f2fe0 100644
--- a/handbook/development.xml
+++ b/handbook/development.xml
@@ -532,18 +532,18 @@ $ bitbake matchbox-desktop -c devshell
                 Firstly you want to install the <emphasis>foo</emphasis> package to tmp/rootfs 
                 by doing:
                 </para>
-                <programlisting>tmp/staging/i686-linux/usr/bin/ipkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/ipkg.conf -o \
+                <programlisting>tmp/staging/i686-linux/usr/bin/opkg-cl -f \
+tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf -o \
 tmp/rootfs/ update</programlisting>
                <para>
                 then,
                 </para>
-                <programlisting>tmp/staging/i686-linux/usr/bin/ipkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/ipkg.conf \
+                <programlisting>tmp/staging/i686-linux/usr/bin/opkg-cl -f \
+tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo
 
-tmp/staging/i686-linux/usr/bin/ipkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/ipkg.conf \
+tmp/staging/i686-linux/usr/bin/opkg-cl -f \
+tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo-dbg</programlisting>
              <para>
                 which installs the debugging information too.
@@ -802,7 +802,7 @@ $ opreport -cl
                 located in /boot/vmlinux-KERNELVERSION, where KERNEL-version is the version of 
                 the kernel e.g. 2.6.23. Poky generates separate vmlinux packages for each kernel
                 it builds so it should be a question of just ensuring a matching package is 
-                installed (<command> ipkg install kernel-vmlinux</command>. These are automatically 
+                installed (<command> opkg install kernel-vmlinux</command>. These are automatically 
                 installed into development and profiling images alongside OProfile. There is a 
                 configuration option within the OProfileUI settings page where the location of 
                 the vmlinux file can be entered. 
diff --git a/handbook/extendpoky.xml b/handbook/extendpoky.xml
index d6f183acc6..c7e3033693 100644
--- a/handbook/extendpoky.xml
+++ b/handbook/extendpoky.xml
@@ -618,7 +618,7 @@ BBFILE_PRIORITY_extras = "5"</literallayout>
                 the repository and don't have to remember to rebuild any sections.
                 The second is to ensure that target users are able to upgrade their
                 devices via their package manager such as with the <command>
-                ipkg update;ipkg upgrade</command> commands (or similar for 
+                opkg update;opkg upgrade</command> commands (or similar for 
                 dpkg/apt or rpm based systems). The aim is to ensure Poky has 
                 upgradable packages in all cases.
             </para>
diff --git a/handbook/faq.xml b/handbook/faq.xml
index 2c227bfc62..061ed563ce 100644
--- a/handbook/faq.xml
+++ b/handbook/faq.xml
@@ -119,7 +119,7 @@
         </question>
         <answer>
             <para>
-                Poky can build packages in various formats, ipkg, Debian package, or RPM. The package can then be upgraded using the package tools on the device, much like on a desktop distribution like Ubuntu or Fedora.
+                Poky can build packages in various formats, ipk (for ipkg/opkg), Debian package (.deb), or RPM. The packages can then be upgraded using the package tools on the device, much like on a desktop distribution like Ubuntu or Fedora.
             </para>
         </answer>
     </qandaentry>