gnucash-htdocs beta: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/81bfba94 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/89103003 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/6d05ae29 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/36dc1a2c (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/d1fc3bd9 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/76cb23f3 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/6364baa9 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/b94a7bc6 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/28868974 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/fdf6d945 (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/d4fa5857 (commit)



commit 81bfba94e2bf05f2d9e6782c6bd851dfc4e121b9
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Fri Feb 21 11:19:44 2014 +0100

    Explain how to set up docs softlink on webserver

diff --git a/.gitignore b/.gitignore
index 4b79116..4b446b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+docs
 gnucash-htdocs.pot
 POTFILES
 messages.mo
diff --git a/README b/README
index 071ccb5..efb3657 100644
--- a/README
+++ b/README
@@ -75,6 +75,11 @@ Note about folders
 - "externals" folder contains images linked to external sources (e.g. logo_w120.png
   is used on the wiki and packtpub_gnucash_2.4cov.png is linked to the external 
   book website)
+- "docs" is supposed to hold copies of the compiled documentation (html, pdf, epub,...)
+  This used to be a version managed directory inside this repository. It has been
+  moved into a separate repository in 2014. The php website code still assumes this directory
+  to exist though. So in order to satisfy this code a softlink should be set up
+  on the webserver: docs->"real location of compiled docs"
 
 ----------------------
 Preparing translations

commit 89103003728d000dfd2180ee0c1301c68e0361f5
Merge: 6d05ae2 d4fa585
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Fri Feb 21 11:09:47 2014 +0100

    Reset beta to master (while keeping history)
    
        This is done by this series of commands
        1. git checkout master
        2. git checkout -b tmp # Creates a temporary branch at the head of master
        3. git merge -s ours beta # Discards all changes from beta
        4. git checkout beta
        5. git reset --hard tmp # Sets beta HEAD to the merged HEAD
        6. git branch -d tmp
        (Optional)
        7. git commit --amend # To improve the commit message




Summary of changes:
 .gitignore                                         |  1 +
 .htaccess                                          | 34 ++++++++++++----------
 README                                             |  5 ++++
 browserconfig.xml                                  |  0
 docs.phtml                                         |  4 +--
 features.phtml                                     |  3 +-
 news/000427-newshots.news                          |  7 -----
 ...ews => 140213-Gnucash-htdocs-Regeneration.news} |  0
 po/nl.po                                           |  2 +-
 9 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 browserconfig.xml
 delete mode 100644 news/000427-newshots.news
 rename news/{140203-Gnucash-htdocs-Regeneration.news => 140213-Gnucash-htdocs-Regeneration.news} (100%)