Author: buildbot
Date: Sun Jan 13 13:54:55 2013
New Revision: 846474
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:54:55 2013
@@ -1 +1 @@
-1432619
+1432620
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:54:55 2013
@@ -85,36 +85,35 @@ the Apache Infrastructure pages includin
<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>
-<div class="codehilite"><pre><span class="mi">1</span><span class="o">.</span>
<span class="n">If</span> <span class="n">the</span> <span
class="n">changes</span> <span class="n">are</span> <span
class="n">structurally</span> <span class="n">significant</span> <span
class="p">(</span><span class="n">many</span> <span class="n">pages</span>
<span class="n">removed</span><span class="o">/</span><span
class="n">added</span><span class="p">,</span> <span class="n">etc</span><span
class="o">.</span><span class="p">),</span>
-</pre></div>
-
-
-<p>before committing to staging you may wish to test that the site still
builds locally
+<ol>
+<li>
+<p>If the changes are structurally significant (many pages removed/added,
etc.),
+before committing to staging 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 to ensure stylesheets are working as intended.<br />
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>
-<div class="codehilite"><pre><span class="mi">2</span><span class="o">.</span>
<span class="n">Commit</span> <span class="n">a</span> <span
class="n">change</span> <span class="n">to</span> <span class="n">the</span>
<span class="n">website</span><span class="err">'</span><span
class="n">s</span> <span class="n">source</span> <span class="p">[</span><span
class="n">Markdown</span><span class="p">]</span><span class="o">[]</span>
<span class="n">files</span> <span class="n">located</span> <span
class="n">in</span>
-</pre></div>
-
-
-<p><a href="https://svn.apache.org/repos/asf/roller/cmssite/trunk";
class="external">
+</li>
+<li>
+<p>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>. If you're not a
committer, supplying a patch to our JIRA issue tracker instead will do. </p>
-<div class="codehilite"><pre><span class="mi">3</span><span class="o">.</span>
<span class="n">Wait</span> <span class="n">a</span> <span class="n">few</span>
<span class="n">minutes</span> <span class="n">to</span> <span
class="n">get</span> <span class="n">the</span> <span class="n">email</span>
<span class="n">on</span> <span class="n">the</span> <span
class="n">commits</span> <span class="n">list</span> <span
class="n">that</span> <span class="n">buildbot</span> <span class="n">has</span>
-</pre></div>
-
-
-<p>rebuilt the <a href="http://roller.staging.apache.org/";>staging
website</a>.</p>
-<div class="codehilite"><pre><span class="mi">4</span><span class="o">.</span>
<span class="n">If</span> <span class="n">the</span> <span
class="n">change</span> <span class="n">looks</span> <span
class="n">ok</span><span class="p">,</span> <span class="n">publish</span>
<span class="n">the</span> <span class="n">change</span> <span
class="n">to</span> <span class="n">the</span> <span
class="n">production</span> <span class="n">website</span> <span
class="n">by</span>
-
-<span class="o">*</span> <span class="p">(</span><span
class="n">recommended</span> <span class="n">method</span><span
class="p">)</span> <span class="n">Using</span> <span class="n">the</span>
<span class="n">Apache</span> <span class="n">bookmarklet:</span> <span
class="p">[</span><span class="n">Publish</span> <span
class="n">site</span><span class="p">]</span><span class="o">[]</span>
-<span class="o">*</span> <span class="n">curl</span> <span
class="o">-</span><span class="n">sL</span> <span class="n">http:</span><span
class="sr">//s</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="o">/</span><span
class="n">cms</span><span class="o">-</span><span class="n">cli</span> <span
class="o">|</span> <span class="n">perl</span> <span class="n">on</span> <span
class="n">your</span> <span class="nb">local</span> <span
class="n">machine</span>
-<span class="o">*</span> <span class="n">ssh</span> <span
class="o">-</span><span class="n">t</span> <span
class="sr"><user\></span><span class="nv">@people</span><span
class="o">.</span><span class="n">apache</span><span class="o">.</span><span
class="n">org</span> <span class="n">publish</span><span
class="o">.</span><span class="n">pl</span> <span class="n">roller</span> <span
class="o"><</span><span class="n">your</span> <span class="n">Apache</span>
<span class="n">ID</span><span class="o">\></span>
-</pre></div>
-
-
+</li>
+<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, publish the change to the production website by </p>
+<ul>
+<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 <user>@people.apache.org publish.pl roller <your Apache
ID></li>
+</ul>
+</li>
+</ol>
<h2 id="style">Style</h2>
<ul>
<li>Try to limit line length to 80 columns, fold -s <filename> on Linux is
