svn commit: r1878945 - /commons/cms-site/trunk/content/xdoc/releases/prepare.xml

[se...@apache.org]

Author: sebb
Date: Wed Jun 17 23:49:07 2020
New Revision: 1878945

URL: http://svn.apache.org/viewvc?rev=1878945&view=rev
Log:
Minor edits

Modified:
    commons/cms-site/trunk/content/xdoc/releases/prepare.xml

Modified: commons/cms-site/trunk/content/xdoc/releases/prepare.xml
URL: http://svn.apache.org/viewvc/commons/cms-site/trunk/content/xdoc/releases/prepare.xml?rev=1878945&r1=1878944&r2=1878945&view=diff
==============================================================================
--- commons/cms-site/trunk/content/xdoc/releases/prepare.xml (original)
+++ commons/cms-site/trunk/content/xdoc/releases/prepare.xml Wed Jun 17 23:49:07 2020
@@ -543,7 +543,25 @@ mvn versions:display-plugin-updates -U</
           you can either use the Maven release plugin or create the tag manually.  In either case, record
           the svn revision number, you'll need it for the release vote mail.</p>
 
+      <h4>Tag Name Convention<a name="Tag_Name_convention"></a></h4>
+      <p>
+        The naming of release candidates' tag for "Commons" projects should be done according to the following convention:
+      </p>
+      <pre>
+        &lt;name&gt;-&lt;x.y[.z]&gt;[-beta&lt;m&gt;]-rc&lt;n&gt;
+      </pre>
+      <p>
+        where the <code>name</code> is the identifier of the component prefixed with <code>commons-</code>,
+        <code>x.y[.z]</code> is the version number,
+        the <code>beta</code> qualifier indicates a release that has no backwards compatibility requirements,
+        <code>m</code> is an integer indicating how many beta releases were created towards the upcoming version,
+        and <code>n</code> is an integer indicating how many releases candidates have been created.
+      </p>
+
       <h4>Manual Method<a name="Manual_Method"></a></h4>
+
+      <h5>Manual Method (SVN)<a name="Manual_Method_SVN"></a></h5>
+
         <p>Create a clean SVN workspace for the release candidate:</p>
       <pre>
       svn co https://svn.apache.org/repos/asf/commons/proper/foo/trunk foo-1.2-RC1
@@ -578,21 +596,7 @@ mvn versions:display-plugin-updates -U</
         Also, by leaving trunk unchanged, nothing needs to be reverted if the RC vote fails and the Rc needs to be re-rolled.
       </p>
 
-      <strong>Tagging with git</strong>
-
-      <p>
-        The naming of release candidates' tag for "Commons" projects should be done according to the following convention:
-      </p>
-      <pre>
-        &lt;name&gt;-&lt;x.y[.z]&gt;[-beta&lt;m&gt;]-rc&lt;n&gt;
-      </pre>
-      <p>
-        where the <code>name</code> is the identifier of the component prefixed with <code>commons-</code>,
-        <code>x.y[.z]</code> is the version number,
-        the <code>beta</code> qualifier indicates a release that has no backwards compatibility requirements,
-        <code>m</code> is an integer indicating how many beta releases were created towards the upcoming version,
-        and <code>n</code> is an integer indicating how many releases candidates have been created.
-      </p>
+      <h5>Manual Method (Git)<a name="Manual_Method_Git"></a></h5>
 
       <p>
       After editing the version fields in the POMs: