Author: buildbot
Date: Sun Jan 13 13:49:57 2013
New Revision: 846472

Log:
Staging update by buildbot for roller

Modified:
    websites/staging/roller/trunk/content/   (props changed)
    websites/staging/roller/trunk/content/downloads/edit_website.html

Propchange: websites/staging/roller/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jan 13 13:49:57 2013
@@ -1 +1 @@
-1432608
+1432616

Modified: websites/staging/roller/trunk/content/downloads/edit_website.html
==============================================================================
--- websites/staging/roller/trunk/content/downloads/edit_website.html (original)
+++ websites/staging/roller/trunk/content/downloads/edit_website.html Sun Jan 
13 13:49:57 2013
@@ -80,32 +80,34 @@
       
       <div class="tabs">
         <div id="pagecontent">
-          <p>(adapted from MRUnit site)</p>
-<p>The website uses the Apache CMS. More detailed documentation is available 
on 
+          <p>The website uses the Apache CMS. More detailed documentation is 
available on 
 the Apache Infrastructure pages including a quickstart guide on the
 <a href="http://apache.org/dev/cms.html#usage";>Apache bookmarklet</a> and a <a 
href="http://apache.org/dev/cmsref.html";>reference manual</a>. It is also 
useful to look at
 <a href="http://apache.org/dev/cmsadoption.html";>other Apache CMS sites</a> 
for examples.</p>
 <h2 id="process">Process</h2>
 <ol>
-<li>
-<p>Commit a change to the website's source <a 
href="http://daringfireball.net/projects/markdown/syntax";>Markdown</a> files 
located in
+<li>Commit a change to the website's source <a 
href="http://daringfireball.net/projects/markdown/syntax";>Markdown</a> files 
located in
 <a href="https://svn.apache.org/repos/asf/roller/cmssite/trunk"; 
class="external">
-https://svn.apache.org/repos/asf/roller/cmssite/trunk</a>. 
-Before committing, test that the site still builds locally by following
-<a href="http://apache.org/dev/cmsref.html#local-build";>these 
instructions</a>.</p>
-<p>If deleting a file or changing the name of a file make a trivial edit to
-lib/path.pm or lib/view.pm to force a full site rebuild. If making a simple 
edit
-it is easier to just use the Apache bookmarklet.</p>
-</li>
+https://svn.apache.org/repos/asf/roller/cmssite/trunk</a>.  If you're not a
+committer, supplying a patch to our JIRA issue tracker instead will do.</li>
+</ol>
+<p>If the changes are structurally significant (many pages removed/added, 
etc.),
+before committing you may wish to test that the site still builds locally by 
+following <a href="http://apache.org/dev/cmsref.html#local-build";>these 
instructions</a>.  Note: You will probably lose the CSS 
+formatting with local builds due to the way the stylesheets are referenced, 
+check instead at staging (next step) to make sure stylesheets are working
+as intended.</p>
+<p>If deleting a file or changing the name of a file make a trivial 
+edit to lib/path.pm or lib/view.pm to force a full site rebuild.</p>
+<ol>
 <li>
 <p>Wait a few minutes to get the email on the commits list that buildbot has
 rebuilt the <a href="http://roller.staging.apache.org/";>staging 
website</a>.</p>
 </li>
 <li>
-<p>If the change looks ok, commit the change to the production website by one
-of the following:</p>
+<p>If the change looks ok, publish the change to the production website by </p>
 <ul>
-<li>Using the Apache bookmarklet and selecting <a 
href="https://cms.apache.org/roller/publish";>Publish site</a></li>
+<li>(recommended method) Using the Apache bookmarklet: <a 
href="https://cms.apache.org/roller/publish";>Publish site</a> </li>
 <li>curl -sL http://s.apache.org/cms-cli | perl on your local machine</li>
 <li>ssh -t &lt;user>@people.apache.org publish.pl roller &lt;your Apache 
ID></li>
 </ul>


Reply via email to