6 files changed, 10 insertions, 11 deletions

diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 832319a5ae..c8c6a57426 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -1,11 +1,11 @@
-# Common for Poky images
+# Common code for generating core reference images
 #
-# Copyright (C) 2007 OpenedHand LTD
+# Copyright (C) 2007-2011 Linux Foundation
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-# IMAGE_FEATURES control content of images built with Poky.
+# IMAGE_FEATURES control content of the core reference images
 # 
 # By default we install task-core-boot and task-base packages - this gives us
 # working (console only) rootfs.
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index e71403ece3..daeb8d8c9c 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -29,7 +29,7 @@ def qemuimagetest_main(d):
     import os
     
     """
-    Test Controller for Poky Testing.
+    Test Controller for automated testing.
     """
     
     casestr = re.compile(r'(?P<scen>\w+\b):(?P<case>\w+$)')
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 5e9ebe5ef4..d0a14187ff 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -1,4 +1,4 @@
-# Populates LICENSE_DIRECTORY as set in poky.conf with the license files as set by
+# Populates LICENSE_DIRECTORY as set in distro config with the license files as set by
 # LIC_FILES_CHKSUM. 
 # TODO:
 # - We should also enable the ability to put the generated license directory onto the
@@ -31,7 +31,7 @@ python do_populate_lic() {
     destdir = os.path.join(bb.data.getVar('LICSSTATEDIR', d, True), pn)
     # The license files are located in S/LIC_FILE_CHECKSUM.
     srcdir = bb.data.getVar('S', d, True)
-    # Directory we store the generic licenses as set in poky.conf
+    # Directory we store the generic licenses as set in the distro configuration
     generic_directory = bb.data.getVar('COMMON_LICENSE_DIR', d, True)
     if not generic_directory:
         raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config")
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c2a072a329..a2b36bdbef 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -528,8 +528,7 @@ SRCPV = "${@bb.fetch2.get_srcrev(d)}"
 
 SRC_URI = "file://${FILE}"
 
-# We can choose which provider of fake root privileges to use
-# default is fakeroot but in Poky we use pseudo
+# Use pseudo as the fakeroot implementation
 PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
 FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
 FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 271acc93ff..b9d9029d21 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -21,7 +21,7 @@ for device in 'hda' 'hdb' 'sda' 'sdb'
           found="yes"
 
           while true; do
-              echo "Found drive at /dev/${device}. Do you want to install poky there ? [y/n]"
+              echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]"
               read answer
               if [ "$answer" = "y" ] ; then
                   break
@@ -153,7 +153,7 @@ echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map
 
 echo "default 0" > /ssd/boot/grub/menu.lst
 echo "timeout 30" >> /ssd/boot/grub/menu.lst
-echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst
+echo "title Live Boot/Install-Image" >> /ssd/boot/grub/menu.lst
 echo "root  (hd0,0)" >> /ssd/boot/grub/menu.lst
 echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
 
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index cabdf8baf0..55dab8aaae 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -26,7 +26,7 @@ inherit autotools
 BBCLASSEXTEND = "native"
 
 EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \
-        --with-bugurl=http://bugzilla.pokylinux.org/"
+        --with-bugurl=http://bugzilla.yoctoproject.org/"
 
 do_configure_prepend () {
         # Disable documentation!