summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2000-06-07 13:25:53 +0000
committerMartin Mares <mj@ucw.cz>2000-06-07 13:25:53 +0000
commit58f7d004fddd2cccdb019be59b6cc7a8abe50510 (patch)
tree97d14f24e68ec6d32d114af62dab293a9abeb10c /conf
parent38203d789a872077ec174a63a448568725e4715f (diff)
Fixes to the progdoc.
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l6
-rw-r--r--conf/conf.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 49984f55..9dfe10ea 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -10,12 +10,12 @@
* DOC: Lexical analyzer
*
* The lexical analyzer used for configuration files and CLI commands
- * is generated using the |flex| tool accompanied with a couple of
+ * is generated using the |flex| tool accompanied by a couple of
* functions maintaining the hash tables containing information about
* symbols and keywords.
*
* Each symbol is represented by a &symbol structure containing name
- * of the symbol, its scope, symbol class (%SYM_PROTO for a name of a protocol,
+ * of the symbol, its lexical scope, symbol class (%SYM_PROTO for a name of a protocol,
* %SYM_NUMBER for a numeric constant etc.) and class dependent data.
* When an unknown symbol is encountered, it's automatically added to the
* symbol table with class %SYM_VOID.
@@ -454,7 +454,7 @@ cf_symbol_class_name(struct symbol *sym)
* the |gen_parser.m4| script.
*
* Grammar snippets are files (usually with extension |.Y|) contributed
- * by various BIRD modules to provide information about syntax of their
+ * by various BIRD modules in order to provide information about syntax of their
* configuration and their CLI commands. Each snipped consists of several
* section, each of them starting with a special keyword: |CF_HDR| for
* a list of |#include| directives needed by the C code, |CF_DEFINES|
diff --git a/conf/conf.c b/conf/conf.c
index 232be3fd..d6e2425e 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -9,9 +9,9 @@
/**
* DOC: Configuration manager
*
- * Configuration of BIRD is complex, but straightforward. There exist three
+ * Configuration of BIRD is complex, yet straightforward. There exist three
* modules taking care of the configuration: config manager (which takes care
- * of storage of config information and controls switching between configs),
+ * of storage of the config information and controls switching between configs),
* lexical analyzer and parser.
*
* The configuration manager stores each config as a &config structure
@@ -27,7 +27,7 @@
*
* Loading of new configuration is very simple: just call config_alloc()
* to get a new &config structure, then use config_parse() to parse a
- * configuration file and fill all information in the structure
+ * configuration file and fill all fields of the structure
* and finally ask the config manager to switch to the new
* config by calling config_commit().
*