working on doc

[mir.git] / doc / developers-guide / introduction.xml

diff --git a/doc/developers-guide/introduction.xml b/doc/developers-guide/introduction.xml
index d3d2a61..9fcab14 100755 (executable)
--- a/doc/developers-guide/introduction.xml
+++ b/doc/developers-guide/introduction.xml
@@ -85,8 +85,7 @@ feeds  for the  global wire.
 <para>In the  admin web interface,  producers appear, for  example, on
 the admin->"Generate manually"->"advanced page": (they are called Tasks)</para>
 <para>
-Further information on producers may be found at XXX and in the javadoc 
-(classes Producer, NodedProducer, roducerNode...).
+More information on producers is available in  <xref linkend="producer_framework" />. 
 </para>
        </glossdef>
 </glossentry>
@@ -169,7 +168,10 @@ Filters may be organized into groups for easier management.
   <glossterm>generator</glossterm>
     <glossdef>
          <para>
-A generator is an abstraction for a template engine. 
+A generator is an abstraction for a template (html template). 
+Calling the generator's <function>generate(outputFileWriter,keyValuePairs)</function> method
+will run the template engine on the template file
+and write an output html file.
 Different template engines are
 supported right now: 
 <ulink href="http://freemarker.sourceforge.net">freemarker</ulink> 
@@ -205,14 +207,15 @@ and these packages will probably be reorganized in future releases.
        </glossdef>
 </glossentry>
 
-<glossentry id="bundle">
+<glossentry id="bundles">
   <glossterm>bundles</glossterm>
     <glossdef>
          <para>
-Bundles are key/value pairs in a text file, used for configuration
-and internationalization.
-Bundles  may be used to create a template for multiple languages. The
-language dependent aspects are stored in a properties file.
+A Bundle represents a set  key/value pairs stored in a ".properties"
+text  file.  Bundles  are used  for  internationalization (language
+translations)  and for  <glossterm linkend="configuration">configuration</glossterm>  files (config.properties and
+source/default.properties). 
+Bundles  may be used to create a template for multiple languages.
 </para>
        </glossdef>
 </glossentry>
@@ -264,8 +267,6 @@ The <code>do</code> argument determines the method's name.
 So 
 <uri>http://somehost.org/mir/servlet/Mir?module=Comment&amp;do=list</uri>
 will call <function>ServletModuleComment.list()</function>.
-
-
       </para>
        </glossdef>
 </glossentry>
@@ -277,7 +278,22 @@ will call <function>ServletModuleComment.list()</function>.
          <para>
 The media framework is quite old and will be thoroughly changed 
 in a future release.
-</para>
+      </para>
+       </glossdef>
+</glossentry>
+
+<glossentry id="configuration">
+  <glossterm>configuration</glossterm>
+    <glossdef>
+         <para>
+Mir is configured through the 
+<filename>etc/config.properties</filename> file, which 
+overrides default values in 
+the 
+<filename>source/default.properties</filename> file.
+The key/value pairs are handled by 
+<glossterm linkend="bundles">bundles</glossterm>.
+      </para>
        </glossdef>
 </glossentry>