GNOME.org
 

[gimp-help-2] Fix bugs #747090 Busted link to TUTO2, #758890, #691579, #755109, #744449

commit 8450cd5468e6c5c20fa585979fd423df98cef65a
Author: Julien Hardelin <jhardlin orange fr>
Date:   Thu Dec 24 07:37:55 2015 +0100

    Fix bugs #747090 Busted link to TUTO2, #758890, #691579, #755109, #744449

 images/C/menus/file/create/scanner.png |  Bin 1425 -> 3511 bytes
 images/C/menus/file/create_win.png     |  Bin 0 -> 2989 bytes
 src/appendix/bibliography.xml          |    2 +-
 src/menus/file/create.xml              |   25 ++++++++++++++---
 src/toolbox/selection/rectangle.xml    |   25 +-----------------
 src/using/fileformats.xml              |    9 +++++-
 src/using/shortcuts.xml                |   45 ++++++++++++++++++++++---------
 7 files changed, 61 insertions(+), 45 deletions(-)
---
diff --git a/images/C/menus/file/create/scanner.png b/images/C/menus/file/create/scanner.png
index 443550d..d6237b5 100644
Binary files a/images/C/menus/file/create/scanner.png and b/images/C/menus/file/create/scanner.png differ
diff --git a/images/C/menus/file/create_win.png b/images/C/menus/file/create_win.png
new file mode 100644
index 0000000..9380cff
Binary files /dev/null and b/images/C/menus/file/create_win.png differ
diff --git a/src/appendix/bibliography.xml b/src/appendix/bibliography.xml
index 526349d..f3da085 100644
--- a/src/appendix/bibliography.xml
+++ b/src/appendix/bibliography.xml
@@ -660,7 +660,7 @@
         <holder>Carol Spears</holder>
       </copyright>
       <releaseinfo>
-        <ulink url="http://next.gimp.org/tutorials/Lite_Quickies/";>
+        <ulink url="http://gimp.org/tutorials/Lite_Quickies/";>
           http://next.gimp.org/tutorials/Lite_Quickies/
         </ulink>
       </releaseinfo>
diff --git a/src/menus/file/create.xml b/src/menus/file/create.xml
index 83d4498..8869f3b 100644
--- a/src/menus/file/create.xml
+++ b/src/menus/file/create.xml
@@ -24,6 +24,21 @@
       <imageobject>
         <imagedata format="PNG" fileref="images/menus/file/create.png"/>
       </imageobject>
+      <caption>
+        <para>
+          Under Linux
+        </para>
+      </caption>
+    </mediaobject>
+    <mediaobject>
+      <imageobject>
+        <imagedata format="PNG" fileref="images/menus/file/create_win.png"/>
+      </imageobject>
+      <caption>
+        <para>
+          Under Windows
+        </para>
+      </caption>
     </mediaobject>
   </figure>
 
@@ -176,11 +191,11 @@
 
   <!--TODO: somebody with scanner and/or camera should review/update this-->
   <sect3>
-    <title>Image capture devices</title>
+    <title>Scanner/Camera</title>
     <!--<anchor id="twain-acquire"/>-->
     <para>
-      This item is present only if you have  installed image capture
-      devices.
+      This item is present in Windows operating system, using TWAIN. Image 
+      input devices appear in dialog if they are plugged-in.
     </para>
     <figure>
       <title>Scanner and Camera</title>
@@ -194,8 +209,8 @@
     <para>
       The kinds of devices used to take pictures are too varied to be
       described here. Fortunately, their use is fairly intuitive. In the
-      example shown, you can start a scanner or take an image with a
-      webcam.
+      example shown (under Windows 7), you can start a scanner or load an 
+      image from a camera card.
     </para>
   </sect3>
 
diff --git a/src/toolbox/selection/rectangle.xml b/src/toolbox/selection/rectangle.xml
index dc82685..a4d90ec 100644
--- a/src/toolbox/selection/rectangle.xml
+++ b/src/toolbox/selection/rectangle.xml
@@ -2,15 +2,11 @@
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2015-12-21 j.h fixed bug #758890: deleted autoshrink option that no longer exists
   2008-03-19 JPL rewiewed & modified en
-  2007-12-01  PP rewiewed fr  and a new section added in en & fr
-  2007-10-05 lexa: reviewed de for GIMP 2.4
-  2007-08-08 added 'ko' contents by Mr.Dust
-  2007-06-02 KoSt: added 'no'
   2006-06-12 changed Ctrl+Shift section by j.h
   2005-12-06 replaced simplesect by sect3 by lexa
   2005-12-06 replaced informalfigure by figure by lexa
