X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fhelp%2FC%2Fsec_install.xml;h=44e46b7fcfb93f0ffa9dd70378df533606464bac;hb=e43d7e9c2acfa6d1c74838ba15589833cfc275fc;hp=70bd903ccaa85edade8f6ac561f02a5e6977f15d;hpb=833a6e8739c3abb6addb2426631f19c795e00bec;p=helm.git

diff --git a/helm/software/matita/help/C/sec_install.xml b/helm/software/matita/help/C/sec_install.xml
index 70bd903cc..44e46b7fc 100644
--- a/helm/software/matita/help/C/sec_install.xml
+++ b/helm/software/matita/help/C/sec_install.xml
@@ -54,8 +54,8 @@
 	    you can have APT install all the required tools and libraries by
 	    adding the following repository to your
 	    <filename>/etc/apt/sources.list</filename>: <programlisting>
-	      deb&nbsp;<ulink type="http"
-		url="http://people.debian.org/~zack">http://people.debian.org/~zack</ulink>&nbsp;unstable&nbsp;helm
+	      deb <ulink type="http"
+		url="http://people.debian.org/~zack">http://people.debian.org/~zack</ulink> unstable helm
 	  </programlisting> and installing the
 	  <application>helm-matita-deps</application> package.</para>
 
@@ -202,7 +202,7 @@
 	  <varlistentry>
 	    <term>
 	      <application> <ulink type="http"
-		  url="http://www.cduce.org/download.html#side">ulex</ulink>
+		  url="http://www.cduce.org/download.html">ulex</ulink>
 	      </application>
 	    </term>
 	    <listitem>
@@ -213,7 +213,7 @@
 	  <varlistentry>
 	    <term>
 	      <application> <ulink type="http"
-		  url="http://cristal.inria.fr/~xleroy/software.html#camlzip">CamlZip</ulink>
+		  url="http://cristal.inria.fr/~xleroy/software.html">CamlZip</ulink>
 	      </application>
 	    </term>
 	    <listitem>
@@ -274,57 +274,60 @@
 	
       <para> Quite a few (optional) arguments may be passed to the
 	<application>configure</application> command line to change build time
-	parameters. They are listed in the table below, together with their
-	default values.
+	parameters. They are listed below, together with their
+	default values: </para>
 
-	<table frame="all">
+	<variablelist>
 	  <title> <application>configure</application> command line
 	    arguments</title>
-	  <tgroup cols="3" align="left" colsep="1" rowsep="1">
-	    <thead>
-	      <row>
-		<entry align="center">Argument</entry>
-		<entry align="center">Default</entry>
-		<entry align="center">Description</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry>
-		  <userinput>--with-runtime-dir=<replaceable>dir</replaceable></userinput>
-		</entry>
-		<entry> <filename>/usr/local/matita/</filename> </entry>
-		<entry> <para> Runtime base directory where all &appname; stuff
-		    (executables, configuration files, standard
-		    library,&nbsp;...) will be installed </para> </entry>
-	      </row>
-	      <row>
-		<entry>
-		  <userinput>--with-dbhost=<replaceable>host</replaceable></userinput>
-		</entry>
-		<entry> localhost </entry>
-		<entry> <para>Default SQL server hostname. Will be used while
-		    building the standard library during the installation and to
-		    create the default &appname; configuration. May be changed
-		    later in configuration file.</para></entry>
-	      </row>
-	      <row>
-		<entry> <userinput>--enable-debug</userinput></entry>
-		<entry> disabled </entry>
-		<entry> <para> Enable debugging code. Not for the casual user.
-		  </para> </entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</table>
 
-      </para>
+	  <varlistentry>
+	    <term>
+	      <userinput>--with-runtime-dir=<replaceable>dir</replaceable></userinput>
+	    </term>
+	    <listitem>
+	      <para>
+		(<emphasis>Default:</emphasis>
+		<filename>/usr/local/matita</filename>) Runtime base directory
+		where all &appname; stuff (executables, configuration files,
+		standard library, ...) will be installed
+	      </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>
+	      <userinput>--with-dbhost=<replaceable>host</replaceable></userinput>
+	    </term>
+	    <listitem>
+	      <para>
+		(<emphasis>Default:</emphasis> localhost) Default SQL server
+		hostname. Will be used while building the standard library
+		during the installation and to create the default &appname;
+		configuration. May be changed later in configuration file.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term>
+	      <userinput>--enable-debug</userinput>
+	    </term>
+	    <listitem>
+	      <para>
+		(<emphasis>Default:</emphasis> disabled) Enable debugging code.
+		Not for the casual user.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
 
       <para> Then you will manage the build and install process using
 	<application><ulink type="http"
 	    url="http://www.gnu.org/software/make/">make</ulink></application>
 	as usual. Below are reported the targets you have to invoke in sequence
-	to build and install.
+	to build and install:
+      </para>
 
 	<variablelist>
 	  <title><application>make</application> targets</title>
@@ -333,38 +336,42 @@
 	    <term><userinput>world</userinput></term>
 	    <listitem>
 	      <para>builds components needed by &appname; and &appname; itself
-		(in bytecode only or in both bytecode and native code depending
+		(in bytecode or native code depending
 		on the availability of the OCaml native code compiler) </para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><userinput>library</userinput></term>
+	    <term><userinput>install</userinput></term>
 	    <listitem>
-	      <para>uses the (just built) <application>matitac</application>
-		compiler to build the &appname; standard library. </para>
+	      <para>installs &appname; related tools, standard library and the
+		needed runtime stuff in the proper places on the filesystem.
+	      </para>
+	      <para>As a part of the installation process the &appname;
+		standard library will be compiled, thus testing that the just
+		built <application>matitac</application> compiler works
+		properly.</para>
 	      <para>For this step you will need a working SQL database (for
 		indexing the standard library while you are compiling it). See
 		<ulink type="http" url="#database_setup">Database setup</ulink>
-		for instructions on how to set it up.</para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><userinput>install</userinput></term>
-	    <listitem>
-	      <para>installs &appname; related tools, standard library and the
-		needed runtime stuff in the proper places on the filesystem
+		for instructions on how to set it up.
 	      </para>
 	    </listitem>
 	  </varlistentry>
 
 	</variablelist>
-
-      </para>
       
     </sect2>
 
   </sect1>
+
+  <sect1 id="matita.conf.xml">
+    <title>Configuring Matita</title>
+    <para>
+    The file <emphasis>matita.conf.xml</emphasis>...
+    &TODO;
+    </para>
+  </sect1>
+
 </chapter>