[interchange-docs] xmldocs - docelic modified 18 files

docs at icdevgroup.org docs at icdevgroup.org
Wed Nov 29 18:07:46 EST 2006


User:      docelic
Date:      2006-11-29 23:07:46 GMT
Modified:  refs     page.tag namecase.filter name.filter Accounting
Modified:           ConfigDatabase DOCROOT assign.tag
Modified:  docbook  literals.ent olinkdb-c.xml olinkdb-nc.xml
Modified:  bin      refs-autogen
Modified:  guides   iccattut.xml
Modified:  docbook/symbol-templates systemtag uitag usertag
Modified:  glossary database pragma
Added:     guides   databases.xml
Log:
- databases document added, describing databases and fields used by IC
- assign and page tags documented
- Text flow fixes at a few places

Revision  Changes    Path
1.2       +167 -0    xmldocs/refs/page.tag


rev 1.2, prev_rev 1.1
Index: page.tag
===================================================================
RCS file: /var/cvs/xmldocs/refs/page.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page.tag	17 Feb 2005 23:25:39 -0000	1.1
+++ page.tag	29 Nov 2006 23:07:45 -0000	1.2
@@ -0,0 +1,167 @@
+
+__NAME__ purpose
+produce a hypertext link
+__END__ 
+
+
+__NAME__ synopsis
+<row>
+<entry>Standard options</entry>
+<entry></entry><entry></entry>
+<entry></entry>
+<entry>
+See &tag-area; options.
+</entry>
+</row>
+<row>
+<entry><arg choice='plain'>extra</arg></entry>
+<entry></entry><entry></entry>
+<entry>None.</entry>
+<entry>
+Name of a &glos-CSS; class to insert as <literal>class=<replaceable>...</replaceable></literal>.
+</entry>
+</row>
+&ROW_INTERPOLATE_0;
+&ROW_REPARSE_1;
+__END__
+
+__NAME__ see also
+area
+__END__
+
+__NAME__ description
+The &tag-page; tag expands to a proper hypertext URL &glos-link; which
+preserves Interchange &glos-session; information and arguments passed onto
+the targeted page or &glos-form-action;. The target page argument you
+supply is treated relatively
+to the <filename class='directory'>pages/</filename> directory inside your
+catalog root directory (&glos-CATROOT;).
+</para><para>
+The enclosing &lt;a href=""&gt;&lt;/a&gt; HTML tag is included. Where 
+this is unwanted, use &tag-area;.
+</para><para>
+Besides just producing hypertext links to specific pages, you can also
+"embed" complete &glos-HTML; forms in the target link (for say, one-click
+ordering or searches); see <xref linkend="page_examples"/>.
+__END__
+
+
+__NAME__ notes
+The &tag-__FILENAME__; tag examples use some advanced argument-quoting concepts.
+To minimize confusion, please see the proper and complete quoting explanation
+in the &glos-ITL; glossary entry.
+</para><para>
+Since the &tag-page; already includes an opening &glos-HTML; link
+(the "<replaceable>&lt;a href=<replaceable>...</replaceable>&gt;</replaceable>"
+part), the only thing left is to close it using "<literal>&lt;/a&gt;</literal>"
+after typing in the link text. There is a <code>[/page]</code> macro 
+in existence, but it translates directly to <literal>&lt;/a&gt;</literal>
+&mdash; which means typing <literal>&lt;/a&gt;</literal> directly
+saves parser a little work. In any case, the use of this macro is discouraged.
+__END__
+
+
+__NAME__ example: Produce the basic hypertext link
+Add the following to an Interchange page:
+<programlisting><![CDATA[
+Please visit our [page index]Welcome</a> page.
+]]></programlisting>
+__END__
+
+
+__NAME__ example: Pass arguments onto the target page
+Add the following link to an Interchange page:
+
+<programlisting><![CDATA[
+Visit the [page href='test' arg='arg1=value1/arg2=value2']test</a> page.
+]]></programlisting>
+The relevant part of your <filename>test.html</filename> page could then
+look like this:
+<programlisting>
+<xi:include parse='text' href='../files/area/test.html'/>
+</programlisting>
+__END__
+
+
+__NAME__ example: Simple item ordering using the page tag
+
+<programlisting><![CDATA[
+Order a [page order TK112]Toaster</a> today.
+]]></programlisting>
+__END__
+
+
+__NAME__ example: Embedding HTML forms in the page tag
+<programlisting><![CDATA[
+[page form="
+  mv_order_item=99-102
+  mv_order_size=L
+  mv_order_quantity=1
+  mv_separate_items=1
+  mv_todo=refresh"
+]Order T-shirt in Large size</a>
+]]></programlisting>
+
+Or another example:
+
+<programlisting><![CDATA[
+[page form="
+  mv_todo=refresh
+  mv_order_item=000101
+  mv_order_fly=description=An on-the-fly item|price=100.01
+"]Order item 000101</a>
+]]></programlisting>
+
+Which is equivalent to the usual HTML form:
+
+<programlisting><![CDATA[
+<form action="[area process]" method="post">
+  <input type='hidden' name='mv_todo' value="refresh">
+  <input type='hidden' name='mv_order_item' value="000101">
+  Qty: <input size='2' name='mv_order_quantity' value="1">
+  <input type='hidden' name='mv_order_fly' value="description=An on-the-fly item|price=100.00">
+  <input type='submit' value="Order button">
+</form>
+]]></programlisting>
+__END__
+
+
+__NAME__ example: Implementing searches using href=/arg= options
+
+<programlisting><![CDATA[
+[page scan
+    se=Impressionists
+    sf=category]
+Search for Impressionist Paintings</a>
+]]></programlisting>
+
+Or the equivalent, using named parameters and more understandable quoting:
+
+<programlisting><![CDATA[
+[page href=scan
+    arg="se=Impressionists
+         sf=category"]
+Search for Impressionist Paintings</a>
+]]></programlisting>
+
+If the <option>arg</option> parameter is set, it will be available
+within the search display page as <code>[value mv_arg]</code>.
+__END__
+
+
+__NAME__ example: Implementing searches using search= option
+The <arg choice='plain'>search</arg> attribute is a shorthand for the 
+<arg choice='plain'>href</arg>/<arg choice='plain'>arg</arg> scheme. 
+When <arg choice='plain'>search</arg> is used, 
+<arg choice='plain'>href</arg> will be set to <literal>scan</literal> and
+<arg choice='plain'>arg</arg> to the value of 
+<arg choice='plain'>search</arg>.
+
+<programlisting><![CDATA[
+[page search="
+    se=Impressionists
+    sf=category"]
+Search for Impressionist Paintings</a>
+]]></programlisting>
+__END__
+



1.2       +1 -1      xmldocs/refs/namecase.filter


rev 1.2, prev_rev 1.1
Index: namecase.filter
===================================================================
RCS file: /var/cvs/xmldocs/refs/namecase.filter,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- namecase.filter	29 May 2005 11:19:33 -0000	1.1
+++ namecase.filter	29 Nov 2006 23:07:45 -0000	1.2
@@ -18,7 +18,7 @@
 
 __NAME__ online: Filter example
 <programlisting>
-[filter name]OCELIC, Davor[/filter]
+[filter name]DOE, John[/filter]
 </programlisting>
 __END__
 



1.3       +2 -2      xmldocs/refs/name.filter


rev 1.3, prev_rev 1.2
Index: name.filter
===================================================================
RCS file: /var/cvs/xmldocs/refs/name.filter,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- name.filter	20 Oct 2005 14:09:50 -0000	1.2
+++ name.filter	29 Nov 2006 23:07:45 -0000	1.3
@@ -15,13 +15,13 @@
 
 __NAME__ online: Filter example
 <programlisting>
-[filter name]Ocelic, Davor[/filter]
+[filter name]Doe, John[/filter]
 </programlisting>
 __END__
 
 __NAME__ online: Filter example for name and namecase correction
 <programlisting>
-[filter op="name namecase"]OCELIC, Davor[/filter]
+[filter op="name namecase"]DOE, John[/filter]
 </programlisting>
 __END__
 



1.2       +14 -6     xmldocs/refs/Accounting


rev 1.2, prev_rev 1.1
Index: Accounting
===================================================================
RCS file: /var/cvs/xmldocs/refs/Accounting,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Accounting	12 Oct 2006 13:51:35 -0000	1.1
+++ Accounting	29 Nov 2006 23:07:45 -0000	1.2
@@ -1,9 +1,17 @@
-__NAME__ purpose
+
+
+*** This whole page is disabled. To re-enable, remove this
+comment and add starting "_" to all _NAME__ blocks     ***
+
+
+
+
+_NAME__ purpose
 specify accounting software and accounting options
 __END__
 
 
-__NAME__ synopsis
+_NAME__ synopsis
 <arg choice='plain'>Class <replaceable>MODULE_NAME</replaceable></arg><sbr />
 assign_username
 	<group choice='plain'>
@@ -13,7 +21,7 @@
 __END__
 
 
-__NAME__ description
+_NAME__ description
 The directive specifies the accounting software and accounting options
 to use.
 <itemizedlist>
@@ -33,11 +41,11 @@
 </itemizedlist>
 __END__
 
-__NAME__ missing
+_NAME__ missing
 description for assign_username
 __END__
 
-__NAME__ example: Defining __FILENAME__
+_NAME__ example: Defining __FILENAME__
 <programlisting>
 Accounting Class Vend::Accounting::SQL_Ledger
 Accounting assign_username 0
@@ -45,7 +53,7 @@
 __END__
 
 
-__NAME__ notes
+_NAME__ notes
 To check out which accounting modules (and therefore accounting software)
 can be used with your version of &IC;, simply invoke
 <command>ls -al <replaceable>ICROOT</replaceable>/lib/Vend/Accounting/</command>.



1.4       +1 -1      xmldocs/refs/ConfigDatabase


rev 1.4, prev_rev 1.3
Index: ConfigDatabase
===================================================================
RCS file: /var/cvs/xmldocs/refs/ConfigDatabase,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigDatabase	6 Nov 2006 18:41:20 -0000	1.3
+++ ConfigDatabase	29 Nov 2006 23:07:45 -0000	1.4
@@ -61,6 +61,6 @@
 __END__
 
 __NAME__ author
-&__mheins__;
+&mheins;
 __END__
 



1.2       +1 -1      xmldocs/refs/DOCROOT


rev 1.2, prev_rev 1.1
Index: DOCROOT
===================================================================
RCS file: /var/cvs/xmldocs/refs/DOCROOT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOCROOT	3 Apr 2006 23:28:56 -0000	1.1
+++ DOCROOT	29 Nov 2006 23:07:45 -0000	1.2
@@ -28,6 +28,6 @@
 
 __NAME__ example: Setting DOCROOT
 <programlisting>
-Variable DOCROOT /var/www/CATALOG/htdocs/
+Variable DOCROOT /var/www/CATALOG_NAME/htdocs/
 </programlisting>
 __END__



1.2       +159 -5    xmldocs/refs/assign.tag


rev 1.2, prev_rev 1.1
Index: assign.tag
===================================================================
RCS file: /var/cvs/xmldocs/refs/assign.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- assign.tag	17 Feb 2005 23:25:39 -0000	1.1
+++ assign.tag	29 Nov 2006 23:07:45 -0000	1.2
@@ -1,6 +1,105 @@
+__NAME__ purpose
+assign direct values for certain steps of the checkout procedure instead of performing calculations
+__END__
+
 __NAME__ synopsis 
 <row>
-
+	<entry>
+	salestax
+	</entry>
+	<entry>
+	<!-- POS -->
+	</entry>
+	<entry>
+	<!-- REQ -->
+	</entry>
+	<entry>
+	None
+	</entry>
+	<entry>
+	Sales &glos-tax; assignment.
+	This total amount of sales tax is taken verbatim and is not rounded.
+	</entry>
+</row> 
+<row>
+	<entry>
+	shipping
+	</entry>
+	<entry>
+	<!-- POS -->
+	</entry>
+	<entry>
+	<!-- REQ -->
+	</entry>
+	<entry>
+	None
+	</entry>
+	<entry>
+	&glos-shipping; assignment.
+	For the assigned shipping amount to be used,
+	<mv>mv_shipmode</mv> must be set to <literal>shipping</literal>.
+	This total amount of shipping costs is rounded to &glos-locale;-specific
+	number of fractional digits.
+	</entry>
+</row> 
+<row>
+	<entry>
+	handling
+	</entry>
+	<entry>
+	<!-- POS -->
+	</entry>
+	<entry>
+	<!-- REQ -->
+	</entry>
+	<entry>
+	None
+	</entry>
+	<entry>
+	Handling assignment.
+	For the assigned handling amount to be used,
+	<mv>mv_handling</mv> must be set to <literal>handling</literal>.
+	This total amount of handling costs is rounded to &glos-locale;-specific
+	number of fractional digits.
+	</entry>
+</row> 
+<row>
+	<entry>
+	subtotal
+	</entry>
+	<entry>
+	<!-- POS -->
+	</entry>
+	<entry>
+	<!-- REQ -->
+	</entry>
+	<entry>
+	None
+	</entry>
+	<entry>
+	Subtotal assignment. It sets the &glos-cart; subtotal that would otherwise
+	be calculated by summing up individual item prices.
+	This subtotal amount is taken verbatim and is not rounded.
+	</entry>
+</row> 
+<row>
+	<entry>
+	credit
+	</entry>
+	<entry>
+	<!-- POS -->
+	</entry>
+	<entry>
+	<!-- REQ -->
+	</entry>
+	<entry>
+	None
+	</entry>
+	<entry>
+	Credit assignment.
+	</entry>
+</row> 
+<row>
 	<entry>
 	clear
 	</entry>
@@ -11,13 +110,68 @@
 	<!-- REQ -->
 	</entry>
 	<entry>
-	<!-- DFL -->
+	No
 	</entry>
 	<entry>
-	<!-- DSC -->
+	Clear all assignments?
 	</entry>
-
 </row> 
 &ROW_INTERPOLATE_0;
 &ROW_REPARSE_1;
-__END__
\ No newline at end of file
+__END__
+
+
+__NAME__ description
+The &tag-__FILENAME__; tag allows you to set direct, fixed values for
+some of the parts of the &glos-checkout; process, instead of deriving the
+values by performing calculations, as it would happen in the normal course
+of action.
+</para><para>
+The value assignment is persistent for the duration of the user &glos-session;,
+unless you clear it explicitly.
+</para><para>
+The <option>clear</option> option will cancel <emphasis>all</emphasis>
+active assignments. To clear an individual assignment, set its value
+<emphasis>to an empty string</emphasis>.
+(Beware, a specification such as <literal>handling=0</literal> actually sets
+handling costs to zero, it does not clear the assignment).
+__END__
+
+
+__NAME__ notes
+Assignments affect only the values returned by the corresponding tags.
+Other behavior (such as currency formatting) is, of course, not affected.
+</para><para>
+Assigning any value other than a number (or an empty string, when clearing
+assignments), will result in an error being reported and the 
+assignment for the "subsystem" in question cleared.
+<emphasis role='bold'>An assignment is allowed to be a
+negative number</emphasis>.
+</para><para>
+You cannot directly assign a "total cost" amount &mdash; it will 
+always be the sum of all assignment keys.
+__END__
+
+
+__NAME__ example: Setting shipping costs to 4.99
+[assign shipping=4.99]
+__END__
+
+
+__NAME__ example: Setting handling costs to 0
+[assign handling=0]
+__END__
+
+
+__NAME__ example: Clearing the assignment for salestax
+[assign salestax=""]
+__END__
+
+__NAME__ example: Clearing all assignments
+[assign clear=1]
+__END__
+
+
+__NAME__ missing
+Verify special values of tags etc. in the code. (I dont see in code that mv_shipmode must be 'shipping' etc..)
+__END__



1.45      +11 -2     xmldocs/docbook/literals.ent


rev 1.45, prev_rev 1.44
Index: literals.ent
===================================================================
RCS file: /var/cvs/xmldocs/docbook/literals.ent,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- literals.ent	16 Nov 2006 10:53:23 -0000	1.44
+++ literals.ent	29 Nov 2006 23:07:45 -0000	1.45
@@ -248,7 +248,7 @@
   <entry>display</entry>	
   <entry></entry><entry></entry>
   <entry>symbol</entry>
-  <entry>Whether to display currency as symbol, text or not at all.</entry>
+  <entry>Display currency as symbol, text or not at all?</entry>
 </row>
 ">
 <!ENTITY ROW_CURRENCYNOFORMAT "
@@ -256,7 +256,7 @@
   <entry>noformat</entry>	
   <entry>Yes</entry><entry>No</entry>
   <entry>No</entry>
-  <entry>Whether to refrain from formatting the output or not.</entry>
+  <entry>Output plain number instead of formatting it according to the currency &glos-locale;?</entry>
 </row>
 ">
 <!ENTITY ROW_CSS_std "
@@ -293,6 +293,15 @@
   <entry>
   File creation &glos-mode;.
   </entry>
+</row>
+">
+<!ENTITY ROW_LOCALE_1 "
+<row>
+  <entry>locale</entry>
+  <entry></entry>
+  <entry></entry>
+  <entry>1</entry>
+  <entry>Honor &glos-locale;s?</entry>
 </row>
 ">
 



1.21      +4 -3      xmldocs/docbook/olinkdb-c.xml


rev 1.21, prev_rev 1.20
Index: olinkdb-c.xml
===================================================================
RCS file: /var/cvs/xmldocs/docbook/olinkdb-c.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- olinkdb-c.xml	3 Sep 2006 10:03:23 -0000	1.20
+++ olinkdb-c.xml	29 Nov 2006 23:07:45 -0000	1.21
@@ -18,6 +18,7 @@
 	<!ENTITY filters SYSTEM "../tmp/filters-c.db"> 
 	<!ENTITY orderchecks SYSTEM "../tmp/orderchecks-c.db"> 
 	<!ENTITY whatsnew SYSTEM "../tmp/WHATSNEW-c.db"> 
+	<!ENTITY databases SYSTEM "../tmp/databases-c.db"> 
 	<!ENTITY optimization SYSTEM "../tmp/optimization-c.db"> 
 ]>
 
@@ -107,9 +108,9 @@
 				</document>
 			</dir>
 
-			<dir name='WHATSNEW'>
-				<document targetdoc="WHATSNEW">
-				&WHATSNEW;
+			<dir name='databases'>
+				<document targetdoc="databases">
+				&databases;
 				</document>
 			</dir>
 



1.21      +2 -0      xmldocs/docbook/olinkdb-nc.xml


rev 1.21, prev_rev 1.20
Index: olinkdb-nc.xml
===================================================================
RCS file: /var/cvs/xmldocs/docbook/olinkdb-nc.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- olinkdb-nc.xml	2 Sep 2006 22:21:47 -0000	1.20
+++ olinkdb-nc.xml	29 Nov 2006 23:07:45 -0000	1.21
@@ -20,6 +20,7 @@
 	<!ENTITY filters SYSTEM "../tmp/filters-nc.db"> 
 	<!ENTITY orderchecks SYSTEM "../tmp/orderchecks-nc.db"> 
 	<!ENTITY whatsnew SYSTEM "../tmp/WHATSNEW-nc.db"> 
+	<!ENTITY databases SYSTEM "../tmp/databases-nc.db"> 
 ]>
 
 <targetset>
@@ -44,6 +45,7 @@
 			<document targetdoc="filters" baseuri="filters.html"> &filters; </document>
 			<document targetdoc="orderchecks" baseuri="orderchecks.html"> &orderchecks; </document>
 			<document targetdoc="WHATSNEW" baseuri="WHATSNEW.html"> &whatsnew; </document>
+			<document targetdoc="databases" baseuri="databases.html"> &databases; </document>
 			<document targetdoc="optimization" baseuri="optimization.html"> &optimization; </document>
 			<document targetdoc="xmldocs" baseuri="xmldocs.html"> &xmldocs; </document>
 			<document targetdoc="install" baseuri="install.html"> &install; </document>



1.114     +3 -2      xmldocs/bin/refs-autogen


rev 1.114, prev_rev 1.113
Index: refs-autogen
===================================================================
RCS file: /var/cvs/xmldocs/bin/refs-autogen,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- refs-autogen	28 Sep 2006 16:34:55 -0000	1.113
+++ refs-autogen	29 Nov 2006 23:07:46 -0000	1.114
@@ -176,7 +176,8 @@
 	"please see the &glos-filter; glossary entry.",
 	var => "For a complete introduction to &IC; variables, " .
 	"please see the &glos-variable; glossary entry.",
-	ordercheck => "",
+	ordercheck => "For a complete introduction to &IC; form field checks, " .
+	"please see the &glos-order-check; glossary entry.",
 );
 
 my @paths = @ARGV; # Versions for which documentation build is requested
