# HG changeset patch
# User Klaus Ethgen <Klaus@Ethgen.de>
# Date 1538818228 -3600
# Node ID ea80e3ff1fd511ba9038024fbeb460b53c7a5fe3
# Parent  f5ba362b38087fb709923e568c300c2e7136621c# Parent  6b2afeae4d23e66e0a38fe35113df1eb4022c779
Merge merge requests for completeness

* github/merge-requests/633:
  Fix typo geqqie/geeqie

* github/merge-requests/632:
  Add FILES section to man

diff -r 6b2afeae4d23 -r ea80e3ff1fd5 geeqie.1
--- a/geeqie.1	Sun Sep 23 22:05:03 2018 +0200
+++ b/geeqie.1	Sat Oct 06 10:30:28 2018 +0100
@@ -644,59 +644,6 @@
 close window
 .br
 
-.SH FILES
-The following data lists the locations Geeqie uses for various actions. The
-uppercase symbols are environment variables. If they are not set on your system
-the fallback locations are listed in parentheses. Geeqie will first attempt to
-load a configuration file from:
-
-.B /etc/geeqie/geeqierc.xml
-
-It will then continue with the following locations.
-Most of Geeqie's configuration files are contained in the folder, and sub-folders of:
-
-.B $XDG_CONFIG_HOME/geeqie/
-.B ($~/.config/geeqie/)
-
-Geeqie's standard configuration file is:
-
-.B .../geeqierc.xml
-
-An alternative configuration file may be used by executing:
-
-.B geeqie -r --config-load:<filename>
-
-Geeqie-created desktop files used by Plugins are in the folder:
-
-.B .../applications
-
-Lua script files for Lua Extensions are in the folder:
-
-.B .../lua
-
-Historic data such as last several folders visited, bookmarks, and recently used collections, as well as default print settings are contained in this text file:
-
-.B .../history
-
-Keyboard shortcut maps are contained in this text file:
-
-.B .../accels
-
-The location for Collections is in the folder:
-
-.B $XDG_DATA_HOME/geeqie/collections
-.br
-.B ($~/.local/share/geeqie/collections)
-
-The lirc Infra-red controller configuration file must be located at:
-
-.B $HOME/.lircrc
-
-Thumbnails are stored in a location specified in Thumbnail Preferences
-
-Metadata is stored either in the image file or in the location specified in Safe Delete
-
-The safe delete folder is specified in the Metadata tab of main Preferences
 
 .SH LICENSE
 Copyright (C) 1999-2004 by John Ellis.
diff -r 6b2afeae4d23 -r ea80e3ff1fd5 web/help/GuideReferenceConfig.html
--- a/web/help/GuideReferenceConfig.html	Sun Sep 23 22:05:03 2018 +0200
+++ b/web/help/GuideReferenceConfig.html	Sat Oct 06 10:30:28 2018 +0100
@@ -462,7 +462,7 @@
 </ul>
 <p class="para block block-first">The following data lists the locations Geeqie uses for various actions. The uppercase symbols are environment variables. If they are not set on your system the fallback locations are listed in parentheses.</p>
 <p class="para block">
-    Geqqie will first attempt to load a configuration file from:
+    Geeqie will first attempt to load a configuration file from:
     <div dir="ltr" class=" block programlisting block-indent block-first"><pre class="programlisting">/etc/geeqie/geeqierc.xml</pre></div>
   </p>
 <p class="para block">It will then continue with the following locations.</p>