Author: veithen
Date: Tue Nov 24 20:39:11 2015
New Revision: 1716250
URL: http://svn.apache.org/viewvc?rev=1716250&view=rev
Log:
Update release procedure.
Modified:
webservices/axiom/trunk/devguide/src/docbkx/devguide.xml
Modified: webservices/axiom/trunk/devguide/src/docbkx/devguide.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/devguide/src/docbkx/devguide.xml?rev=1716250&r1=1716249&r2=1716250&view=diff
==============================================================================
--- webservices/axiom/trunk/devguide/src/docbkx/devguide.xml (original)
+++ webservices/axiom/trunk/devguide/src/docbkx/devguide.xml Tue Nov 24
20:39:11 2015
@@ -1164,7 +1164,7 @@ javax.xml.stream.XMLOutputFactory=com.be
https://svn.apache.org/repos/asf/webservices/website/axiom-staging</screen>
<tip>
<para>
- This step can be skipped if the staging area
already exists and is in a state where it can cleanly be merged.
+ This step can be skipped if the staging area has
already been created earlier (e.g. to test a snapshot version of the site).
</para>
</tip>
</step>
@@ -1230,9 +1230,10 @@ javax.xml.stream.XMLOutputFactory=com.be
<para>
Publish the site:
</para>
-<screen>svn co https://svn.apache.org/repos/asf/webservices/website/axiom
axiom-site
-cd axiom-site/
-svn merge https://svn.apache.org/repos/asf/webservices/website/axiom-staging
+<screen>svn co --depth=immediates
https://svn.apache.org/repos/asf/webservices/website ws-site
+cd ws-site
+svn rm axiom
+svn mv axiom-staging axiom
svn commit</screen>
</step>
</procedure>
