incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1297584 - /incubator/public/trunk/content/guides/website.xml
Date Tue, 06 Mar 2012 17:28:13 GMT
Author: joes
Date: Tue Mar  6 17:28:13 2012
New Revision: 1297584

URL: http://svn.apache.org/viewvc?rev=1297584&view=rev
Log:
update for CMS migration

Modified:
    incubator/public/trunk/content/guides/website.xml

Modified: incubator/public/trunk/content/guides/website.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/content/guides/website.xml?rev=1297584&r1=1297583&r2=1297584&view=diff
==============================================================================
--- incubator/public/trunk/content/guides/website.xml [utf-8] (original)
+++ incubator/public/trunk/content/guides/website.xml [utf-8] Tue Mar  6 17:28:13 2012
@@ -34,23 +34,25 @@ limitations under the License.
          href="http://svn.apache.org/repos/asf/infrastructure/site/trunk/README"
          >site README</a> of use.  Note that there are some minor differences
          between the main apache.org site and the incubator site (namely that
-         xdocs becomes site-author and docs becomes site-publish).</p>
+         the build system differs and the incubator is based on xml documents
+         instead of markdown docs).</p>
 
 
       <p>The source documents are kept in the "incubator" SVN repository at
-         "site-author". The status reports for each project are in
-         site-author/project/</p>
+         "content". The status reports for each project are in
+         content/project/</p>
 
-      <p>The production documents are kept in the "incubator" SVN repository
-         at "site-publish". That directory is then checked-out on the server
-         to re-create the website.</p>
+      <p>The production documents are kept in the "infra" SVN repository
+        at https://svn.apache.org/repos/infra/websites/production/incubator.
+        That directory is then managed by svnpubsub on the server
+         to re-create the live website.</p>
 
     </section>
     <section id="Edit+the+content">
       <title>Edit the content</title>
 
       <p>People with commit access to the "incubator" SVN can edit the source
-         documents in the "site-author" directory. That is any ASF Member and
+         documents in the "content" directory. That is any ASF Member and
          any committer on a current podling in incubation. So you can all help to
          keep your project's Status page up-to-date, and if you find problems with
          the "guidelines" docs then can immediately fix them.
@@ -71,16 +73,16 @@ cd incubator
       <section id="Edit+the+source+documents">
         <title>Edit the source documents</title>
 
-        <p>The source content is in Anakia xdoc format at "site-author"
+        <p>The source content is in Anakia xdoc format at the "content"
            directory.</p>
 
       </section>
       <section id="Add+a+new+document">
         <title>Add a new document</title>
 
-        <p>Add new documents in the site-author directories, then do 'svn add'.
+        <p>Add new documents in the content directories, then do 'svn add'.
   If your new documents need to be navigable from the left-hand side menu, then
-  add a new entry to the site-author/stylesheets/project.xml file in the "projects" element
(yes, sorry, it is a hangover from an old configuration).
+  add a new entry to the content/stylesheets/project.xml file in the "projects" element (yes,
sorry, it is a hangover from an old configuration).
         </p>
         <p>If you are adding a new podling, then see the steps in the following section.
         </p>
@@ -88,13 +90,13 @@ cd incubator
       <section id="Edit+your+project+status+page">
         <title>Edit your project status page</title>
         <p>The sources for the status pages are in
-           <code>site-author/projects/*.xml</code></p>
+           <code>content/projects/*.xml</code></p>
         <section id='create-status-page'><title>Create Status Page</title>
         <ol>
            <li>
            Copy from the template
-           <code>site-author/projects/incubation-status-template.xml</code> to
-           <code>site-author/projects/${project}.xml</code> then <code>'svn
add'</code>
+           <code>content/projects/incubation-status-template.xml</code> to
+           <code>content/projects/${project}.xml</code> then <code>'svn
add'</code>
            </li>
            <li>
            The copied template contains customization instructions. Follow them.
@@ -106,11 +108,11 @@ cd incubator
            </li>
            <li>
            Add an entry with status "current" to the podlings summary file at
-           <code>site-author/podlings.xml</code> and ensure that the
+           <code>content/podlings.xml</code> and ensure that the
            list of mentors is up-to-date.
            </li>
            <li>
-           Add an entry to the right-hand menu at <code>site-author/stylesheets/project.xml</code>
in the "menu" element.
+           Add an entry to the right-hand menu at <code>content/stylesheets/project.xml</code>
in the "menu" element.
            </li>
            <li>
            Do <code>'svn update'</code> to be sure you are up-to-date.
@@ -119,18 +121,17 @@ cd incubator
            Regenerate the documentation by running <code>'ant'</code> or <code>'build'</code>
from the top-level.
            See more detail about this process in the following section. Note that
            there will be many output changes because a new entry has been added to
-           the right-hand menu which is replicated on every page.
-           </li>
-           <li>
-           <code>svn add</code> the generated status report 
-           <code>site-publish/projects/${project}.html</code>
-           </li>
+           the right-hand menu which is replicated on every page.  The results wil
+           be built to the site-publish directory by default- please look them over,
+           but do not add this directory nor its contents to svn!
+            </li>
            <li>
            <code>svn commit</code> all the changes with a good message
            </li>
            <li>
-           Update the copy in the staging directory <code>/www/incubator.apache.org</code>.
-           It may take a few hours before the live website is sync'd.
+           Wait a minute or two for the CMS to build your changes, then publish them
+           by visiting the <a href="https://cms.apache.org/incubator/publish">Publish
site</a>
+           page.  
            See other <a href="http://www.apache.org/dev/project-site.html">notes</a>
            about this step.
            </li>
@@ -151,13 +152,8 @@ cd incubator
            (If you don't have ant installed, you can run build.sh or build.bat
            instead.)  If the site built without errors, then do the usual
            SVN stuff: 'svn status' 'svn add' 'svn diff' 'svn commit'.</p>
-        <p>To update the website, the "incubator/site-publish" SVN directory
-           is checked-out on the apache.org web server.</p>
-        <code>
-ssh people.apache.org<br />
-cd /www/incubator.apache.org<br />
-svn update
-</code>
+        <p>To update the website, visit <a href="https://cms.apache.org/incubator/publish">Publish
site</a>
+        and fill out the form.  Don't forget to give the CMS build system time to build your
changes!</p>
     </section>
     <section id="other">
       <title id="other">Other notes</title>



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


Mime
View raw message