@@ -821,7 +822,7 @@
 <reference id="${group}s">
 	<title>Interchange Reference Pages: $longname{$group}s</title>
 
-  <partintro>
+  <partintro id="partintro">
   <para>
 	<phrase condition='online'>[restrict log='none']</phrase>
   $preamble{$group}



1.37      +7 -5      xmldocs/guides/iccattut.xml


rev 1.37, prev_rev 1.36
Index: iccattut.xml
===================================================================
RCS file: /var/cvs/xmldocs/guides/iccattut.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- iccattut.xml	10 Apr 2006 22:14:47 -0000	1.36
+++ iccattut.xml	29 Nov 2006 23:07:46 -0000	1.37
@@ -119,7 +119,7 @@
 		</para> <para>
 		We recommend that you create the files used in this tutorial yourself. You will learn more by creating the directory structure and using your favorite text editor to create files in the proper places on your own system as they are discussed.
 		</para> <para>
-		Writing a complete tutorial without the feedback from the audience is hard. Please jot down your notes and remarks as you digest this tutorial and e-mail <ulink url="mailto:docelic at icdevgroup.org">docelic at icdevgroup.org</ulink> with your thoughts; which sections need clarification or examples, which parts were useful to you, or what was the weather like over there yesterday afternoon :).
+		Writing a complete tutorial without the feedback from the audience is hard. Please jot down your notes and remarks as you digest this tutorial and e-mail <ulink url="mailto:docelic at icdevgroup.org">docelic at icdevgroup.org</ulink> with your comments.
 		</para>
 	</sect2>
 
