gimp-help-2 r2744 - in trunk: . images/C/menus images/C/menus/help images/C/toolbox images/cs/toolbox images/de/menus images/de/menus/help images/de/toolbox images/es/menus images/es/menus/help images/es/toolbox images/fr/menus images/fr/menus/help images/fr/toolbox images/it/menus images/it/menus/help images/it/toolbox images/lt/menus images/lt/menus/help images/lt/toolbox images/no/menus images/no/menus/help images/no/toolbox images/zh_CN/toolbox po/de/menus po/es/menus po/fi/menus po/fr/menus po/hr/menus po/it/menus po/ko/menus po/lt/menus po/nl/menus po/no/menus po/pl/menus po/ru/menus po/sv/menus src src/menus src/menus/help



Author: ulfehlert
Date: Sun Feb 15 19:47:11 2009
New Revision: 2744
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2744&view=rev

Log:
2009-02-15  Ulf-D. Ehlert  <ulfehlert svn gnome org>

	* src/menus/menus-xtns.xml
	* src/menus/xtns-introduction.xml: removed

	* images/*/toolbox/toolbox-menu.png: removed

	New directories for help menu source files and image files:

	* src/menus/help-introduction.xml: removed

	* src/menus/menus-help.xml
	* src/menus/help-about.xml
	* src/menus/help-context-help.xml
	* src/menus/help-gimp-online.xml
	* src/menus/help-help.xml
	* src/menus/help-tip-of-the-day.xml
	* src/menus/xtns-plug-in-browser.xml
	* src/menus/xtns-procedure-browser.xml: moved to ...

	* src/menus/help.xml
	* src/menus/help (new)
	* src/menus/help/about.xml
	* src/menus/help/context-help.xml
	* src/menus/help/gimp-online.xml
	* src/menus/help/help.xml
	* src/menus/help/tip-of-the-day.xml
	* src/menus/help/plug-in-browser.xml
	* src/menus/help/procedure-browser.xml: ... new location

	* src/gimp.xml
	* src/menus/introduction.xml: changed accordingly

	* images/C/menus/help.png
	* images/de/menus/help.png: updated

	* images/*/menus/help-about.png
	* images/*/menus/gimp-online.png
	* images/*/menus/help-tip-of-the-day.png: moved to ...

	* images/*/menus/help: new
	* images/*/menus/help/about.png
	* images/*/menus/help/gimp-online.png
	* images/*/menus/help/tip-of-the-day.png: ... new location

	* po/*/menus/help.po: new


Added:
   trunk/images/C/menus/help/
   trunk/images/C/menus/help/about.png   (contents, props changed)
      - copied, changed from r2742, /trunk/images/C/menus/help-about.png
   trunk/images/C/menus/help/gimp-online.png   (contents, props changed)
      - copied, changed from r2742, /trunk/images/C/menus/gimp-online.png
   trunk/images/C/menus/help/tip-of-the-day.png   (contents, props changed)
      - copied, changed from r2742, /trunk/images/C/menus/help-tip-of-the-day.png
   trunk/images/de/menus/help/
   trunk/images/de/menus/help/about.png   (contents, props changed)
   trunk/images/de/menus/help/gimp-online.png   (contents, props changed)
      - copied, changed from r2742, /trunk/images/de/menus/gimp-online.png
   trunk/images/de/menus/help/tip-of-the-day.png
      - copied, changed from r2742, /trunk/images/de/menus/help-tip-of-the-day.png
   trunk/images/es/menus/help/
   trunk/images/es/menus/help/tip-of-the-day.png   (props changed)
      - copied unchanged from r2742, /trunk/images/es/menus/help-tip-of-the-day.png
   trunk/images/fr/menus/help/
   trunk/images/fr/menus/help/about.png   (props changed)
      - copied unchanged from r2742, /trunk/images/fr/menus/help-about.png
   trunk/images/fr/menus/help/tip-of-the-day.png   (props changed)
      - copied unchanged from r2742, /trunk/images/fr/menus/help-tip-of-the-day.png
   trunk/images/it/menus/help/
   trunk/images/it/menus/help/about.png   (props changed)
      - copied unchanged from r2742, /trunk/images/it/menus/help-about.png
   trunk/images/it/menus/help/tip-of-the-day.png   (props changed)
      - copied unchanged from r2742, /trunk/images/it/menus/help-tip-of-the-day.png
   trunk/images/lt/menus/help/
   trunk/images/lt/menus/help/about.png   (props changed)
      - copied unchanged from r2742, /trunk/images/lt/menus/help-about.png
   trunk/images/lt/menus/help/tip-of-the-day.png   (props changed)
      - copied unchanged from r2742, /trunk/images/lt/menus/help-tip-of-the-day.png
   trunk/images/no/menus/help/
   trunk/images/no/menus/help/about.png   (props changed)
      - copied unchanged from r2742, /trunk/images/no/menus/help-about.png
   trunk/images/no/menus/help/tip-of-the-day.png   (props changed)
      - copied unchanged from r2742, /trunk/images/no/menus/help-tip-of-the-day.png
   trunk/po/de/menus/help.po
   trunk/po/es/menus/help.po
   trunk/po/fi/menus/help.po
   trunk/po/fr/menus/help.po
   trunk/po/hr/menus/help.po
   trunk/po/it/menus/help.po
   trunk/po/ko/menus/help.po
   trunk/po/lt/menus/help.po
   trunk/po/nl/menus/help.po
   trunk/po/no/menus/help.po
   trunk/po/pl/menus/help.po
   trunk/po/ru/menus/help.po
   trunk/po/sv/menus/help.po
   trunk/src/menus/help/
   trunk/src/menus/help.xml   (contents, props changed)
      - copied, changed from r2741, /trunk/src/menus/menus-help.xml
   trunk/src/menus/help/about.xml   (contents, props changed)
      - copied, changed from r2742, /trunk/src/menus/help-about.xml
   trunk/src/menus/help/context-help.xml   (contents, props changed)
      - copied, changed from r2741, /trunk/src/menus/help-context-help.xml
   trunk/src/menus/help/gimp-online.xml   (contents, props changed)
      - copied, changed from r2742, /trunk/src/menus/help-gimp-online.xml
   trunk/src/menus/help/help.xml   (contents, props changed)
      - copied, changed from r2741, /trunk/src/menus/help-help.xml
   trunk/src/menus/help/plug-in-browser.xml   (contents, props changed)
      - copied, changed from r2741, /trunk/src/menus/xtns-plug-in-browser.xml
   trunk/src/menus/help/procedure-browser.xml   (contents, props changed)
      - copied, changed from r2741, /trunk/src/menus/xtns-procedure-browser.xml
   trunk/src/menus/help/tip-of-the-day.xml   (contents, props changed)
      - copied, changed from r2741, /trunk/src/menus/help-tip-of-the-day.xml
Removed:
   trunk/images/C/menus/gimp-online.png
   trunk/images/C/menus/help-about.png
   trunk/images/C/menus/help-tip-of-the-day.png
   trunk/images/C/toolbox/toolbox-menu.png
   trunk/images/cs/toolbox/toolbox-menu.png
   trunk/images/de/menus/gimp-online.png
   trunk/images/de/menus/help-tip-of-the-day.png
   trunk/images/de/toolbox/toolbox-menu.png
   trunk/images/es/menus/help-tip-of-the-day.png
   trunk/images/es/toolbox/toolbox-menu.png
   trunk/images/fr/menus/help-about.png
   trunk/images/fr/menus/help-tip-of-the-day.png
   trunk/images/fr/toolbox/toolbox-menu.png
   trunk/images/it/menus/help-about.png
   trunk/images/it/menus/help-tip-of-the-day.png
   trunk/images/it/toolbox/toolbox-menu.png
   trunk/images/lt/menus/help-about.png
   trunk/images/lt/menus/help-tip-of-the-day.png
   trunk/images/lt/toolbox/toolbox-menu.png
   trunk/images/no/menus/help-about.png
   trunk/images/no/menus/help-tip-of-the-day.png
   trunk/images/no/toolbox/toolbox-menu.png
   trunk/images/zh_CN/toolbox/toolbox-menu.png
   trunk/src/menus/help-about.xml
   trunk/src/menus/help-context-help.xml
   trunk/src/menus/help-gimp-online.xml
   trunk/src/menus/help-help.xml
   trunk/src/menus/help-introduction.xml
   trunk/src/menus/help-tip-of-the-day.xml
   trunk/src/menus/menus-help.xml
   trunk/src/menus/menus-xtns.xml
   trunk/src/menus/xtns-introduction.xml
   trunk/src/menus/xtns-plug-in-browser.xml
   trunk/src/menus/xtns-procedure-browser.xml
Modified:
   trunk/ChangeLog
   trunk/images/C/menus/help.png
   trunk/images/de/menus/help.png
   trunk/src/gimp.xml
   trunk/src/menus/introduction.xml

Modified: trunk/images/C/menus/help.png
==============================================================================
Binary files. No diff available.

Copied: trunk/images/C/menus/help/about.png (from r2742, /trunk/images/C/menus/help-about.png)
==============================================================================
Binary files. No diff available.

Copied: trunk/images/C/menus/help/gimp-online.png (from r2742, /trunk/images/C/menus/gimp-online.png)
==============================================================================
Binary files. No diff available.

Copied: trunk/images/C/menus/help/tip-of-the-day.png (from r2742, /trunk/images/C/menus/help-tip-of-the-day.png)
==============================================================================
Binary files. No diff available.

Modified: trunk/images/de/menus/help.png
==============================================================================
Binary files. No diff available.

Added: trunk/images/de/menus/help/about.png
==============================================================================
Binary file. No diff available.

Copied: trunk/images/de/menus/help/gimp-online.png (from r2742, /trunk/images/de/menus/gimp-online.png)
==============================================================================
Binary files. No diff available.

Copied: trunk/images/de/menus/help/tip-of-the-day.png (from r2742, /trunk/images/de/menus/help-tip-of-the-day.png)
==============================================================================
Binary files. No diff available.

Modified: trunk/src/gimp.xml
==============================================================================
--- trunk/src/gimp.xml	(original)
+++ trunk/src/gimp.xml	Sun Feb 15 19:47:11 2009
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                      "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--  section history:
+  2009-02-15 ude: removed menu-xtns.xml
   2008-12-28 j.h: added menus-windows.xml
   2008-01-21 ude: removed filters_color.xml (moved to Colors menu)
   2007-01-01 lexa: updated copyright to 2008
@@ -19,13 +21,6 @@
   <bookinfo>
     <title>GNU Image Manipulation Program</title>
     <subtitle>User Manual</subtitle>
-    <!--<revhistory role="cvs">
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-07-15</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>-->
     <copyright>
       <year>2002</year>
       <year>2003</year>
@@ -34,12 +29,11 @@
       <year>2006</year>
       <year>2007</year>
       <year>2008</year>
+      <year>2009</year>
       <holder>The GIMP Documentation Team</holder>
     </copyright>
     <legalnotice>
-      <title>
-        <phrase>Legal Notice</phrase>
-      </title>
+      <title>Legal Notice</title>
       <para>
         Permission is granted to copy, distribute and/or modify this document
         under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -52,33 +46,23 @@
   </bookinfo>
   <toc/>
   <preface>
-    <title>
-      <phrase>Preface</phrase>
-    </title>
+    <title>Preface</title>
     <xi:include href="preface/authors.xml"/>
   </preface>
   <part>
-    <title>
-      <phrase>Getting started</phrase>
-    </title>
+    <title>Getting started</title>
     <chapter id="introduction">
-      <title>
-        <phrase>Introduction</phrase>
-      </title>
+      <title>Introduction</title>
       <xi:include href="introduction.xml"/>
       <xi:include href="introduction/whats-new.xml"/>
     </chapter>
     <chapter id="gimp-fire-up">
-      <title>
-        <phrase>Fire up the GIMP</phrase>
-      </title>
+      <title>Fire up the GIMP</title>
       <xi:include href="concepts/intro.xml"/>
       <xi:include href="concepts/setup.xml"/>
     </chapter>
     <chapter id="gimp-first-steps">
-      <title>
-        <phrase>First Steps With Wilber</phrase>
-      </title>
+      <title>First Steps With Wilber</title>
       <xi:include href="concepts/concepts.xml"/>
       <xi:include href="concepts/basic-setup.xml"/>
       <xi:include href="concepts/undo.xml"/>
@@ -86,22 +70,16 @@
       <xi:include href="tutorial/straight-lines.xml"/>
     </chapter>
     <chapter id="gimp-getting-unstuck">
-      <title>
-        <phrase>Getting Unstuck</phrase>
-      </title>
+      <title>Getting Unstuck</title>
       <xi:include href="using/getting-unstuck.xml"/>
     </chapter>
   </part>
   <part>
     <title>
-      <phrase>
-        How do I Become a <acronym>GIMP</acronym> Wizard?
-      </phrase>
+      How do I Become a <acronym>GIMP</acronym> Wizard?
     </title>
     <chapter id="gimp-images-in">
-      <title>
-        <phrase>Getting Images Into GIMP</phrase>
-      </title>
+      <title>Getting Images Into GIMP</title>
       <para><!-- new: 2007-03-15 -->
         This chapter is about getting images into GIMP. It explains how to
         create new images, how to load images from files, how to scan them and
@@ -116,16 +94,12 @@
       <xi:include href="concepts/images-loading.xml"/>
     </chapter>
     <chapter id="gimp-images-out">
-      <title>
-        <phrase>Getting images out of GIMP</phrase>
-      </title>
+      <title>Getting images out of GIMP</title>
       <xi:include href="using/fileformats.xml"/>
       <xi:include href="using/web.xml"/>
     </chapter>
     <chapter id="gimp-painting">
-      <title>
-        <phrase>Painting with GIMP</phrase>
-      </title>
+      <title>Painting with GIMP</title>
       <xi:include href="concepts/selection.xml"/>
       <xi:include href="using/selections.xml"/>
       <xi:include href="concepts/qmask.xml"/>
@@ -141,9 +115,7 @@
       <xi:include href="using/simpleobjects.xml"/>
     </chapter>
     <chapter id="gimp-image-combining">
-      <title>
-        <phrase>Combining Images</phrase>
-      </title>
+      <title>Combining Images</title>
       <xi:include href="concepts/layers.xml"/>
       <xi:include href="concepts/layer-modes.xml"/>
       <xi:include href="using/layers.xml"/>
@@ -151,21 +123,15 @@
       <xi:include href="using/fonts-and-text.xml"/>
     </chapter>
     <chapter id="gimp-imaging-photos">
-      <title>
-        <phrase>Enhancing Photographs</phrase>
-      </title>
+      <title>Enhancing Photographs</title>
       <xi:include href="using/photography.xml"/>
     </chapter>
     <chapter id="gimp-imaging-color-management">
-      <title>
-        <phrase>Color Management with GIMP</phrase>
-      </title>
+      <title>Color Management with GIMP</title>
       <xi:include href="concepts/color-management.xml"/>
     </chapter>
     <chapter id="gimp-pimping">
-      <title>
-        <phrase>Pimp my GIMP</phrase>
-      </title>
+      <title>Pimp my GIMP</title>
       <xi:include href="using/preferences/preferences_introduction.xml"/>
       <xi:include href="concepts/grid-and-guides.xml"/>
       <xi:include href="using/grid-and-guides.xml"/>
@@ -175,24 +141,16 @@
       <xi:include href="using/customize-splashscreen.xml"/>
     </chapter>
     <chapter id="gimp-scripting">
-      <title>
-        <phrase>Scripting</phrase>
-      </title>
+      <title>Scripting</title>
       <xi:include href="concepts/plugins.xml"/>
       <xi:include href="concepts/script-fu.xml"/>
       <xi:include href="using/script-fu-tutorial.xml"/>
     </chapter>
   </part>
   <part>
-    <title>
-      <phrase>
-        Function Reference
-      </phrase>
-    </title>
+    <title>Function Reference</title>
     <chapter id="gimp-toolbox">
-      <title>
-        <phrase>Toolbox</phrase>
-      </title>
+      <title>Toolbox</title>
       <xi:include href="toolbox/intro.xml"/>
       <xi:include href="toolbox/tools-selection.xml"/>
       <xi:include href="toolbox/tools-paint.xml"/>
@@ -202,9 +160,7 @@
       <xi:include href="toolbox/toolbox-color-area.xml"/>
     </chapter>
     <chapter id="dialogs">
-      <title>
-        <phrase>Dialogs</phrase>
-      </title>
+      <title>Dialogs</title>
       <xi:include href="dialogs/dialogs_introduction.xml"/>
       <xi:include href="dialogs/dialogs-structure.xml"/>
       <xi:include href="dialogs/dialogs-content.xml"/>
@@ -212,9 +168,7 @@
       <xi:include href="dialogs/dialogs-misc.xml"/>
     </chapter>
     <chapter id="menus">
-      <title>
-        <phrase>Menus</phrase>
-      </title>
+      <title>Menus</title>
       <xi:include href="menus/introduction.xml"/>
       <xi:include href="menus/file.xml"/>
       <xi:include href="menus/edit.xml"/>
@@ -226,15 +180,10 @@
       <xi:include href="menus/menus-tools.xml"/>
       <xi:include href="menus/menus-filters.xml"/>
       <xi:include href="menus/menus-windows.xml"/>
-      <xi:include href="menus/menus-help.xml"/>
-<!--To be removed :-->
-      <!--xi:include href="menus/menus-toolbox-file.xml"/-->
-      <xi:include href="menus/menus-xtns.xml"/>
+      <xi:include href="menus/help.xml"/>
     </chapter>
     <chapter id="filters">
-      <title>
-        <phrase>Filters</phrase>
-      </title>
+      <title>Filters</title>
       <xi:include href="filters/filters_introduction.xml"/>
       <xi:include href="filters/filters_blur.xml"/>
       <xi:include href="filters/filters_noise.xml"/>

Copied: trunk/src/menus/help.xml (from r2741, /trunk/src/menus/menus-help.xml)
==============================================================================
--- /trunk/src/menus/menus-help.xml	(original)
+++ trunk/src/menus/help.xml	Sun Feb 15 19:47:11 2009
@@ -1,33 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--section history:
-    2005-11-25 split off from menus-toolbox by axel.wernicke
+  2009-02-15 ude: moved plug-in-browser & procedure-browser here;
+                  included help-introduction.xml
+  2005-11-25 split off from menus-toolbox by axel.wernicke
 -->
-<sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-toolbox-window-menus-help">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-17</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>The <quote>Help</quote> Menu</phrase>
-  </title>
-  <indexterm>
-    <primary>Menus</primary>
-    <secondary>Help</secondary>
-  </indexterm>
-  <indexterm>
-    <primary>Help</primary>
-    <secondary>Menu</secondary>
-  </indexterm>
-  <xi:include href="help-introduction.xml"/>
-  <xi:include href="help-help.xml"/>
-  <xi:include href="help-context-help.xml"/>
-  <xi:include href="help-tip-of-the-day.xml"/>
-  <xi:include href="help-about.xml"/>
-  <xi:include href="help-gimp-online.xml"/>
+<sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-help-menu">
+  <title>The <quote>Help</quote> Menu</title>
+
+  <sect2 id="gimp-help-introduction">
+    <title>Introduction to the <quote>Help</quote> Menu</title>
+  
+    <indexterm>
+      <primary>Menu</primary>
+      <secondary>Help</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>Help</primary>
+      <secondary>Menu</secondary>
+    </indexterm>
+  
+    <figure>
+      <title>Contents of the <quote>Help</quote> menu</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/menus/help.png" format="PNG"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+  
+    <para>
+      The <guimenu>Help</guimenu> menu contains commands that assist you
+      while you are working with <application>GIMP</application>.
+    </para>
+    <xi:include href="about-plugin-menuitems.xml"/>
+  </sect2>
+
+  <xi:include href="help/help.xml"/>
+  <xi:include href="help/context-help.xml"/>
+  <xi:include href="help/tip-of-the-day.xml"/>
+  <xi:include href="help/about.xml"/>
+  <!-- -->
+  <xi:include href="help/plug-in-browser.xml"/>
+  <xi:include href="help/procedure-browser.xml"/>
+  <!-- -->
+  <xi:include href="help/gimp-online.xml"/>
+  <!--TODO: xi:include href="help-user-manual.xml"/-->
 </sect1>

Copied: trunk/src/menus/help/about.xml (from r2742, /trunk/src/menus/help-about.xml)
==============================================================================
--- /trunk/src/menus/help-about.xml	(original)
+++ trunk/src/menus/help/about.xml	Sun Feb 15 19:47:11 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-20 kost:updated to v2.4 'no' 
   2007-11-02 j.h updated to v2.4 en;fr
@@ -7,44 +8,45 @@
   2005/12/20 en;fr reviewed by j.h
   2005/09/03 extracted from menus-toolbox-file by axel.wernicke
 -->
-<sect2 id="gimp-help-about">
-  <title>
-    <phrase>About</phrase>
-  </title>
+<sect2 id="gimp-about-dialog">
+  <title>About</title>
+
   <indexterm>
     <primary>Help</primary>
     <secondary>Overview</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>About</guimenuitem> command shows the
     <guilabel>About</guilabel> window, which displays information about
     the version of The <acronym>GIMP</acronym> you are running
     and the many authors who wrote it.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the About Command</phrase>
-    </title>
+    <title>Activating the <quote>About</quote> Command</title>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command in the toolbox menu through
-          <menuchoice><guimenu>Help</guimenu><guimenuitem>About</guimenuitem></menuchoice>
+          You can access this command in the image menu through
+          <menuchoice>
+            <guimenu>Help</guimenu>
+            <guimenuitem>About</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Description of the dialog window</phrase>
-    </title>
+    <title>Description of the dialog window</title>
     <figure>
       <title>
         <phrase> The <quote>About</quote> dialog window</phrase>
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/help-about.png" format="PNG"/>
+          <imagedata fileref="images/menus/help/about.png" format="PNG"/>
         </imageobject>
       </mediaobject>
     </figure>

Copied: trunk/src/menus/help/context-help.xml (from r2741, /trunk/src/menus/help-context-help.xml)
==============================================================================
--- /trunk/src/menus/help-context-help.xml	(original)
+++ trunk/src/menus/help/context-help.xml	Sun Feb 15 19:47:11 2009
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-01 j.h: no change for v2.4
   2007-05-11 Added Spanish translation by AntI
   2005-12-20 en;fr reviewed by j.h
   2005-11-24 split of from menus-toolbox.xml by axel.wernicke
 -->
-<sect2 id="gimp-help-context-help">
-  <title>
-    <phrase>Context Help</phrase>
-  </title>
+<sect2 id="gimp-help-context">
+  <title>Context Help</title>
+
   <indexterm>
     <primary>Help</primary>
     <secondary>Context help</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Context Help</guimenuitem> command makes the
     mouse pointer context-sensitive and changes its shape to a
@@ -23,15 +24,17 @@
     pressing the <keycap>F1</keycap> key while the mouse pointer is over
     the object you would like help about.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command from the toolbox menu through
-          <menuchoice><guimenu>Help</guimenu><guimenuitem>Context Help</guimenuitem></menuchoice>
+          You can access this command from the image menu through
+          <menuchoice>
+            <guimenu>Help</guimenu>
+            <guimenuitem>Context Help</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
       <listitem>

Copied: trunk/src/menus/help/gimp-online.xml (from r2742, /trunk/src/menus/help-gimp-online.xml)
==============================================================================
--- /trunk/src/menus/help-gimp-online.xml	(original)
+++ trunk/src/menus/help/gimp-online.xml	Sun Feb 15 19:47:11 2009
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-15 ude: updated screenshot v2.6 and moved it to help dir
   2007-11-01 j.h: v2.4 updated screenshot en;fr
   2007-05-11 Added Spanish translation by AntI
   2005-12-20 en;fr reviewed by j.h
   2005-11-24 split of from menus-toolbox.xml by axel.wernicke
 -->
-<sect2 id="gimp-help-gimp-online">
-  <title>
-    <phrase>GIMP online</phrase>
-  </title>
+<sect2 id="gimp-help-online">
+  <title>GIMP online</title>
+
   <indexterm>
-    <primary>GIMP online</primary>
+    <primary>Help</primary>
+    <secondary>Online</secondary>
   </indexterm>
+  <indexterm>
+    <primary>GIMP Online</primary>
+  </indexterm>
+
   <figure>
     <title>
       <phrase>
-        The <quote>GIMP online</quote> submenu of the Help menu
+        The <quote>GIMP Online</quote> submenu of the Help menu
       </phrase>
     </title>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/menus/gimp-online.png" format="PNG"/>
+        <imagedata fileref="images/menus/help/gimp-online.png" format="PNG"/>
       </imageobject>
     </mediaobject>
   </figure>

Copied: trunk/src/menus/help/help.xml (from r2741, /trunk/src/menus/help-help.xml)
==============================================================================
--- /trunk/src/menus/help-help.xml	(original)
+++ trunk/src/menus/help/help.xml	Sun Feb 15 19:47:11 2009
@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-01 j.h: no change for v2.4
   2007-05-11 Added Spanish translation by AntI
   2005-12-20 en;fr reviewed by j.h
   2005-11-24 split of from menus-toolbox.xml by axel.wernicke
 -->
-<sect2 id="gimp-help-help">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Help</phrase>
-  </title>
+<sect2 id="gimp-help">
+  <title>Help</title>
+
   <indexterm>
     <primary>Help</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Help</guimenuitem> command displays the
     <acronym>GIMP</acronym> Users Manual in a browser. You
@@ -39,22 +31,27 @@
       <xref linkend="bibliography-online-gimp-docs"/>.
     </para>
   </tip>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command from the toolbox menubar through
-          <menuchoice><guimenu>Help</guimenu><guimenuitem>Help</guimenuitem></menuchoice>,
+          You can access this command from the image menubar through
+          <menuchoice>
+            <shortcut>
+              <keycap>F1</keycap>
+            </shortcut>
+            <guimenu>Help</guimenu>
+            <guimenuitem>Help</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
-      <listitem>
+      <!--listitem>
         <para>
           or by using the keyboard shortcut <keycap>F1</keycap>.
         </para>
-      </listitem>
+      </listitem-->
     </itemizedlist>
   </sect3>
 </sect2>

Copied: trunk/src/menus/help/plug-in-browser.xml (from r2741, /trunk/src/menus/xtns-plug-in-browser.xml)
==============================================================================
--- /trunk/src/menus/xtns-plug-in-browser.xml	(original)
+++ trunk/src/menus/help/plug-in-browser.xml	Sun Feb 15 19:47:11 2009
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-05-06 ude: changed (help-)id [was: gimp-xtns-plug-in-browser]
   2005-11-24 split of from menus-toolbox.xml by axel.wernicke
 -->
 <sect2 id="plug-in-plug-in-details">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-08</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Plug-In Browser</phrase>
-  </title>
-  <indexterm>
-    <primary>Plugins</primary>
-    <secondary>Browser</secondary>
-  </indexterm>
+  <title>Plug-In Browser</title>
   <indexterm>
     <primary>Plugins</primary>
     <secondary>Browser</secondary>
@@ -29,6 +15,7 @@
     <primary>Browser</primary>
     <secondary>Plug-In</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Plug-In Browser</guimenuitem> command displays a
     dialog window which shows all of the extensions (plug-ins) which are
@@ -40,30 +27,29 @@
     filter plug-ins by using the <guimenuitem>Filter</guimenuitem> command
     on the image menubar.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command from the toolbox menubar through
-          <menuchoice><guimenu>Xtns</guimenu><guimenuitem>Plug-in Browser</guimenuitem></menuchoice>
+          You can access this command from the image menubar through
+          <menuchoice>
+            <guimenu>Help</guimenu>
+            <guimenuitem>Plug-in Browser</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Plug-In Browser</quote> dialog window
-      </phrase>
+      Description of the <quote>Plug-In Browser</quote> dialog window
     </title>
     <figure>
       <title>
-        <phrase>
-          The list view of the <quote>Plug-In Browser</quote> dialog window
-        </phrase>
+        The list view of the <quote>Plug-In Browser</quote> dialog window
       </title>
       <mediaobject>
         <imageobject>
@@ -92,7 +78,8 @@
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/plug-in-browser-tree.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/plug-in-browser-tree.png" />
         </imageobject>
       </mediaobject>
     </figure>

Copied: trunk/src/menus/help/procedure-browser.xml (from r2741, /trunk/src/menus/xtns-procedure-browser.xml)
==============================================================================
--- /trunk/src/menus/xtns-procedure-browser.xml	(original)
+++ trunk/src/menus/help/procedure-browser.xml	Sun Feb 15 19:47:11 2009
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-05-06 ude: changed (help-)id [was: gimp-xtns-procedure-browser]
   2005-11-24 split of from menus-toolbox.xml by axel.wernicke
 -->
 <sect2 id="plug-in-dbbrowser">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-08</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>The Procedure Browser</phrase>
-  </title>
+  <title>The Procedure Browser</title>
   <indexterm>
     <primary>Procedure</primary>
     <secondary>Browser</secondary>
@@ -25,42 +15,41 @@
     <primary>Browser</primary>
     <secondary>Procedure</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Procedure Browser</guimenuitem> command displays the
-    procedures in the <acronym>PDB</acronym>, the Procedure Database.
-    These procedures are functions which are called by the scripts
-    or plug-ins. You can find a more detailed description of the
-    <link linkend="glossary-pdb">PDB</link> in the glossary. The browser
-    is most useful for advanced users who write scripts or plug-ins.
+    procedures in the <link linkend="glossary-pdb">PDB</link>, the Procedure
+    Database. These procedures are functions which are called by the scripts
+    or plug-ins.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command from the toolbox menubar through
-          <menuchoice><guimenu>Xtns</guimenu><guimenuitem>Procedure Browser</guimenuitem></menuchoice>
+          You can access this command from the image menubar through
+          <menuchoice>
+            <guimenu>Help</guimenu>
+            <guimenuitem>Procedure Browser</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Procedure Browser</quote> dialog window
-      </phrase>
+      Description of the <quote>Procedure Browser</quote> dialog window
     </title>
     <figure>
       <title>
-        <phrase>
-          The <quote>Procedure Browser</quote> dialog window
-        </phrase>
+        The <quote>Procedure Browser</quote> dialog window
       </title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/procedure-browser.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/procedure-browser.png" />
         </imageobject>
       </mediaobject>
     </figure>

Copied: trunk/src/menus/help/tip-of-the-day.xml (from r2741, /trunk/src/menus/help-tip-of-the-day.xml)
==============================================================================
--- /trunk/src/menus/help-tip-of-the-day.xml	(original)
+++ trunk/src/menus/help/tip-of-the-day.xml	Sun Feb 15 19:47:11 2009
@@ -1,30 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-02-15 ude: updated for v2.6
   2007-11-01 j.h: no change for v2.4
   2007-05-11 Added Spanish translation by AntI
   2005-11-24 extracted from menus-toolbox-file by axel.wernicke
 -->
-<sect2 id="gimp-help-tip-of-the-day">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-28</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Tip of the Day</phrase>
-  </title>
+<sect2 id="gimp-tips-dialog">
+  <title>Tip of the Day</title>
+
   <indexterm>
     <primary>Help</primary>
-    <secondary>Tip of the day</secondary>
+    <secondary>Tip of the Day</secondary>
   </indexterm>
   <indexterm>
     <primary>Tip of the Day</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Tip of the Day</guimenuitem> command displays the
     <guimenu>Tip of the Day</guimenu> dialog. This dialog contains useful
@@ -34,38 +27,44 @@
     because they often suggest ways of doing something that are much
     easier or more efficient than more obvious approaches.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command in the toolbox menu through
-          <menuchoice><guimenu>Help</guimenu><guimenuitem>Tip of the day</guimenuitem></menuchoice>
+          You can access this command in the image menu through
+          <menuchoice>
+            <guimenu>Help</guimenu>
+            <guimenuitem>Tip of the Day</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Description of the dialog window</phrase>
-    </title>
+    <title>Description of the dialog window</title>
     <figure>
-      <title>
-        <phrase><quote>Tip of the day</quote>Dialog window</phrase>
-      </title>
+      <title><quote>Tip of the Day</quote>Dialog window</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/help-tip-of-the-day.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/help/tip-of-the-day.png"/>
         </imageobject>
       </mediaobject>
     </figure>
+
     <para>
-      A new tip is displayed each time you start
-      <acronym>GIMP</acronym>. You can disable this by
-      un-checking the <guilabel>Show tip next time GIMP starts</guilabel>
-      box on the dialog.
+      Some tips contain a <guilabel>Learn more</guilabel> link to the
+      corrsponding <acronym>GIMP</acronym> manual page.
     </para>
+    <note>
+      <title>New in <acronym>GIMP</acronym> 2.6</title>
+      <para>
+        The tip of the day is no longer displayed each time you start
+        <acronym>GIMP</acronym>.
+      </para>
+    </note>
   </sect3>
 </sect2>

Modified: trunk/src/menus/introduction.xml
==============================================================================
--- trunk/src/menus/introduction.xml	(original)
+++ trunk/src/menus/introduction.xml	Sun Feb 15 19:47:11 2009
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-25 AntI: Added 'es'
   2007-02-04 added 'no' by KoSt
@@ -7,24 +8,14 @@
   yyyy-mm-tt n.n.: added section for context menu
 -->
 <sect1 id="gimp-menus-introduction">
-<!--  <sect1info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-17</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect1info>-->
-  <title>
-    <phrase>
-      Introduction to Menus
-    </phrase>
-  </title>
+  <title>Introduction to Menus</title>
   <indexterm>
     <primary>Menus</primary>
     <secondary>Introduction</secondary>
   </indexterm>
+
+  <!--TODO: add image menubar screenshot instead(?)-->
+  <!--
   <figure>
     <title>
       <phrase>The Toolbox Menu</phrase>
@@ -37,6 +28,8 @@
       </mediaobject>
     </screenshot>
   </figure>
+  -->
+
   <para>
     There are many places in <acronym>GIMP</acronym> where you can
     find menus. The aim of this chapter is to explain all the commands that
@@ -44,13 +37,14 @@
     context menus and the menu entries for the other dialogs are described
     elsewhere in the chapters that describe the dialogs themselves.
   </para>
+
   <sect2 id="context-menus">
-    <title>
-      <phrase>Context Menus</phrase>
-    </title>
+    <title>Context Menus</title>
+
     <indexterm>
       <primary>Context menus</primary>
     </indexterm>
+
     <para>
       If you right-click on certain parts of the
       <acronym>GIMP</acronym> interface, a
@@ -86,16 +80,18 @@
       </listitem>
     </itemizedlist>
   </sect2>
+
+  <!-- TODO: update (are detachable submenus removed?) -->
   <sect2 id="detachable-submenus">
-    <title>
-      <phrase>Detachable Submenus</phrase>
-    </title>
+    <title>Detachable Submenus</title>
+
     <indexterm>
       <primary>Detachable submenus</primary>
     </indexterm>
     <indexterm>
       <primary>Tear-off line</primary>
     </indexterm>
+
     <para>
       There is an interesting property associated with some of the menus in
       <acronym>GIMP</acronym>.
@@ -103,16 +99,21 @@
       submenus, as well as the Image context menu you get by right-clicking on
       the image window and any of its submenus. (You can tell that a menu item
       leads to a submenu because there is an
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/menus/icon-submenu.png" format="PNG"/></imageobject></inlinemediaobject></guiicon>
+      <guiicon>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/menus/icon-submenu.png" format="PNG"/>
+          </imageobject>
+        </inlinemediaobject>
+      </guiicon>
       icon next to it.) When you bring up any of these menus, there is a
       dotted line at the top of it (tear-off line). By clicking on this
       dotted line, you detach the menu under it and it becomes a separate window.
     </para>
+
     <figure>
       <title>
-        <phrase>
-          The <quote>Acquire</quote> submenu and its detached submenu
-        </phrase>
+        The <quote>Acquire</quote> submenu and its detached submenu
       </title>
       <mediaobject>
         <imageobject>
@@ -125,6 +126,7 @@
         </imageobject>
       </mediaobject>
     </figure>
+
     <para>
       Detached submenus originating from the Toolbox are only visible when the
       Toolbox is active. Detached submenus originating from the Image window



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