Fix typos in local.conf.sample and local.conf.sample.extended

Fixes bug [YOCTO #1667]

Fix typos in local.conf.sample and local.conf.sample.extended:

differernt -> different
chages -> changes
complation -> compilation
egde -> edge
"an an" -> "as an"
images's -> image's

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 8 insertions, 9 deletions

diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index 3c8572476c..4981daa420 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -67,7 +67,7 @@ if "BBDEBUG" in os.environ:
     if level:
         bb.msg.set_debug_level(level)
 
-if True or os.environ.get("BBFETCH2"):
+if os.environ.get("BBFETCH2"):
     from bb import fetch2 as fetch
     sys.modules['bb.fetch'] = sys.modules['bb.fetch2']
 
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index c59b468e0b..851a7e6698 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -193,7 +193,6 @@ def feeder(lineno, s, fn, root, statements):
             if lineno == IN_PYTHON_EOF:
                 return
 
-
     if s and s[0] == '#':
         if len(__residue__) != 0 and __residue__[0][0] != "#":
             bb.error("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s))
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 0c24208772..da3f8df9a0 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -53,7 +53,7 @@ MACHINE ??= "qemux86"
 #
 # Where to place downloads
 #
-# During a first build the system will download many differernt source code tarballs
+# During a first build the system will download many different source code tarballs
 # from various upstream projects. This can take a while, particularly if your network
 # connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
 # can preserve this directory to speed up this part of subsequent builds. This directory
@@ -71,7 +71,7 @@ MACHINE ??= "qemux86"
 # and this option determines where those files are placed.
 #
 # You can wipe out TMPDIR leaving this directory intact and the build would regenerate
-# from these files if no chages were made to the configuration. If changes were made
+# from these files if no changes were made to the configuration. If changes were made
 # to the configuration, only shared state files where the state was still valid would
 # be used (done using checksums).
 #
@@ -84,7 +84,7 @@ MACHINE ??= "qemux86"
 #
 # This option specifies where the bulk of the building work should be done and
 # where BitBake should place its temporary files and output. Keep in mind that
-# this includes the extraction and complation of many applications and the toolchain
+# this includes the extraction and compilation of many applications and the toolchain
 # which can use Gigabytes of hard disk space.
 #
 # The default is a tmp directory under TOPDIR.
@@ -100,9 +100,9 @@ MACHINE ??= "qemux86"
 # these defaults.
 #
 DISTRO ?= "poky"
-# As an exable of a subclass there is a "bleeding" egde policy configuration 
+# As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
-# source control systems. This is just mentioned here an an example, its not
+# source control systems. This is just mentioned here as an example, its not
 # useful to most new users.
 # DISTRO ?= "poky-bleeding"
 
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index a42774cfac..0c3197d7f7 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -2,7 +2,7 @@
 # certain recipes.
 #BBMASK = ""
 
-# eglibc configurability is used to reduce minimal images's size.
+# eglibc configurability is used to reduce minimal image's size.
 # the all supported eglibc options are listed in DISTRO_FEATURES_LIBC
 # and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC
 # and DISTRO_FEATURES definitions to local.conf to enable the options.
@@ -78,7 +78,7 @@
 # The default is "default"
 # Use "external-MODE" to use the precompiled external toolchains where MODE
 # is the type of external toolchain to use e.g. eabi. You need to ensure 
-# the toolchain you want to use is included in an an appropriate layer
+# the toolchain you want to use is included in an appropriate layer
 # TCMODE = "external-eabi"
 
 # mklibs library size optimization is more useful to smaller images,