[nautilus-actions] Update NACT user's manual



commit 735fbfd03d6341e6f648ba04ab01f298ffd0e80e
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Aug 1 21:42:30 2010 +0200

    Update NACT user's manual

 doc/nact/C/appendix-feedback.xml            |   12 ----
 doc/nact/C/appendix-gnu-fdl-1.3.xml         |    4 -
 doc/nact/C/articleinfo.xml                  |    4 +-
 doc/nact/C/nautilus-actions-config-tool.xml |   87 +++++++++++++--------------
 doc/nact/Makefile.am                        |    3 +-
 5 files changed, 46 insertions(+), 64 deletions(-)
---
diff --git a/doc/nact/C/appendix-gnu-fdl-1.3.xml b/doc/nact/C/appendix-gnu-fdl-1.3.xml
index 54e50b3..5b16c28 100644
--- a/doc/nact/C/appendix-gnu-fdl-1.3.xml
+++ b/doc/nact/C/appendix-gnu-fdl-1.3.xml
@@ -1,7 +1,3 @@
-<?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-]>
-
 <appendix id="appendix-gnu-fdl">
   <title>GNU Free Documentation License</title>
   <simpara>Version 1.3, 3 November 2008</simpara>
diff --git a/doc/nact/C/articleinfo.xml b/doc/nact/C/articleinfo.xml
index b179e63..80bc04e 100644
--- a/doc/nact/C/articleinfo.xml
+++ b/doc/nact/C/articleinfo.xml
@@ -20,7 +20,7 @@
   </abstract>
 
   <releaseinfo revision="&manrevision;" role="stub">
-    This manual describes version &appversion; of &appname;.
+    This manual describes version &appversion; of &appnamex;.
   </releaseinfo>
 
   <publisher>
@@ -69,7 +69,7 @@
 
   <revhistory>
     <revision>
-      <revnumber>&appname; User's Manual v 3.0</revnumber>
+      <revnumber>&appnamex; User's Manual v 3.0</revnumber>
       <date>August 2010</date>
       <revdescription>
         <para role="author">
diff --git a/doc/nact/C/nautilus-actions-config-tool.xml b/doc/nact/C/nautilus-actions-config-tool.xml
index 2188bf0..42641ef 100644
--- a/doc/nact/C/nautilus-actions-config-tool.xml
+++ b/doc/nact/C/nautilus-actions-config-tool.xml
@@ -1,11 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. -->
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-  <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
 
   <!-- name and version of the application -->
   <!ENTITY prodname "<productname>Nautilus-Actions</productname>">
-  <!ENTITY appname "<application>Nautilus-Actions Configuration Tool</application>">
+  <!ENTITY appnamex "Nautilus-Actions Configuration Tool">
+  <!ENTITY appname "<application>&appnamex;</application>">
   <!ENTITY appversion "3.0">
 
   <!-- revision number and release date of this manual -->
@@ -14,22 +13,19 @@
 
   <!ENTITY nautilus "<productname>Nautilus</productname>">
   
-  <!-- this is defined as an entity rather than a xi:include because
-       db2omf complains about missing author -->
   <!ENTITY articleinfo SYSTEM "articleinfo.xml">
   <!ENTITY legalnotice SYSTEM "legalnotice.xml">
+  <!ENTITY feedback    SYSTEM "appendix-feedback.xml">
+  <!ENTITY gnu-fdl     SYSTEM "appendix-gnu-fdl-1.3.xml">
 ]>
 
 <!-- ========================= Document Header ======================== -->
 <!-- Please do not change the id!
      For translations, change lang to appropriate code -->
 
-<article id="index" lang="en" xmlns:xi="http://www.w3.org/2003/XInclude";>
+<article id="index" lang="en">
 
   &articleinfo;
-  
-  <xi:include href="appendix-gnu-fdl.xml" />
-  <xi:include href="appendix-feedback.xml" />
 
   <indexterm zone="index">
     <primary>&nautilus;</primary>
@@ -198,131 +194,131 @@
             <variablelist>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Ctrl</keycap>
                       <keycap>N</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Create a new action.
+                  <para>
+                    Create a new action.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Ctrl</keycap>
                       <keycap>S</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Save modified actions and menus.
+                  <para>
+                    Save modified actions and menus.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Ctrl</keycap>
                       <keycap>Q</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Quit the application.
+                  <para>
+                    Quit the application.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Ctrl</keycap>
                       <keycap>X</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Cut the current selection, keeping it in the clipboard.
+                  <para>
+                    Cut the current selection, keeping it in the clipboard.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Ctrl</keycap>
                       <keycap>C</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Copy the current selection to the clipboard.
+                  <para>
+                    Copy the current selection to the clipboard.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Ctrl</keycap>
                       <keycap>V</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Insert the content of the clipboard before the current item.
+                  <para>
+                    Insert the content of the clipboard before the current item.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Shift</keycap>
                       <keycap>Ctrl</keycap>
                       <keycap>V</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Insert the content of the clipboard as subitems of the current item.
+                  <para>
+                    Insert the content of the clipboard as subitems of the current item.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Delete</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Delete the current selection.
+                  <para>
+                    Delete the current selection.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>F5</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Reload the actions and menus.
+                  <para>
+                    Reload the actions and menus.
+                  </para>
                 </listitem>
               </varlistentry>
               <varlistentry>
                 <term>
-                  <shortcut>
                     <keycombo>
                       <keycap>Ctrl</keycap>
                       <keycap>H</keycap>
                     </keycombo>
-                  </shortcut>
                 </term>
                 <listitem>
-                  Display the help.
+                  <para>
+                    Display the help.
+                  </para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -584,31 +580,31 @@
         </sect4>
 
         <sect4 id="usage-create-action-when-mimetypes">
-          <title>Basenames</title>
+          <title>Mimetypes</title>
           <para>
           </para>
         </sect4>
 
         <sect4 id="usage-create-action-when-folders">
-          <title>Basenames</title>
+          <title>Folders</title>
           <para>
           </para>
         </sect4>
 
         <sect4 id="usage-create-action-when-schemes">
-          <title>Basenames</title>
+          <title>Schemes</title>
           <para>
           </para>
         </sect4>
 
         <sect4 id="usage-create-action-when-capabilities">
-          <title>Basenames</title>
+          <title>Capabilities</title>
           <para>
           </para>
         </sect4>
 
         <sect4 id="usage-create-action-when-environment">
-          <title>Basenames</title>
+          <title>Environment</title>
           <para>
           </para>
         </sect4>
@@ -944,4 +940,7 @@
        type="http">Bugzilla website</ulink>.
     </para>
   </sect1>
+
+  &gnu-fdl;
+
 </article>
diff --git a/doc/nact/Makefile.am b/doc/nact/Makefile.am
index 3a577ff..0dda10f 100644
--- a/doc/nact/Makefile.am
+++ b/doc/nact/Makefile.am
@@ -38,11 +38,10 @@ DOC_MODULE = nautilus-actions-config-tool
 DOC_ENTITIES = \
 	articleinfo.xml								\
 	legalnotice.xml								\
+	appendix-gnu-fdl-1.3.xml					\
 	$(NULL)
 
 DOC_INCLUDES = \
-	appendix-feedback.xml						\
-	appendix-gnu-fdl-1.3.xml					\
 	$(NULL)
 
 DOC_FIGURES = \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]