- update: upgrade from 1.4.0 or 1.4.1. Upgrade from 1.3.x is not available

  anymore.

- update: README files updated for very near branch 1.5 :-)

- new: file tools/config_local.inc.php as example for optional
  include/config_local.inc.php

- bug fixed: configuration parameter show_picture_name_on_title was useless


git-svn-id: http://piwigo.org/svn/trunk@870 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 44 insertions, 34 deletions

diff --git a/doc/README_en.txt b/doc/README_en.txt
index 844dc327c..88766f79c 100644
--- a/doc/README_en.txt
+++ b/doc/README_en.txt
@@ -1,12 +1,12 @@
-                               PhpWebGallery
+=============
+PhpWebGallery
+=============
 
-official website   : http://phpwebgallery.net
-documentation      : http://doc.phpwebgallery.net
-forum              : http://forum.phpwebgallery.net
+http://phpwebgallery.net
 
-+-----------------------------------------------------------------------------+
-|                        Installation instructions                            |
-+-----------------------------------------------------------------------------+
+
+Installation
+============
 
 1. extract files from the downloaded file (using tar or unzip command, or
    softwares like 7-zip or winzip)
@@ -17,9 +17,8 @@ forum              : http://forum.phpwebgallery.net
 3. go to the URL http://your.domain/gallery/install.php and follow the
    instructions of installation
 
-+-----------------------------------------------------------------------------+
-|                           Upgrade instructions                              |
-+-----------------------------------------------------------------------------+
+Upgrade
+=======
 
 1. elements to save :
 
@@ -40,9 +39,8 @@ forum              : http://forum.phpwebgallery.net
 5. go to the URL http://your.domain/gallery/upgrade.php and follow the
    instructions
 
-+-----------------------------------------------------------------------------+
-|                              How to start                                   |
-+-----------------------------------------------------------------------------+
+How to start
+============
 
 Once installed or upgraded, your gallery is ready to run. Start by
 displaying the installation directory in your browser :
@@ -55,37 +53,49 @@ page will appear : Administration. Enter the administration panel.
 In the administration panel, take all your time for reading instructions
 explaining how to use your gallery.
 
-+-----------------------------------------------------------------------------+
-|                               Newsletter                                    |
-+-----------------------------------------------------------------------------+
+Communication
+=============
+
+Newsletter
+----------
+
+https://gna.org/mail/?group=phpwebgallery
 
 It is *highly* recommended to subscribe to PhpWebGallery newsletter. This is
 extremely low-traffic, but will provide you with announcements of new
 PhpWebGallery releases and serious bug notification. You will find available
 mailing lists at this URL :
 
-                 https://gna.org/mail/?group=phpwebgallery
+No spam, no commercial use.
+
+Freshmeat
+---------
+
+http://freshmeat.net/projects/phpwebgallery
+
+Want to stay informed at each release, stable and development
+release. Development releases notification are not send in the newsletter.
+
+Bugtracker
+----------
+
+http://bugs.phpwebgallery.net
 
-Be sure that the mail address you are going to give for newsletter is
-completely unreadable by someone else than PhpWebGallery team and not
-present on any web page (a web search engine won't find it).
+Bugs and change requests tracking. The best way to have your bug corrected:
+it won't be forgotten (as in the forum).
 
-PhpWebGallery also assure you that your mail address will NEVER be used for
-something else than PhpWebGallery informations.
+Wiki
+----
 
-+-----------------------------------------------------------------------------+
-|                             Discussion forum                                |
-+-----------------------------------------------------------------------------+
+http://phpwebgallery.net/doc
 
-A forum is available and recommended for any question (installation, bug
-reports, new feature requests) :
+Wiki documentation: everyone can participate to improve documentation
+content.
 
-                     http://forum.phpwebgallery.net
+Message board
+-------------
 
-Before asking any question on the forum, do not hesitate to search for
-related topics... other users may have found same bugs, had same requests.
+http://forum.phpwebgallery.net
 
-PhpWebGallery forum is a place open to every one. Please be always
-respectful in this place. Consider also that clear messages (with simple and
-direct subjects) are always prefered. It is forbidden (and useless) to say
-that your question is "urgent", you won't be answered in priority.
+All communications (installation help, technical discussions) that can't be
+done in other channels.