-  050517 de reviewed by axel.wernicke
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-tool-rect-select">
   <title>Rectangle Selection</title>
@@ -423,25 +419,6 @@
       </varlistentry>
 
       <varlistentry>
-        <term>Auto Shrink Selection</term>
-        <listitem>
-          <para>
-            The <guilabel>Auto Shrink Selection</guilabel> check-box will
-            make your next selection automatically shrink to the nearest
-            rectangular shape available on the image layer.  The
-            algorithm for finding the best rectangle to shrink to is
-            <quote>intelligent</quote>, which in this case means that it
-            sometimes does surprisingly sophisticated things, and sometimes
-            does surprisingly strange things.  In any case, if the region
-            that you want to select has a solid-colored surround,
-            auto-shrinking will always pick it out correctly.  Note that
-            the resulting selection does not need to have the
-            same shape as the one you sweep out.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term>Shrink merged</term>
         <listitem>
           <para>
diff --git a/src/using/fileformats.xml b/src/using/fileformats.xml
index adcc8fb..ddcf989 100755
--- a/src/using/fileformats.xml
+++ b/src/using/fileformats.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2015-12-21 j.h: fixed bug #691579: save color values from transparent pixels (PNG)
   2012-03-23 j.h: update to v2.8
   2007-10-06 ude: added description for "quality settings from original image"
   2007-07-15 lexa: added PackBits description
@@ -692,8 +693,12 @@
           <term>Save color values from transparent pixels</term>
           <listitem>
             <para>
-              With this option is checked, the color values are saved even if
-              the pixels are completely transparent.
+              When this option is checked, the color values are saved even if
+              the pixels are completely transparent. But this is possible only 
+              with a single layer, not with a merged composition. When a 
+              multi-layer image gets exported to a single-layer file format, 
+              there is no way <acronym>GIMP</acronym> could preserve the color 
+              values in the transparent pixels. 
             </para>
           </listitem>
         </varlistentry>
diff --git a/src/using/shortcuts.xml b/src/using/shortcuts.xml
index a5e3b9b..66ca8d6 100644
--- a/src/using/shortcuts.xml
+++ b/src/using/shortcuts.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                        "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--Version history
+  2015-12-21 j.h: fixed bug #744449
   2007-07-15 lexa: removed inappropriate step
-  2007-04-12 Added Spanish translation by AntI
-  2006-09-19 added norwegian translation by KoSt
-  2006-09-03 Added Korean content by Mr.Dust
-  2006-06-22 Added italian content by ciampix
   2005-11-01 Created by julien hardelin
 -->
 <sect1 id="gimp-concepts-shortcuts">
@@ -108,15 +105,37 @@
 
   <note>
     <para>
-      Custom Keyboard shortcuts are stored in one of Gimp's hidden
-      directory (<filename
-      class="directory">/home/[username]/.gimp-2.8/menurc</filename>)
-      under Linux, and
-      <filename class="directory"
-      role="html">C:\Documents and Settings\[Username]\.gimp-2.8\menurc</filename>
-      <filename class="directory"
-      role="tex">C:\\Documents and Settings\\[Username]\\.gimp-2.8\\menurc</filename>
-      under Windows XP.  It is a simple text file that you can transport from
+      Custom Keyboard shortcuts are stored in one of Gimp's hidden directory 
+      (<filename class="directory">/home/[username]/.gimp-2.8/menurc</filename>)
+      under Linux. Under Windows, path varies according to version:
+    </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <filename class="directory">C:\Documents and Settings\[Username]\.gimp-2.8\menurc</filename> 
+          under Windows XP. 
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <filename class="directory">C:\Program Files\GIMP 2\etc\gimp\2.0\menurc</filename> 
+          under Windows 7.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <filename class="directory">C:\Programmes\GIMP 2\etc\gimp\2.0\menurc</filename> 
+          under Windows 10.
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para>
+      More, this location may change if GIMP is installed after having 
+      already installed Git Bash or Cygwin. In this case, they will appear 
+      in <filename class="directory">C:\Program Files\Git\.gimp-[version]\menurc</filename>.
+    </para>
+    <para>
+      <quote>menu.rc</quote> is a simple text file that you can transport from
       one computer to another.
     </para>
   </note>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]