Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: trivial documentation fixes
  kconfig: fix saving alternate kconfig file in parent dir
  kbuild: make modpost processing configurable
  kconfig/menuconfig: do not let ncurses clutter screen on exit
  kconfig/lxdialog: clear long menu lines
  kbuild: do not build mconf & lxdialog unless needed
  kconfig/lxdialog: fix make mrproper
  kconfig/lxdialog: support resize
  kconfig/lxdialog: let <ESC><ESC> behave as expected
  kconfig/menuconfig: lxdialog is now built-in
  kconfig/lxdialog: add a new theme bluetitle which is now default
  kconfig/lxdialog: add support for color themes and add blackbg theme
  kconfig/lxdialog: refactor color support

1 files changed, 5 insertions, 4 deletions

diff --git a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt
index 2e7702e94a78..769ee05ee4d1 100644
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
@@ -43,7 +43,7 @@ are not planned to be included in the kernel tree.
 What is covered within this file is mainly information to authors
 of modules. The author of an external module should supply
 a makefile that hides most of the complexity, so one only has to type
-'make' to build the module. A complete example will be present in
+'make' to build the module. A complete example will be presented in
 chapter 4, "Creating a kbuild file for an external module".
 
 
@@ -61,6 +61,7 @@ when building an external module.
                 make -C <path-to-kernel> M=`pwd`
 
         For the running kernel use:
+
                 make -C /lib/modules/`uname -r`/build M=`pwd`
 
         For the above command to succeed, the kernel must have been
@@ -130,10 +131,10 @@ when building an external module.
 
         To make sure the kernel contains the information required to
         build external modules the target 'modules_prepare' must be used.
-        'module_prepare' exists solely as a simple way to prepare
+        'modules_prepare' exists solely as a simple way to prepare
         a kernel source tree for building external modules.
         Note: modules_prepare will not build Module.symvers even if
-        CONFIG_MODULEVERSIONING is set. Therefore a full kernel build
+        CONFIG_MODVERSIONS is set. Therefore a full kernel build
         needs to be executed to make module versioning work.
 
 --- 2.5 Building separate files for a module
@@ -450,7 +451,7 @@ kernel refuses to load the module.
 
 Module.symvers contains a list of all exported symbols from a kernel build.
 
---- 7.1 Symbols fron the kernel (vmlinux + modules)
+--- 7.1 Symbols from the kernel (vmlinux + modules)
 
         During a kernel build, a file named Module.symvers will be generated.
         Module.symvers contains all exported symbols from the kernel and