Synchronise with v3.10

[kconfig-frontends] / docs / kconfig-language.txt

diff --git a/docs/kconfig-language.txt b/docs/kconfig-language.txt
index 44e2649fbb295db936245c4c0de09109738bfc5e..c858f8419ebafeeb7d700be52c919d6ee0770201 100644 (file)
--- a/docs/kconfig-language.txt
+++ b/docs/kconfig-language.txt
@@ -117,7 +117,7 @@ applicable everywhere (see syntax).
   This attribute is only applicable to menu blocks, if the condition is
   false, the menu block is not displayed to the user (the symbols
   contained there can still be selected by other symbols, though). It is
-  similar to a conditional "prompt" attribude for individual menu
+  similar to a conditional "prompt" attribute for individual menu
   entries. Default value of "visible" is true.
 
 - numerical ranges: "range" <symbol> <symbol> ["if" <expr>]
@@ -388,26 +388,3 @@ config FOO
        depends on BAR && m
 
 limits FOO to module (=m) or disabled (=n).
-
-Kconfig symbol existence
-~~~~~~~~~~~~~~~~~~~~~~~~
-The following two methods produce the same kconfig symbol dependencies
-but differ greatly in kconfig symbol existence (production) in the
-generated config file.
-
-case 1:
-
-config FOO
-       tristate "about foo"
-       depends on BAR
-
-vs. case 2:
-
-if BAR
-config FOO
-       tristate "about foo"
-endif
-
-In case 1, the symbol FOO will always exist in the config file (given
-no other dependencies).  In case 2, the symbol FOO will only exist in
-the config file if BAR is enabled.