summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2000-06-08 14:37:21 +0200
committerMartin Mares <mj@ucw.cz>2000-06-08 14:37:21 +0200
commit725270cb1da0672128675924844531e56c6ea64e (patch)
tree06fcfcd87498d35138a888719a35128df1ed8438 /conf
parent8d56febe64769c19a06c2c0f3ff121d25eceaa5b (diff)
downloadbird-725270cb1da0672128675924844531e56c6ea64e.tar
bird-725270cb1da0672128675924844531e56c6ea64e.zip
Fixes for the programmer's manual.
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l4
-rw-r--r--conf/conf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 9dfe10e..ce2ce40 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -456,7 +456,7 @@ cf_symbol_class_name(struct symbol *sym)
* Grammar snippets are files (usually with extension |.Y|) contributed
* 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
+ * sections, each of them starting with a special keyword: |CF_HDR| for
* a list of |#include| directives needed by the C code, |CF_DEFINES|
* for a list of C declarations, |CF_DECLS| for |bison| declarations
* including keyword definitions specified as |CF_KEYWORDS|, |CF_GRAMMAR|
@@ -473,5 +473,5 @@ cf_symbol_class_name(struct symbol *sym)
*
* Values of |enum| filter types can be defined using |CF_ENUM| with
* the following parameters: name of filter type, prefix common for all
- * literals of this type, names of all the possible values.
+ * literals of this type and names of all the possible values.
*/
diff --git a/conf/conf.c b/conf/conf.c
index d6e2425..be2d771 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -9,7 +9,7 @@
/**
* DOC: Configuration manager
*
- * Configuration of BIRD is complex, yet straightforward. There exist three
+ * Configuration of BIRD is complex, yet straightforward. There are three
* modules taking care of the configuration: config manager (which takes care
* of storage of the config information and controls switching between configs),
* lexical analyzer and parser.
@@ -18,7 +18,7 @@
* accompanied by a linear pool from which all information associated
* with the config and pointed to by the &config structure is allocated.
*
- * There can exist up four different configurations at one time: an active
+ * There can exist up to four different configurations at one time: an active
* one (pointed to by @config), configuration we are just switching from
* (@old_config), one queued for the next reconfiguration (@future_config;
* if it's non-%NULL and the user wants to reconfigure once again, we just