Merge branch 'master' into dev-sizet

[libucw.git] / ucw / doc / conf.txt

diff --git a/ucw/doc/conf.txt b/ucw/doc/conf.txt
index 43f838ec22a92aaadac5fde721e8edbc6b590bad..777dbe10facca83e30255028803bca7296a2a71b 100644 (file)
--- a/ucw/doc/conf.txt
+++ b/ucw/doc/conf.txt
@@ -141,11 +141,11 @@ are three ways to do that:
 +
 For example, you can have an static array of five unsigned integers:
 +
 +
 For example, you can have an static array of five unsigned integers:
 +

-  static uns array[] = { 1, 2, 3, 4, 5 };
+  static uint array[] = { 1, 2, 3, 4, 5 };

 +
   static struct cf_section section = {
     CF_ITEMS {
 +
   static struct cf_section section = {
     CF_ITEMS {

-      CF_UNS_ARY("array", array, 5),
+      CF_UINT_ARY("array", array, 5),

       CF_END
     }
   };
       CF_END
     }
   };


@@ -153,9 +153,8 @@ For example, you can have an static array of five unsigned integers:
 *Dynamic arrays*::
   Similar to static array, but you provide pointer
   to pointer to the given item (eg. if you want dynamic array of
 *Dynamic arrays*::
   Similar to static array, but you provide pointer
   to pointer to the given item (eg. if you want dynamic array of

-  integers, you give `**int`). The parser allocates an array of needed
-  size. You can use the <<def_DARY_LEN,`DARY_LEN`>> macro to find out
-  the number of elements actually loaded.
+  integers, you give `**int`). The parser allocates a <<gary:,growing array>>
+  of the required size.

 +
 If you want dynamic array of strings, you would use:
 +
 +
 If you want dynamic array of strings, you would use:
 +


@@ -213,7 +212,7 @@ journal entries are removed and a new one, for the new configuration,
 is added. If it fails, the first one is replayed and the rollback
 entry is removed.
 
 is added. If it fails, the first one is replayed and the rollback
 entry is removed.
 

-See <<cf_reload()>>.
+See @cf_reload().

 
 [[custom_parser]]
 Creating custom parsers
 
 [[custom_parser]]
 Creating custom parsers