@@ -127,7 +127,7 @@
 		<title>Interchange and the Standard Demo Catalog Installation</title>
 		<para>
 		For installation instructions, see
-		<olink targetdoc='faq' targetptr='install-howto'/> FAQ entry.
+		<olink targetdoc='install'/>.
 		</para>
 	</sect2>
 		
@@ -229,8 +229,7 @@
 	<sect2 id='InterchangeDaemonandCatalogs'>
 		<title>Interchange Daemon and Catalogs</title>
 		<para>
-		To control the Interchange daemon, use the <filename class='directory'>init.d</filename> script supplied with the RPM and DEB packages. For example, to start Interchange, run <userinput>/etc/init.d/interchange start</userinput> or <userinput>/etc/rc.d/init.d/interchange start</userinput>. To stop or restart Interchange, simply use <userinput>stop</userinput> or <userinput>restart</userinput> as arguments. (For more information, see HOW-TO "Control Interchange Daemon").
-		<!-- TODO link na HOWTO -->
+		To control the Interchange daemon, use the <filename class='directory'>init.d</filename> script supplied with the RPM and DEB packages. For example, to start Interchange, run <userinput>/etc/init.d/interchange start</userinput> or <userinput>/etc/rc.d/init.d/interchange start</userinput>. To stop or restart Interchange, simply use <userinput>stop</userinput> or <userinput>restart</userinput> as arguments. (For more information, see &howto-daemon-control; HOW-TO).
 		</para> <para>
 		To reconfigure a catalog (re-read the appropriate <filename>catalog.cfg</filename>), either restart Interchange altogether or run <userinput>/usr/sbin/interchange -reconfig CATNAME</userinput>.
 		</para>
