X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fhelp%2FC%2Fmatita.xml;h=96e5aa44a2047568a626bef9d23a54044bc7b409;hb=6f769078a23e6c63706a86a35fdc4e8ba08a5414;hp=14411ad71d48d2bd1ebe3aa27ebab6548cf11ed3;hpb=c9806f330ca060719dc21440b1b6d0dfe596f01f;p=helm.git

diff --git a/matita/help/C/matita.xml b/matita/help/C/matita.xml
index 14411ad71..96e5aa44a 100644
--- a/matita/help/C/matita.xml
+++ b/matita/help/C/matita.xml
@@ -2,15 +2,19 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
-  <!ENTITY license SYSTEM "legal.xml">
+  <!ENTITY legal SYSTEM "legal.xml">
+  <!ENTITY license SYSTEM "sec_license.xml">
   <!ENTITY install SYSTEM "sec_install.xml">
   <!ENTITY gettingstarted SYSTEM "sec_gettingstarted.xml">
   <!ENTITY intro SYSTEM "sec_intro.xml">
   <!ENTITY terms SYSTEM "sec_terms.xml">
   <!ENTITY tactics SYSTEM "sec_tactics.xml">
+  <!ENTITY tacticals SYSTEM "sec_tacticals.xml">
+  <!ENTITY othercommands SYSTEM "sec_commands.xml">
+  <!ENTITY usernotation SYSTEM "sec_usernotation.xml">
 
-  <!ENTITY manrevision "0">
-  <!ENTITY date "February 2006">
+  <!ENTITY manrevision "1&alpha;">
+  <!ENTITY date "10/06/2006">
   <!ENTITY app "<application>Matita</application>">
   <!ENTITY appname "Matita">
   <!ENTITY appversion SYSTEM "version.txt">
@@ -20,41 +24,35 @@
       url='http://www.mysql.com'>MySQL</ulink> </application>">
 
   <!-- Entities for BNF -->
-  <!ENTITY id "<emphasis><link linkend='id'>id</link></emphasis>">
-  <!ENTITY uri "<emphasis><link linkend='uri'>uri</link></emphasis>">
-  <!ENTITY nat "<emphasis><link linkend='nat'>nat</link></emphasis>">
-  <!ENTITY term "<emphasis><link linkend='term'>term</link></emphasis>">
-  <!ENTITY term_pattern "<emphasis><link linkend='term_pattern'>term_pattern</link></emphasis>">
+  <!ENTITY id "<emphasis><link linkend='grammar.id'>id</link></emphasis>">
+  <!ENTITY uri "<emphasis><link linkend='grammar.uri'>uri</link></emphasis>">
+  <!ENTITY char "<emphasis><link linkend='grammar.char'>char</link></emphasis>">
+  <!ENTITY uri-step "<emphasis><link linkend='grammar.uri-step'>uri-step</link></emphasis>">
+  <!ENTITY nat "<emphasis><link linkend='grammar.nat'>nat</link></emphasis>">
+  <!ENTITY term "<emphasis><link linkend='grammar.term'>term</link></emphasis>">
+  <!ENTITY rec_def "<emphasis><link linkend='grammar.rec_def'>rec_def</link></emphasis>">
+  <!ENTITY match_pattern "<emphasis><link linkend='grammar.match_pattern'>match_pattern</link></emphasis>">
+  <!ENTITY match_branch "<emphasis><link linkend='grammar.match_branch'>match_branch</link></emphasis>">
+  <!ENTITY args "<emphasis><link linkend='grammar.args'>args</link></emphasis>">
+  <!ENTITY args2 "<emphasis><link linkend='grammar.args2'>args2</link></emphasis>">
+  <!ENTITY sterm "<emphasis><link linkend='grammar.sterm'>sterm</link></emphasis>">
+  <!ENTITY intros-spec "<emphasis><link linkend='grammar.intros-spec'>intros-spec</link></emphasis>">
+  <!ENTITY pattern "<emphasis><link linkend='grammar.pattern'>pattern</link></emphasis>">
+  <!ENTITY reduction-kind "<emphasis><link linkend='grammar.reduction-kind'>reduction-kind</link></emphasis>">
 ]>
 
 <?yelp:chunk-depth 3?>
 
 <book id="matita_manual" lang="en">
