[Gnucash-changes] r14315 - htdocs/trunk - update todo; fix indent of publish instructions

[Joshua Sled]

Author: jsled
Date: 2006-06-03 19:15:28 -0400 (Sat, 03 Jun 2006)
New Revision: 14315
Trac: http://svn.gnucash.org/trac/changeset/14315

Modified:
   htdocs/trunk/README
Log:
update todo; fix indent of publish instructions


Modified: htdocs/trunk/README
===================================================================
--- htdocs/trunk/README	2006-06-03 22:50:51 UTC (rev 14314)
+++ htdocs/trunk/README	2006-06-03 23:15:28 UTC (rev 14315)
@@ -4,7 +4,6 @@
 TODO
 ----
 
-- atom (/rss) generator
 - re-work page content for new-style translations (one big block)
   - re-flow existing po-file content.
 - update features screenshots
@@ -59,11 +58,12 @@
     be "http://www.gnucash.org/".
 
 As well, the following variables should be set:
-...per directory:
 
+- per directory:
+
   $locale := the LANG to use for gettext.
 
-...per file:
+- per file:
 
   $title := the text of the page.
 
@@ -113,11 +113,11 @@
 changes from the 'trunk' into the 'published' branch.  Here's how you
 do that:
 
-  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!!!!!!!
+    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!!!!!!!