@@ -253,7 +252,10 @@
 	<sect2 id='LinkProgram'>
 		<title>Link Program</title>
 		<para>
-		You need to locate the existing link program (found in the <filename class='directory'>cgi-bin</filename> directory) and copy it to a new name, making sure the permissions stay intact. Run
+		First of all, you need a &glos-link-program;. Read the &glos-link-program; glossary entry for an introduction and compilation instructions.
+		</para><para>
+		If you already have one (used by some other catalog from the same &IC;
+		server), you only need to find it (found in the <filename class='directory'>cgi-bin</filename> directory) and copy it to a new name, making sure the permissions stay intact. Run
 		<itemizedlist>
 			<listitem><para>
 			<userinput>cd /usr/lib/cgi-bin/ic; cp -p vlink tutorial</userinput>



1.1                  xmldocs/guides/databases.xml


rev 1.1, prev_rev 1.0
Index: databases.xml
===================================================================
<?xml version="1.0" standalone="no"?>

<!-- catalog not working ? -->
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook-Interchange XML V4.2//EN"
	"../docbook/docbookxi.dtd">

<article id='icdb'>

<articleinfo>
	<title>Interchange Guides: Database and Field Descriptions</title>
	<titleabbrev>icdb</titleabbrev>

	<copyright>
		<year>2006</year>
		<holder>Interchange Development Group</holder>
	</copyright>

	<authorgroup>
		<author>
			<firstname>Davor</firstname><surname>Ocelic</surname>
			<email>docelic at icdevgroup.org</email>
		</author>
		<author><firstname>Stefan</firstname><surname>Hornburg</surname>
			<email>racke at icdevgroup.org</email>
		</author>
	</authorgroup>

	<legalnotice>
		<para>
		This documentation is free; you can redistribute it and/or modify
		it under the terms of the &GNU; General Public License as published by
		the Free Software Foundation; either version 2 of the License, or
		(at your option) any later version.
		</para>
		<para>
		It is distributed in the hope that it will be useful,
		but WITHOUT ANY WARRANTY; without even the implied warranty of
		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
		GNU General Public License for more details.
		</para>
	</legalnotice>

	<abstract>
		<para>
		The purpose of this document is to list all pre-defined
		&glos-database;s used by &IC;, describe their purpose and describe
		all their fields.
		</para>
	</abstract>

