harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r921434 - in /harmony/standard/site/branches/live: ./ README.txt
Date Wed, 10 Mar 2010 16:27:15 GMT
Author: tellison
Date: Wed Mar 10 16:27:14 2010
New Revision: 921434

URL: http://svn.apache.org/viewvc?rev=921434&view=rev
Log:
Update site editing instructions.

Modified:
    harmony/standard/site/branches/live/   (props changed)
    harmony/standard/site/branches/live/README.txt

Propchange: harmony/standard/site/branches/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 10 16:27:14 2010
@@ -1 +1 @@
-/harmony/standard/site/trunk:822221-921416
+/harmony/standard/site/trunk:822221-921433

Modified: harmony/standard/site/branches/live/README.txt
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/README.txt?rev=921434&r1=921433&r2=921434&view=diff
==============================================================================
--- harmony/standard/site/branches/live/README.txt (original)
+++ harmony/standard/site/branches/live/README.txt Wed Mar 10 16:27:14 2010
@@ -2,37 +2,39 @@ Here's how to edit and publish the websi
 that this assumes you have a working implementation 
 of Java and Ant installed.
 
+1) Checkout a working copy of the site
 
-1) Edit the docs in xdocs/
+   svn co https://svn.apache.org/repos/asf/harmony/standard/site/trunk
+   cd trunk
 
-2) Type "ant" in the root (site/)
+2) Edit the docs in xdocs/
 
-3) Look at the changes in the docs/ directory using
-   a web browser.
+3) Type "ant" in the root (trunk/)
 
-4) Repeat steps 2-4 until happiness and joy achieved.
+4) Look at the changes in the docs/ directory using
+   a web browser.
 
 5) Commit all changes, both docs/ and xdocs/
    
-    svn commit
+   svn commit
+
+6) Review your changes on the staging server
 
-6) ssh to minotaur
+   http://harmony.staging.apache.org
 
-7) cd /www/harmony.apache.org
+7) Repeat steps 1-6 until happiness and joy achieved.
 
-8) execute 
-    
-    umask 02; svn update
+8) Merge changes into the live website
 
-   to update the just-committed docs out of SVN
+   svn co https://svn.apache.org/repos/asf/harmony/standard/site/branches/live
+   cd live
+   svn merge https://svn.apache.org/repos/asf/harmony/standard/site/trunk
+   # review changes
+   svn ci -m "Merging from trunk."
 
 9) Verify that all went as planned by browsing the live 
     site 
 
       http://harmony.apache.org
 
-    and look for the changes you made.  Note that it may take up
-    to an hour after step (8) is complete before the changes are
-    reflected on the live website.
-
-
+    and look for the changes you made.



Mime
View raw message