r18463 - htdocs/trunk - Update htdocs README file

[Geert Janssens]

Author: gjanssens
Date: 2009-12-04 10:45:47 -0500 (Fri, 04 Dec 2009)
New Revision: 18463
Trac: http://svn.gnucash.org/trac/changeset/18463

Modified:
   htdocs/trunk/README
Log:
Update htdocs README file

* Remove the obsolete procedure to publish changes from trunk to publised
* Add a note about a beta environment for the website

Modified: htdocs/trunk/README
===================================================================
--- htdocs/trunk/README	2009-12-03 23:56:37 UTC (rev 18462)
+++ htdocs/trunk/README	2009-12-04 15:45:47 UTC (rev 18463)
@@ -112,17 +112,22 @@
 Publishing the website
 ----------------------
 
-Once you've got the website content up to date, you need to publish
-the content from the beta site to the main website (and beta search
-site to the main search site).  To do this, you need to merge your
-changes from the 'trunk' into the 'published' branch.  Here's how you
-do that:
+Changes that are committed to 'trunk' are published automatically.
+No other steps are required.
 
-    svn checkout .../repo/htdocs/branches/published htdocs-pub
-    cd htdocs-pub
-    svn log --stop-on-copy emulate-globals.php
-    # find the last merge point from trunk
-    svn merge -r <last_merge_point>:<head_rev> .../htdocs/trunk
-    # resolve conflicts
-    svn commit
-    # Make sure you put <head_rev> into your comment!!!!!!!
+------------------------
+Website beta environment
+------------------------
+
+Some changes may be too drastic or experimental to push to the public
+website. There is a beta website available as well on
+
+http://www.gnucash.org/beta/
+
+To work in this beta environment, checkout the beta branch from svn:
+
+svn checkout http://svn.gnucash.org/repo/htdocs/branches/beta htdocs-beta
+
+WARNING: this branch is currently not kept in sync with trunk. So if you
+         intend to experiment with the current conten in trunk, please ask
+         one of the devs to merge the current trunk to beta first !