</articleinfo>


<section id="products">
<title>The "Products" Database</title>
<para>
	The <database>products</database> databases contain items that
	you are offering in your web shop or web catalog.
</para><para>
	The initial database text source file, <filename>products.txt</filename>,
	is usually in an ASCII, &glos-tab-delimited; format.
	Each product listed there should be given a product code, usually
	referred to as &glos-SKU; &mdash; a short code that identifies the
	product on the ordering page and in the &glos-catalog;.
	So the <database>products</database> database must contain
	at least the product SKU (<database class='field'>code</database>),
	<database class='field'>description</database> and 
	<database class='field'>price</database> fileds (or however the
	&conf-PriceField; and &conf-DescriptionField;
	directives have been set). All other information needed in the
	catalog can be placed in additional, arbitrary fields within the same
	table.
</para>
<para>
	The field names must be declared on the first line of the
	<filename>products.txt</filename> file. Accesses from your &IC; pages
	to any other fields within the table will, of course, not execute
	properly.  Field names can
	contain the characters <literal>A-Za-z0-9</literal> and an underscore
	(<literal>_</literal>).
</para>
<para>
	It is important to adjust the &conf-PriceField; and &conf-DescriptionField;
	directives if you change the default field names, or 
	&IC; tags such as &tag-price;, &tag-description;, <tag>item-price</tag> or
	<tag>item-description</tag> will not work.
