Minor fixes

index e5ba655..0e8e58b 100644
@@ -3,7 +3,7 @@
 # command directly in your recipe, but in most cases this class simplifies
 # that job.
 #
-# There're two basic modes supported: 'single update' and 'batch update'
+# There are two basic modes supported: 'single update' and 'batch update'
 #
 # 'single update' is used for a single alternative command, and you're
 # expected to provide at least below keywords:

@@ -11,19 +11,19 @@
 #     ALTERNATIVE_NAME - the name that the alternative is registered
 #     ALTERNATIVE_PATH - the path of installed alternative
 #
-# ALTENATIVE_PRIORITY and ALTERNATIVE_LINK are optional which have defautls
+# ALTERNATIVE_PRIORITY and ALTERNATIVE_LINK are optional which have defaults
 # in this class.
 #
 # 'batch update' is used if you have multiple alternatives to be updated.
 # Unlike 'single update', 'batch update' in most times only require two
-# parameter:
+# parameters:
 #
-#     ALTERNATIVE_LINKS - a list of symbol links for which you'd like to
+#     ALTERNATIVE_LINKS - a list of symbolic links for which you'd like to
 #                         create alternatives, with space as delimiter, e.g:
 #
 #         ALTERNATIVE_LINKS = "${bindir}/cmd1 ${sbindir}/cmd2 ..."
 #
-#     ALTNERATIVE_PRIORITY - optional, applies to all
+#     ALTERNATIVE_PRIORITY - optional, applies to all
 #
 # To simplify the design, this class has the assumption that for a name
 # listed in ALTERNATIVE_LINKS, say /path/cmd:

@@ -49,7 +49,7 @@ update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH}
 }
 
 # for batch alternatives, we use a simple approach to require only one parameter
-# with the rest info deduced implicitly
+# with the rest of the info deduced implicitly
 update_alternatives_batch_postinst() {
 for link in ${ALTERNATIVE_LINKS}
 do

index 963b42b..b6d5b59 100644
@@ -1,7 +1,11 @@
 OpenEmbedded-Core
 =================
 
-For information about OpenEmbedded see their website:
+OpenEmbedded-Core is a layer containing the core metadata for current versions
+of OpenEmbedded. It is distro-less (can build a functional image with
+DISTRO = "") and contains only emulated machine support.
+
+For information about OpenEmbedded, see the OpenEmbedded website:
     http://www.openembedded.org/
 
 The Yocto Project has extensive documentation about OE including a reference manual

index 7d52d0e..5679c03 100644
@@ -4,7 +4,7 @@
 # to the system might want to change but pretty much any configuration option can
 # be set in this file. More adventurous users can look at local.conf.extended 
 # which contains other examples of configuration which can be placed in this file
-# but new users likely don't need any of them initially.
+# but new users likely won't need any of them initially.
 #
 # Lines starting with the '#' character are commented out and in some cases the 
 # default values are provided as comments to show people example syntax. Enabling

@@ -22,16 +22,16 @@
 # The second option controls how many processes make should run in parallel when
 # running compile tasks:
 #
-# PARALLEL_MAKE = "-j 4"
+#PARALLEL_MAKE = "-j 4"
 #
-# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
+# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
 # be appropriate for example.
 
 #
 # Machine Selection
 #
 # You need to select a specific machine to target the build with. There are a selection
-# emulated machines available which can boot and run in the QEMU emulator:
+# of emulated machines available which can boot and run in the QEMU emulator:
 #
 #MACHINE ?= "qemuarm"
 #MACHINE ?= "qemumips"

@@ -59,7 +59,7 @@ MACHINE ??= "qemux86"
 # Where to place shared-state files
 #
 # BitBake has the capability to accelerate builds based on previously built output.
-# This is done using "shared state" files which can be through of as cache objects
+# This is done using "shared state" files which can be thought of as cache objects
 # and this option determines where those files are placed.
 #
 # You can wipe out TMPDIR leaving this directory intact and the build would regenerate

@@ -121,10 +121,10 @@ PACKAGE_CLASSES ?= "package_ipk"
 #  "tools-debug"    - add debugging tools (gdb, strace)
 #  "tools-profile"  - add profiling tools (oprofile, exmap, lttng valgrind (x86 only))
 #  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
-#  "debug-tweaks"   - make an image for suitable of development
+#  "debug-tweaks"   - make an image suitable for development
 #                     e.g. ssh root access has a blank password
-# There are other application targets that can be uses here too, see 
-# meta/classes/core-image.bbclass and meta/recipes-core/tasks/task-core.bb for more details.
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
 # We default to enabling the debugging tweaks.
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
 

@@ -151,16 +151,17 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 #IMAGETEST = "qemu"
 #
 # This variable controls which tests are run against virtual images if enabled
-# above. The following would enable bat, oot test case under sanity suite and 
-# toolchain tests
+# above. The following would enable bat, boot the test case under the sanity suite
+# and perform toolchain tests
 #TEST_SCEN = "sanity bat sanity:boot toolchain"
 #
-# Because of the QEMU booting slowness issue(see bug #646 and #618), autobuilder
-# may suffer a timeout issue when running sanity test. We introduce variable
-# TEST_SERIALIZE here to reduce the time on sanity test. It is by default set 
-# to 1. This will start image and run cases in the same image without reboot 
-# or kill. If it is set to 0, the image will be copied and tested for each 
-# case, which will take longer but be more precise.
+# Because of the QEMU booting slowness issue (see bug #646 and #618), the
+# autobuilder may suffer a timeout issue when running sanity tests. We introduce
+# the variable TEST_SERIALIZE here to reduce the time taken by the sanity tests.
+# It is set to 1 by default, which will boot the image and run cases in the same
+# image without rebooting or killing the machine instance. If it is set to 0, the
+# image will be copied and tested for each case, which will take longer but be
+# more precise.
 #TEST_SERIALIZE = "1"
 
 #

@@ -175,7 +176,7 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 # Examples of the occasions this may happen are when resolving patches which cannot
 # be applied, to use the devshell or the kernel menuconfig
 #
-# Supported values are auto, gnome, xfce, rxvt, xcreen, konsole (3.x only), none
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
 # Note: currently, Konsole support only works for KDE 3.x due to the way
 # newer Konsole versions behave
 #OE_TERMINAL = "auto"

index a82f0ff..d5eac6b 100644
@@ -4,6 +4,8 @@ which allows WebKit to be enabled.
 
 Signed-off-by: Paul Eggleton <[email protected]>
 
+Upstream-Status: Pending
+
 Index: qt-everywhere-opensource-src-4.8.0/configure
 ===================================================================
 --- qt-everywhere-opensource-src-4.8.0.orig/configure