-<!-- please do not change the id; for translations, change lang to -->
-<!-- appropriate code -->
-<title>&app; V&appversion; Manual (rev. &manrevision;)</title>
-<bookinfo>
-
- <copyright>
-  <year>2006</year>
-  <holder>The HELM team.</holder>
- </copyright>
-<!-- translators: uncomment this:
-
-  <copyright>
-   <year>2002</year>
-   <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
-  </copyright>
-
-   -->
-<!-- An address can be added to the publisher information.  If a role is 
-     not specified, the publisher/author is the same for all versions of the 
-     document.  -->
-<!-- CSC:
-    <publisher> 
-      <publishername> GNOME Documentation Project </publishername> 
-    </publisher> 
--->
+
+  <title>&app; V&appversion; User Manual (rev. &manrevision;)</title>
+
+  <bookinfo>
+
+    <copyright>
+      <year>2006</year>
+      <holder>The HELM team.</holder>
+    </copyright>
 
     <authorgroup> 
       <author> 
@@ -71,6 +69,13 @@
 	  <address> <email>sacerdot@cs.unibo.it</email> </address> 
 	</affiliation> 
       </author> 
+      <author> 
+	<firstname>Ferruccio</firstname> 
+	<surname>Guidi</surname> 
+	<affiliation> 
+	  <address> <email>fguidi@cs.unibo.it</email> </address> 
+	</affiliation> 
+      </author>       
       <author> 
 	<firstname>Enrico</firstname> 
 	<surname>Tassi</surname> 
@@ -84,69 +89,24 @@
 	<affiliation> 
 	  <address> <email>zacchiro@cs.unibo.it</email> </address> 
 	</affiliation> 
-      </author> 
-<!-- This is appropriate place for other contributors: translators,
-      maintainers,  etc. Commented out by default.
-       <othercredit role="translator">
-	<firstname>Latin</firstname> 
-	<surname>Translator 1</surname> 
-	<affiliation> 
-	  <orgname>Latin Translation Team</orgname> 
-	  <address> <email>translator@gnome.org</email> </address> 
-	</affiliation>
-	<contrib>Latin translation</contrib>
-      </othercredit>
--->
+      </author>
     </authorgroup>
-    
-<revhistory>
-      <revision> 
-	<revnumber>&appname; V&appversion; Manual (rev. &manrevision;)</revnumber> 
-	<date>&date;</date> 
-	<revdescription> 
-	  <para role="author">The HELM team
-<!--
-	    <email>baudais@okstate.edu</email>
--->
-	  </para>
-<!--
-	  <para role="publisher">GNOME Documentation Project</para>
--->
-	</revdescription> 
-      </revision>
-  <revision>
-   <revnumber>&manrevision;</revnumber>
-   <date>4 February 2006</date>
-   <authorinitials>HELM</authorinitials>
-   <revremark>
-   First draft completed.
-   </revremark>
-  </revision>
-
- </revhistory>
-
-    <releaseinfo>This manual describes version &appversion; of &appname;.
-    </releaseinfo>
 
     <legalnotice>
-      &license;
+      <para> Both &appname; and this document are free software, you can
+	redistribute them and/or modify them under the terms of the GNU General
+	Public License as published by the Free Software Foundation.  See <xref
+	  linkend="sec_license" /> for more information. </para>
     </legalnotice>
 
-    <!-- The following feedback information only applies to appliactions
-    listed in bugzilla.gnome.org and bugzilla.ximian.com. For other
-    applications, please provide your own feedback info or remove thsi
-    section altogether -->
-    <legalnotice> 
-      <title>Feedback</title> 
-      <para>To report a bug or make a suggestion regarding the &app;
-	application or this manual, follow the directions in the
-	<ulink url="http://bugs.mowgli.cs.unibo.it" type="http">HELM Bug
-	  Tracking System Page</ulink>. 
-      </para>
-<!-- Translators may also add here feedback address for translations -->
-    </legalnotice>
+    <revhistory>
+      <revision>
+	<revnumber>&manrevision;</revnumber>
+	<date>&date;</date>
+      </revision>
+    </revhistory>
 
-</bookinfo>
+  </bookinfo>
 
 <!-- ============= Document Body ============================= -->
 
@@ -154,14 +114,12 @@
 &install;
 &gettingstarted;
 &terms;
+&usernotation;
 &tactics;
+&tacticals;
+&othercommands;
+&license;
 
- <!-- ============= Application License ============================= -->
-
- <chapter id="sec_license">
-  <title>License</title>
-  &license;
- </chapter>
 </book>
 
 <!-- CSC: valid element tags