</para>
<para>
	For each product entry in the text source file, the product code must
	be the first field in the line, and
	must be unique. Product codes can contain the characters
	<literal>A-Za-z0-9</literal>,
	along with hyphens (<literal>-</literal>), underscores
	(<literal>_</literal>), pound signs/hash marks
	(<literal>#</literal>), slashes (<literal>/</literal>) and periods
	(<literal>.</literal>). Note that slashes will
	interfere with &glos-flypage;s; avoid them where ever possible.
</para>
<para>
	The columns in the text source files should be separated by one of the
	approved delimiting
	schemes (TAB, PIPE, or CSV). They are case-sensitive according to the
	underlying database &mdash; be consistent with field names to avoid
	trouble.
	If only the case of the <database>description</database> or
	<database class='field'>price</database> fields have been changed,
	&conf-PriceField; and &conf-DescriptionField; still have to be 
	adjusted appropriately.
</para>
<note>
	<para>
	CSV format is not recommended for the <database>products</database>
	database. It is much slower than TAB- or PIPE-delimited files, and
	dramatically reduces search engine functionality. No field-specific
	searches are possible. Using CSV for any small database that will not
	be searched is fine.
	</para>
</note>
<para>
	More than one database may be used as a products database. If the
	&conf-ProductFiles; directive is set to a space-separated list of
	valid &IC; database identifiers, all listed databases will be
	searched (in the order specified) for any items that are ordered, or
	for product information (such as in
	<code>[price <replaceable>code</replaceable></code> or
	<code>[field <replaceable>code</replaceable>]</code>).
</para>
<para>
	If you are manually modifying databases on-the-fly, it is recommended that
	you lock the files while they are modified. Interchange-supplied import
	routines do this properly on their own.
</para>
</section>





<section id='userdb'>
	<title>User Database</title>
<para>
</para>
</section>
</article>



1.5       +1 -1      xmldocs/docbook/symbol-templates/systemtag


rev 1.5, prev_rev 1.4
Index: systemtag
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/systemtag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- systemtag	28 Mar 2006 13:19:41 -0000	1.4
+++ systemtag	29 Nov 2006 23:07:46 -0000	1.5
@@ -25,7 +25,7 @@
 
 <thead>
 <row>
-<entry>Argument</entry>
+<entry>Attribute</entry>
 <entry>Pos.</entry>
 <entry>Req.</entry>
 <entry>Default</entry>



1.5       +1 -1      xmldocs/docbook/symbol-templates/uitag


rev 1.5, prev_rev 1.4
Index: uitag
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/uitag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- uitag	28 Mar 2006 13:19:41 -0000	1.4
+++ uitag	29 Nov 2006 23:07:46 -0000	1.5
@@ -25,7 +25,7 @@
 
 <thead>
 <row>
-<entry>Argument</entry>
+<entry>Attribute</entry>
 <entry>Pos.</entry>
 <entry>Req.</entry>
 <entry>Default</entry>



1.5       +1 -1      xmldocs/docbook/symbol-templates/usertag


rev 1.5, prev_rev 1.4
Index: usertag
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/usertag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- usertag	28 Mar 2006 13:19:41 -0000	1.4
+++ usertag	29 Nov 2006 23:07:46 -0000	1.5
@@ -25,7 +25,7 @@
 
 <thead>
 <row>
-<entry>Argument</entry>
+<entry>Attribute</entry>
 <entry>Pos.</entry>
 <entry>Req.</entry>
 <entry>Default</entry>



1.8       +198 -135  xmldocs/glossary/database


rev 1.8, prev_rev 1.7
Index: database
===================================================================
RCS file: /var/cvs/xmldocs/glossary/database,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- database	6 Nov 2006 18:41:20 -0000	1.7
+++ database	29 Nov 2006 23:07:46 -0000	1.8
@@ -29,15 +29,13 @@
 </para><para>
 &IC; works with &GDBM;, DB_File, SQL, LDAP and in-memory types of databases. 
 Regardless of type or other characteristics, each database must be registered
-with &IC; before it's
-ready to be used, and this is achieved using the &conf-Database; configuration
-directive. Pay special attention to the fact that &conf-Database; is both
-catalog and global directive, indicating that you can share databases 
-between catalogs.
+on a &glos-catalog; level before it's ready to be used, and this is achieved
+using the &conf-Database; configuration directive. It's useful to remember
+at this point that multiple catalogs can share the same database.
 </para><para>
-Three parameters needed to complete the &conf-Database; specification are
+Three parameters need to be present in a basic &conf-Database; definition:
 an arbitrary database name, text source file with initial content, and the
-type of database.
+type of the database.
 </para>
 
 <section>
@@ -66,10 +64,14 @@
 better use the <command>te</command> utility that comes as part of the 
 &IC; distribution to edit such files more conveniently.
 </para>
-Format examples:
+
+Interchange can manage an unlimited number of arbitrary database tables and
+database table types. Several flexible delimiter schemes are available 
+"out of the box":
+
 <itemizedlist>
 	<listitem>
-	<para>TAB-delimited file:
+	<para>TAB-delimited file (Type 1, the default):
 Fields are separated by TAB characters. No whitespace is allowable
 at the beginning of the line.
 </para>
@@ -78,25 +80,60 @@
 SH543	Men's fine cotton shirt	14.95	shirts.jpg
 </screen>
 <para>
+(&TAB_DELIMITED_NOTICE;)
+</para><para>
 Using the default TAB delimiter is recommended if you plan on
 searching the ASCII source file of the database.
 	</para></listitem>
 
 	<listitem>
-	<para>PIPE-delimited file:
-Fields are separated by the pipe ("<literal>|</literal>") characters which 
-resemble vertical lines. No whitespace is allowable at the beginning of the
-line.
-</para>
+	<para>LINE (Type 2):
+Fields are specified each on its own line, separated by the newline
+(<literal>\n</literal>) character. One blank line separates a record
+from another record. <!-- CONTINUE NOTES NOTE -->
+
 <screen>
-code|description|price|image
-SH543|Men's fine cotton shirt|14.95|shirts.jpg
+code
+description
+price
+image
+
+SH543
+Men's fine cotton shirt
+14.95
+shirts.jpg
 </screen>
-<para>
-PIPE-delimited files perform fairly well with ASCII text searching routines.
 	</para></listitem>
+
 	<listitem>
-	<para>CSV-delimited file:
+	<para>%% (Type 3):
+Fields are separated by the literal combination of
+"<literal>\n%%\n</literal>", while the records are separated
+by "<literal>\n%%%\n</literal>". Users fond of the Unix "fortune"
+program may find this format familiar.
+
+<screen>
+code
+%%
+description
+%%
+price
+%%
+image
+%%%
+SH543
+%%
+Men's fine cotton shirt
+%%
+14.95
+%%
+shirts.jpg
+</screen>
+	</para></listitem>
+
+
+	<listitem>
+	<para>CSV-delimited file (Type 4):
 Fields are enclosed in quotes and separated by commas. Again, no whitespace
 should be at the beginning of the line.
 </para>
@@ -107,6 +144,42 @@
 <para>
 CSV-delimiter schemes might cause problems with ASCII text searching routines.
 	</para></listitem>
+
+
+	<listitem>
+	<para>PIPE-delimited file (Type 5):
+Fields are separated by the pipe ("<literal>|</literal>") characters which 
+resemble vertical lines. No whitespace is allowable at the beginning of the
+line.
+</para>
+<screen>
+code|description|price|image
+SH543|Men's fine cotton shirt|14.95|shirts.jpg
+</screen>
+<para>
+PIPE-delimited files perform fairly well with ASCII text searching routines.
+	</para></listitem>
+
+
+	<listitem>
+	<para>TAB-delimited file (Type 6):
+	</para></listitem>
+
+
+	<listitem>
+	<para>&lt;reserved&gt; (Type 7):
+	</para></listitem>
+
+
+	<listitem>
+	<para>&glos-SQL; (Type 8):
+	</para></listitem>
+
+
+	<listitem>
+	<para>LDAP (Type 9):
+	</para></listitem>
+
 	</itemizedlist>
 
 <note>
@@ -118,6 +191,65 @@
 </para>
 </note>
 
+<para>
+If a database is specified to be one of the first six types, then the database
+will automatically be converted to a more efficient internal structure.
+Those include DB_FILE, GDBM, or MEMORY. The order of preference and the selection is:
+
+<!--
+LI1: GDBM
+
+.This uses the Perl C<GDBM_File> module to build a GDBM database. The following command will indicate if GDBM is in Perl:
+
+!block example; listitem=2
+    perl -e 'require GDBM_File and print "I have GDBM.\n"'
+!endblock
+
+.Installing GDBM_File requires rebuilding Perl after obtaining the GNU GDBM package, and is beyond the scope of this document. LINUX will typically have this by default; most other operating systems will need to specifically build in this capability.
+
+LI1: DB_File (Berkeley DB)
+
+.This uses the C<DB_File> module to build a Berkeley DB (hash) database. The following command will indicate if DB_File is in Perl:
+
+!block example; listitem=2
+    perl -e 'require DB_File and print "I have Berkeley DB.\n"'
+!endblock
+
+.Installing C<DB_File> requires rebuilding Perl after obtaining the Berkeley DB package, and is beyond the scope of this document. BSDI, FreeBSD, and LINUX will typically have it by default; most other operating systems will need to specifically build this in.
+
+.If using C<DB_File>, even though C<GDBM_File> is in Perl, set the environment variable MINIVEND_DBFILE to a true (non-zero, non-blank) value:
+
+!block example; listitem=2
+    # csh or tcsh
+    setenv MINIVEND_DBFILE 1
+
+    # sh, bash, or ksh
+    MINIVEND_DBFILE=1 ; export MINIVEND_DBFILE
+!endblock
+
+.Then, re-start the server.
+
+.Or, to set a particular table to use Berkeley DB, the DB_FILE class in C<catalog.cfg> can be specified:
+
+!block example; listitem=2
+    Database arbitrary  DB_FILE  1
+!endblock
+
+LI1: In-memory
+
+.This uses Perl hashes to store the data directly in memory. Every time the Interchange server is restarted, it will re-import all in-memory databases for every catalog.
+
+.If this is used, despite the presence of C<GDBM_File> or C<DB_File>, set the environment variable MINIVEND_NODBM as above or specify the memory type in the Database directive:
+
+!block example; listitem=2
+    Database arbitrary  MEMORY  1
+!endblock
+
+Note: The use of memory databases is not recommended.
+-->
+
+</para>
+
 </section>
 
 <section>
@@ -126,7 +258,7 @@
 As hinted above, you do not need to use an external &glos-SQL; database.
 If you only
 have a small data set, you could use Interchange's internal databases.
-This is a tremendous gain for small and quick setups, or &IC; evaluation.
+This is a tremendous gain for small and quick setups, or ad-hoc &IC; evaluation.
 However, some functions (order management, for example) will be slower
 and not as robust without an SQL database. SQL is strongly recommended for
 at least the <database>state</database>,
@@ -147,30 +279,34 @@
 </note>
 
 <para>
-If you plan on using Interchange Admin UI, you <emphasis>should</emphasis>
+Generally, you <emphasis>should</emphasis>
 make an additional 
-effort of configuring and using SQL databases to achieve its full potential.
+effort of configuring and using SQL databases to achieve &IC;'s full potential.
 Using SQL also makes your data sets easily available for integration with
 other applications.
 </para><para>
-In any case, Admin UI provides easy import routines for text files that should
-replace traditional FTP text-file uploads.
+In any case, database import and conversion routines are already
+available in &IC; and you can use them at any point.
 </para><para>
 Speaking of the source files' behavior, if a file named
 <filename><replaceable>table</replaceable>.sql</filename> is present
 in the same directory as
 <filename><replaceable>table</replaceable>.txt</filename>, then database
-table will not be imported from the ASCII text source file.
+table will never be imported from the ASCII text source file.
 If there is no <filename><replaceable>table</replaceable>.sql</filename>,
-the DBI/SQL import will happen once at
-&IC; startup or catalog reconfiguration time;
+the DBI/SQL import will happen once, at
+&IC; startup or catalog reconfiguration time (and the 
+<filename><replaceable>table</replaceable>.sql</filename> file will be
+created);
 Interchange will connect to the SQL database using the specified DSN
 (DSN is a standard DBI parameter meaning "Database Source Name").
-The table, if it already exists, will be dropped using a line similar to
+The table will be dropped (if it already exists in the database) using a
+line similar to
 <literal>DROP TABLE <replaceable>table</replaceable></literal>.
 This will occur without warning, but &conf-NoImport; can be used to 
 prevent it or otherwise change the default behavior.
-The table will then be created again.
+The table will then be created again and populated with text source
+file data.
 </para><para>
 If there are any
 <literal>COLUMN_DEF</literal> specifications present in &gcf;, &ccf; or
@@ -182,12 +318,14 @@
 and all other fields will be created as <literal>char(128)</literal>. This is 
 very unfortunate, but the best &IC; can do without your help.
 Table creation statements will be written to the <filename>error.log</filename>
-along with, of course, any errors. From my experience, the most common
-mistake at this step is picking column names which happen to be reserved
-keywords in &MYSQL;.
+along with, of course, any errors. From our experience, the most common
+mistake at this point is choosing column names that sound perfectly reasonable, 
+but also happen to be reserved keywords in &MYSQL;. (The error messages
+appear to be misleading here, so you better take a look at the
+<ulink url="http://dev.mysql.com/doc/refman/5.0/en/reserved-words.html">list
+of reserved MySQL keywords</ulink> before losing patience with the problem).
 </para><para>
-Once the &glos-database; (database table actually, remember we said 
-"database" and "table" simply mean a "table" in &IC; parlance)
+Once the &glos-database; (database table actually, remember?)
 is created, the text source file will be imported into it.
 For this step to succeed, data typing must be user-configured. In other words,
 if say, word "<literal>none</literal>" is placed in a field while the field
@@ -204,29 +342,32 @@
 <section>
 	<title>File-based Databases</title>
 <para>
-By file-based databases we primarily assume Berkeley (DB_File) and GNU DBM.
+By file-based databases we primarily assume &GDBM; and DB_File. We also
+call those database types "internal", since in the absence of say, an
+SQL definition,
+all inferior formats (such as text source files) are automatically converted to
+some kind of a file-based database.
+</para><para>
 Those database types usually work in a way that, on every client access, the
 appropriate database text source file is checked for being newer than the
 actual DB file itself.
 When it happens that it is, the database table is re-imported
 from the text source file <emphasis>on the fly</emphasis>, and the routine
-proceeds as usual.
+then proceeds as usual.
 </para>
 <note>
 <title>Database updates</title>
 <para>
-It is important to note that, when using &IC; internal database methods 
-(which are some variant of DB_File or DBM, depending on what's available
-on your system), changes to text files cause databases to be resynchronized
-with plaintext file contents.
-</para><para>
-This behavior can be controlled via the &conf-NoImport; config directive,
-but by default, changes in text files will trigger a 
-rewrite of DBM or DB_File databases. This might lead to unexpected problems
-if you edit databases from &IC; and don't sync <emphasis>files</emphasis>
-to databases first, or have a larger data sets
-(say, over a few thousand records) which take noticeable time to get
-re-imported.
+It is important to note that, when using &IC; internal database methods, 
+all changes in the text source files cause the databases to be re-created.
+This can have unwanted effects if the database was modified from within
+&IC; and the contents have not been written back to the text source files.
+Another common problem are larger data sets that take noticeable time to get
+imported to (or exported from) the internal database.
+</para><para>
+The exact behavior can be controlled via the &conf-NoImport; config directive,
+but by default, changes in text files will trigger a complete
+rewrite of DBM or DB_File databases.
 </para>
 </note>
 <para>
@@ -260,7 +401,7 @@
 </para>
 <para>
 Memory databases are used by default only if no database type is
-explicitly specified, and there is no DB_File or gdbm found on
+explicitly specified, and there is no DB_File or &GDBM; found on
 the system. Otherwise they can be used for small but high-traffic
 tables. Keep in mind, however, that since their contents are not saved back
 to the text files, you'll want to either take care of the data export yourself,
@@ -269,7 +410,7 @@
 <para>
 if you want to force memory databases despite of GDBM_File or DB_File
 being present, set the <envar>MINIVEND_NODBM</envar> environment variable
-to a true value (look above for hints).
+to a true value (look previous chapter for hints on setting it).
 It is also possible to use memory type for just specific databases.
 </para>
 <para>
@@ -343,15 +484,16 @@
 	<database>products</database> database. In the supplied demo catalog
 	(and in the most of real-world solutions as well), the primary
 	database is directly called <literal>products</literal> 
-	and the ASCII source is kept in the file <filename>products.txt</filename>
+	and the ASCII source is kept in the <filename>products/products.txt</filename>
+	file.
 	This is also the default file for searching contents with
-	the search engine, such as Glimpse or HTDig.
+	the search engine, such as Glimpse, HTDig or Swish.
 </para>
 
 <note>
 <para>
-	Interchange also has two but optional databases that
-	are given <emphasis role='bold'>in special, fixed formats</emphasis>:
+	Interchange also has two optional databases that
+	are specified <emphasis role='bold'>in special, fixed formats</emphasis>:
 	</para>
 	<itemizedlist>
 <listitem>
@@ -374,89 +516,10 @@
 </listitem>
 </itemizedlist>
 <para>
-	The two above tables are never stored in SQL or DBM.
+	The two above tables cannot be stored in any user-specified format.
 </para>
 </note>
 
-	<section>
-	<title>"Products" Database</title>
-	<para>
-		The <database>products</database> databases contain items that
-		you're selling.
-		Each product listed should be given a product code, usually
-		referred to as &glos-SKU; &mdash; a short code that identifies the
-		product on the
-		ordering page and in the catalog. The <filename>products.txt</filename>
-		file is an ASCII-delimited text source file. It should contain
-		product SKUs, along with an arbitrary
-		number of fields which must contain at least the fields
-		<database class='field'>description</database> and 
-		<database class='field'>price</database> (or however the
-		&conf-PriceField; and &conf-DescriptionField;
-		directives have been set). Any additional information needed in the
-		catalog can be placed in any arbitrary field.
-	</para>
-	<para>
-		The field names must be defined on the first line of the
-		<filename>products.txt</filename> file. These field names must match
-		exactly the field
-		names of the <tag>item-field</tag> tags in the catalog pages, or the
-		&IC; server will not access them properly. Field names can
-		contain the characters <literal>A-Za-z0-9</literal> and underscore
-		(<literal>_</literal>).
-	</para>
-	<para>
-		It is important to adjust the &conf-PriceField; and &conf-DescriptionField;
-		directives appropriately if you change the default field names, or 
-		&IC; tags such as &tag-price;, &tag-description;, <tag>item-price</tag> or
-		<tag>item-description</tag> won't work.
-	</para>
-	<para>
-		For each product entry in the text source file, the product code must
-		be the first field in the line, and
-		must be unique. Product codes can contain the characters
-		<literal>A-Za-z0-9</literal>,
-		along with hyphens (<literal>-</literal>), underscores
-		(<literal>_</literal>), pound signs/hash marks
-		(<literal>#</literal>), slashes (<literal>/</literal>) and periods
-		(<literal>.</literal>). Note that slashes will
-		interfere with on-the-fly page references; avoid them if at all possible.
-	</para>
-	<para>
-		The columns in text source files should be separated by one of the
-		approved delimiting
-		schemes (TAB, PIPE, or CSV), and are case-sensitive according to the
-		underlying database &mdash; be consistent in field names to avoid
-		trouble. If
-		the case of the "description" or "price" fields have been modified,
-		the &conf-PriceField; and &conf-DescriptionField; directives must be
-		adjusted appropriately.
-	</para>
-	<note>
-		<para>
-		CSV format is not recommended for the <database>products</database>
-		database. It is much slower than TAB- or PIPE-delimited files, and
-		dramatically reduces search engine functionality. No field-specific
-		searches are possible. Using CSV for any small database that will not
-		be searched is fine.
-		</para>
-	</note>
-	<para>
-		More than one database may be used as a products database. If the
-		&conf-ProductFiles; directive is set to a space-separated list of
-		valid &IC; database identifiers, all listed databases will be
-		searched (in the order specified) for any items that are ordered, or
-		for product information (such as with <code>price code</code> or
-		<code>field code</code>
-		tags).
-	</para>
-	<para>
-		If you are modifying the database on-the-fly, it is recommended that
-		the file
-		be locked while it is being modified. Interchange's supplied import
-		routines do this.
-	</para>
-	</section>
 </section>
 
 <para>
@@ -466,7 +529,7 @@
 <!-- 
 
 For &GDBM; &glos-database;s, the import would ordinarily happen when the
-gdbm file is deleted, a change in appropriate text source file is detected,
+gdbm/db file is deleted, a change in appropriate text source file is detected,
 &IC; is (re)started, or the catalog is reconfigured. &glos-SQL; databases
 are imported only once, at first configuration.
 



1.8       +2 -2      xmldocs/glossary/pragma


rev 1.8, prev_rev 1.7
Index: pragma
===================================================================
RCS file: /var/cvs/xmldocs/glossary/pragma,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pragma	6 Nov 2006 22:34:44 -0000	1.7
+++ pragma	29 Nov 2006 23:07:46 -0000	1.8
@@ -1,7 +1,7 @@
 Pragmas are used to control various aspects of page and data parsing and display. They are processed before an &IC; page goes to the normal processing
 routine.
 </para><para>
-Pragma values can be defined at any level; catalog-wide, page-wide or
+Pragma values can be defined at any level; &glos-catalog;-wide, page-wide or
 &glos-ITL;-block wide.
 </para>
 
@@ -18,7 +18,7 @@
 <para>
 To define a pragma catalog-wide, use the <option>Pragma</option> directive:
 <programlisting>
-Pragma <replaceable>NAME</replaceable> <group choice='req'><arg choice='plain'>0</arg><arg choice='plain'>1</arg><arg choice='plain'>=<replaceable>pragma-specific value</replaceable></arg></group>
+Pragma <replaceable>NAME</replaceable> <group choice='opt'><arg choice='plain'>0</arg><arg choice='plain'>1</arg><arg choice='plain'>=<replaceable>pragma-specific value</replaceable></arg></group>
 </programlisting>
 </para><para>
 To define a pragma for a particular page, use the &tag-pragma;








More information about the docs mailing list