[src/trunk]: src/usr.bin/config The word "configuration" is too ambiguous; us...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f8028516d24
branches:  trunk
changeset: 332785:1f8028516d24
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Oct 09 07:05:01 2014 +0000

description:
The word "configuration" is too ambiguous; use "selection" meaning that
user selects some of provided "definitions".

diffstat:

 usr.bin/config/gram.y |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (62 lines):

diff -r 67db630a8d05 -r 1f8028516d24 usr.bin/config/gram.y
--- a/usr.bin/config/gram.y     Thu Oct 09 06:52:37 2014 +0000
+++ b/usr.bin/config/gram.y     Thu Oct 09 07:05:01 2014 +0000
@@ -1,5 +1,5 @@
 %{
-/*     $NetBSD: gram.y,v 1.39 2014/05/29 07:47:45 mrg Exp $    */
+/*     $NetBSD: gram.y,v 1.40 2014/10/09 07:05:01 uebayasi Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -223,7 +223,7 @@
 %%
 
 /*
- * A complete configuration consists of both the configuration part (a
+ * A complete configuration consists of both the selection part (a
  * kernel config such as GENERIC or SKYNET, plus also the various
  * std.* files), which selects the material to be in the kernel, and
  * also the definition part (files, files.*, etc.) that declares what
@@ -254,7 +254,7 @@
 
 /* Complete configuration. */
 configuration:
-       topthings machine_spec definition_part configuration_part
+       topthings machine_spec definition_part selection_part
 ;
 
 /* Sequence of zero or more topthings. */
@@ -600,24 +600,24 @@
 /************************************************************/
 
 /*
- * The configuration grammar.
+ * The selection grammar.
  */
 
-/* Complete configuration part: all std.* files plus selected config. */
-configuration_part:
-       config_items
+/* Complete selection part: all std.* files plus selected config. */
+selection_part:
+       selections
 ;
 
 /* Zero or more config items. Trap errors. */
-config_items:
+selections:
          /* empty */
-       | config_items '\n'
-       | config_items config_item '\n' { wrap_continue(); }
-       | config_items error '\n'       { wrap_cleanup(); }
+       | selections '\n'
+       | selections selection '\n'     { wrap_continue(); }
+       | selections error '\n' { wrap_cleanup(); }
 ;
 
 /* One config item. */
-config_item:
+selection:
          definition
        | NO FILE_SYSTEM no_fs_list
        | FILE_SYSTEM fs_list