You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@incubator.apache.org by bu...@apache.org on 2017/04/29 01:43:46 UTC

svn commit: r1011335 - in /websites/staging/incubator/trunk/content: ./ guides/website.html report-next-month.html

Author: buildbot
Date: Sat Apr 29 01:43:46 2017
New Revision: 1011335

Log:
Staging update by buildbot for incubator

Modified:
    websites/staging/incubator/trunk/content/   (props changed)
    websites/staging/incubator/trunk/content/guides/website.html
    websites/staging/incubator/trunk/content/report-next-month.html

Propchange: websites/staging/incubator/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Apr 29 01:43:46 2017
@@ -1 +1 @@
-1793161
+1793162

Modified: websites/staging/incubator/trunk/content/guides/website.html
==============================================================================
--- websites/staging/incubator/trunk/content/guides/website.html (original)
+++ websites/staging/incubator/trunk/content/guides/website.html Sat Apr 29 01:43:46 2017
@@ -109,13 +109,17 @@
                 triggered by a <a href="http://svn.apache.org/repos/asf/incubator/public/trunk/build_cms.sh">CMS external build script</a>.
             </p>
 <p>
-                This means that you can edit the content either directly in svn
-                (and use ant to generate and check the results), or edit via the
-                CMS browser interface, and preview the result in your browser.  
-                In either case, you make changes in your private workspace, then
-               commit those changes, then final publishing has to be done via the CMS
-                (see below for how).  Each of these is a separate step.
-            </p>
+              You can edit the content in either of two ways:</p>
+<ol>
+              <li>directly in svn
+                (and use ant to build and check the results), or</li>
+              <li>edit via the
+                CMS browser interface, and preview the result in your browser.</li>
+            </ol>
+<p>In either case, you go through distinct phases of Edit or Add,
+                Commit, Build, Preview, and Publish.  Until the "Publish" phase, all
+                changes remain in your private workspace; then when you Publish, it becomes
+                 part of the public web site.</p>
 </div>
         <h2 id='Help+Wanted'><img src="../images/redarrow.gif" />Help Wanted!</h2>
 <div class="section-content">
@@ -135,7 +139,15 @@
         <h2 id='Edit+the+content+in+CMS'><img src="../images/redarrow.gif" />Edit the content in CMS</h2>
 <div class="section-content">
 <p>The CMS has a useful browser-based editor, that avoids the need to move between editor and SVN.
-            All steps in the process (Edit or Create, Commit, Build, Publish) can be done in the browser.</p>
+            All steps in the process (Edit or Create, Commit, Build, Preview, Publish) can be done in the browser.</p>
+<div class="note">
+<note>The CMS will routinely 
+                show you a workspace that may be months out of date.  If your podling already exists, you may not be able to
+                see it.  You also may not see edits done by others in the meantime.  After entering your workspace you must update it,
+                by clicking the "[Update]" link 
+                in the top left corner of the CMS page, as specified below.  After it updates, you should see content corresponding to the current public
+                  web site.</note>
+</div>
 <ol>
               <li>Before you start, make sure you have this javascript link bookmarked in your browser:
                 <a href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))">ASF CMS</a>.
@@ -161,11 +173,8 @@
                 new page.  For instance to add a new podling's Incubator Status page, click on "projects/" to enter path
                 .../trunk/content/projects/ , where each podling has a PROJECTNAME.xml file.</li>
               <li> Now, before you try to add or edit anything, UPDATE THE WORKSPACE YOU ARE LOOKING AT.  
-                <note>The CMS will routinely 
-                show you a workspace that may be months out of date.  If your podling already exists, you may not be able to
-                see it.  You also may not see edits done by others in the meantime.  You must update, by clicking the "[Update]" link 
-                in the top left corner of the CMS page.  After it updates, you should see content corresponding to the current public
-                  web site.</note>
+                You must do this first, or you may be very surprised at the apparent content of your workspace, and you might
+                 also cause regressions in the content.
               </li>
               <li>Now you are ready to edit.  
                 <ul>

Modified: websites/staging/incubator/trunk/content/report-next-month.html
==============================================================================
--- websites/staging/incubator/trunk/content/report-next-month.html (original)
+++ websites/staging/incubator/trunk/content/report-next-month.html Sat Apr 29 01:43:46 2017
@@ -67,7 +67,7 @@
 <h1>
 <a href="http://incubator.apache.org">Apache Incubator</a> Podlings needing to prepare report for May</h1>
 <div style="text-align:right;">
-<i>Generated on 2017-04-29T01:27:13Z</i>
+<i>Generated on 2017-04-29T01:43:20Z</i>
 </div>
 <nav>
 <ul>



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org