Author: crossley
Date: Mon Mar 26 20:38:48 2007
New Revision: 522727

URL: http://svn.apache.org/viewvc?view=rev&rev=522727
Log:
Use consistent terminology regarding release candidate packages.

Modified:
    
forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml
    
forrest/trunk/site-author/content/xdocs/procedures/release/announce_code_freeze.txt

Modified: 
forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml?view=diff&rev=522727&r1=522726&r2=522727
==============================================================================
--- 
forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml 
(original)
+++ 
forrest/trunk/site-author/content/xdocs/procedures/release/How_to_release.xml 
Mon Mar 26 20:38:48 2007
@@ -336,7 +336,7 @@
         </section>
 
         <section id="BuildDist">
-            <title>Building the distribution</title>
+            <title>Building the release candidate packages</title>
             <p>In this phase the Release Manager builds the release candidate 
to be tested.</p>
             <note>You can practice the following steps (as far as creating the 
branch) without committing anything even
                 before code-freeze. This ensures a good release 
candidate.</note>
@@ -432,18 +432,18 @@
                 </li>
                 <li>
                     <p>Take note of the SVN revision number of your trunk by 
running <code>svn info</code> from the
-                        command line in the Release Candidates root dir and 
look at the "Last Changed Rev: ######".
+                        command line in the Release Candidate's root dir and 
look at the "Last Changed Rev: ######".
                       This will be used later for the svn log message when the 
branch is created.
                       Also it is helpful for ensuring that no new commits have 
been made,
                       i.e. people forgetting the code freeze.
                       From here on watch the svn@ list.</p>
                 </li>
                 <li>
-                    <p>Now we will build the release candidates for Windows 
and Unix.</p>
+                    <p>Now we will build the release candidate packages for 
Windows and Unix.</p>
                     <ul>
                         <li>
                           Change to directory $FORREST_HOME/main and run 
<code>'build release-dist'</code>
-                          to generate the distributions.
+                          to generate the release candidate packages.
                         </li>
                     </ul>
                 </li>
@@ -453,7 +453,7 @@
                   i.e. ensure that you are not using your trunk working copy.
                 </li>
                 <li>
-                    <p id="signing">Sign the Release Candidates distribution 
file and create the *.asc and *.md5 files.</p>
+                    <p id="signing">Sign the Release Candidate packages and 
create the *.asc and *.md5 files.</p>
                     <p>Here is one example when using <a 
href="http://www.gnupg.org/(en)/download/index.html">gpg</a>
                         and openssl from the command line. </p>
                     <note>An windows version for openssl can be found at <a
@@ -485,7 +485,7 @@
 where
   'xy' is a compact form of the version (e.g. 04, 041, 05).
   '#####' is the SVN revision number that the branch was created from,
-  which was the revision that the release candidates were generated from.
+  which was the revision that the release candidate packages were generated 
from.
   (Remember that you recorded this number earlier.)
                   </source>
                   <p> See <a 
href="http://svn.apache.org/repos/asf/forrest/branches/";>http://svn.apache.org/repos/asf/forrest/branches/</a>
@@ -497,10 +497,10 @@
 
         <section id="vote">
             <title>Testing the release candidate and voting</title>
-            <p>Get Forrest developers to test the actual distribution on 
various platforms.</p>
+            <p>Get Forrest developers to test the actual packges on various 
platforms.</p>
             <ol>
                 <li>
-                  Upload the release candidates and signatures to your 
committer's webspace.
+                  Upload the release candidate packages and signatures to your 
committer's webspace.
                 </li>
                 <li>
                     <p>Use template <a 
href="test_and_vote_on_rel_cand.txt">test_and_vote_on_rel_cand.txt</a> for an
@@ -512,7 +512,7 @@
                 <li>
                     <p>During this testing phase, the Release Manager 
should:</p>
                     <ul>
-                        <li>Make sure that people are reporting that the 
distributions unpack on different systems without problems.</li>
+                        <li>Make sure that people are reporting that the 
packages unpack on different systems without problems.</li>
                         <li>Make sure that people have followed the actual 
user instructions in the Forrest
                             distribution at README.txt and index.html</li>
                         <li>Encourage people to build some difficult 
sites.</li>
@@ -526,7 +526,7 @@
                   minor stuff or add some pet new feature that they have 
neglected. That can easily
                   introduce new problems.
                 </li>
-                <li>If necessary start again with <a 
href="#BuildDist">Building the distribution</a> and build another
+                <li>If necessary start again with <a 
href="#BuildDist">Building the packages</a> and build another
                     release candidate.</li>
                 <li>Tally the votes and report the result to the dev list.</li>
             </ol>
@@ -710,7 +710,7 @@
                     to be ready for the next release.</p>
                     <fixme author="fso">I'd like to drop this step and rather 
word everything more flexibly.</fixme>
                 </li>
-                <li><p>Remove the release candidates from your public_html 
directory.</p></li>
+                <li><p>Remove the release candidate packages from your 
public_html directory.</p></li>
             </ol>
             
         </section>

Modified: 
forrest/trunk/site-author/content/xdocs/procedures/release/announce_code_freeze.txt
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/procedures/release/announce_code_freeze.txt?view=diff&rev=522727&r1=522726&r2=522727
==============================================================================
--- 
forrest/trunk/site-author/content/xdocs/procedures/release/announce_code_freeze.txt
 (original)
+++ 
forrest/trunk/site-author/content/xdocs/procedures/release/announce_code_freeze.txt
 Mon Mar 26 20:38:48 2007
@@ -1,7 +1,7 @@
 Subject: [Important] code-freeze commenced
 
-The code-freeze is now happening to allow us to pack the
-release candidates and make them available for testing.
+The code-freeze is now happening to allow us to prepare the
+release candidate packages and make them available for testing.
 
 Code-freeze means *no* non-essential commits to the trunk
 or to the new release branch. Other branches are free to
@@ -30,6 +30,6 @@
 * Actual release date is [date]
   [www.timeanddate.com-URL]
 
-Now we will go and build the releases which might take
+Now we will go and build the packages which might take
 some time. The next message will tell you where to get
-the release candidates and describe how to test.
+the release candidate packages and describe how to test.