incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r374901 - in /incubator/public/trunk: site-author/guides/website.xml site-publish/guides/website.html
Date Sat, 04 Feb 2006 18:26:41 GMT
Author: jerenkrantz
Date: Sat Feb  4 10:26:39 2006
New Revision: 374901

URL: http://svn.apache.org/viewcvs?rev=374901&view=rev
Log:
Update and clean up the how-to-update the website page.

Modified:
    incubator/public/trunk/site-author/guides/website.xml
    incubator/public/trunk/site-publish/guides/website.html

Modified: incubator/public/trunk/site-author/guides/website.xml
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/site-author/guides/website.xml?rev=374901&r1=374900&r2=374901&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/website.xml (original)
+++ incubator/public/trunk/site-author/guides/website.xml Sat Feb  4 10:26:39 2006
@@ -1,102 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <title>Updating the top-level website
-</title>
+    <title>Updating the top-level Incubator website</title>
   </properties>
   <body>
     <section id="Overview+of+the+Incubator+site">
-      <title>Overview of the Incubator site
-</title>
-      <p>The top-level Incubator website is currently generated by
-
-        <a href="http://jakarta.apache.org/velocity/docs/anakia.html">Apache Jakarta
Velocity Anakia
-</a>.
-      </p>
+      <title>Overview of the Incubator site</title>
+
+      <p>The source to the Incubator website lives at:</p>
+      <note><a href="http://svn.apache.org/repos/asf/incubator/public/trunk">
+          http://svn.apache.org/repos/asf/incubator/public/trunk</a></note>
+
+      <p>The top-level Incubator website is currently generated by <a
+         href="http://jakarta.apache.org/velocity/docs/anakia.html"
+         >Apache Jakarta Velocity Anakia</a>.  (Say that ten times fast!)</p>
+
+      <p>This is the same setup as used by the main www.apache.org site.  You
+         may find the main <a href="http://www.apache.org/dev/infra-site.html"
+         >apache.org site help page</a> and <a
+         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>
+
+
       <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>
+         "site-author". The status reports for each project are in
+         site-author/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>
+         at "site-publish". That directory is then checked-out on the server
+         to re-create the website.</p>
+
     </section>
     <section id="Edit+the+content">
-      <title>Edit the content
-</title>
+      <title>Edit the content</title>
+
       <p>People with commit access to the "incubator" SVN can edit the source
-documents in the "site-author" directory. Anyone else can send
-patches to those documents.
-</p>
+         documents in the "site-author" directory. Anyone else can send
+         patches to those documents to the general mailing list.</p>
+
       <section id="Checkout+the+Incubator+SVN">
-        <title>Checkout the Incubator SVN
-</title>
-        <pre>
-cd /usr/local/svn
-svn co https://svn.apache.org/repos/asf/incubator/public/trunk incubator
+        <title>Checkout the Incubator SVN site</title>
+        <code>
+svn co http://svn.apache.org/repos/asf/incubator/public/trunk incubator<br />
 cd incubator
-</pre>
+</code>
+        <note>If you are a committer and intending to commit your changes,
+              please ensure you use https instead of http.</note>
       </section>
       <section id="Edit+the+source+documents">
-        <title>Edit the source documents
-</title>
-        <p>The source content is in Anakia xdoc format at "site-author" directory.
-</p>
+        <title>Edit the source documents</title>
+
+        <p>The source content is in Anakia xdoc format at "site-author"
+           directory.</p>
+
       </section>
       <section id="Add+a+new+document">
-        <title>Add a new document
-</title>
+        <title>Add a new document</title>
+
         <p>Add new documents in the site-author directory, then do 'svn add'.
-Add a new entry to the menu structure by editing site-author/stylesheets/project.xml
-</p>
+           Add a new entry to the menu structure by editing
+           site-author/stylesheets/project.xml</p>
+
       </section>
       <section id="Edit+your+project+status+report">
-        <title>Edit your project status report
-</title>
-        <p>The sources for the status reports are in site-author/projects/*.xml
-</p>
+        <title>Edit your project status report</title>
+        <p>The sources for the status reports are in
+           site-author/projects/*.xml</p>
         <p>Add a new one by copying the template from
-site-author/projects/incubation-status-template.xml to
-site-author/projects/${project}.xml and doing 'svn add'.
-Also add an entry to the table at site-author/projects/index.xml
-</p>
+           site-author/projects/incubation-status-template.xml to
+           site-author/projects/${project}.xml and doing 'svn add'.
+           Also add an entry to the table at site-author/projects/index.xml</p>
       </section>
     </section>
     <section id="Generating+the+top-level+website">
-      <title>Generating the top-level website
-</title>
-      <p>
-        <strong>Note:
-</strong>You can just commit the source changes and leave it to someone else
-to generate the website, however it is better to generate the site.
-
-      </p>
+      <title>Generating the top-level website</title>
+      <note>You can just commit the source changes and leave it to someone
+            else to generate the website, however it is better to generate the
+            site yourself and check it in.</note>
         <p>In the top-level "incubator" SVN directory, do 'ant'
-to render the HTML files into the
-"site-publish" directory. 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 server.
-</p>
-        <pre class="code">
-ssh people.apache.org
-cd /www/incubator.apache.org
+           to render the HTML files into the "site-publish" directory.
+           (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
-</pre>
+</code>
     </section>
     <section id="other">
-      <title id="other">Other notes
-</title>
+      <title id="other">Other notes</title>
       <p>Make sure that your subversion client is properly
-        <a href="http://www.apache.org/dev/version-control.html#https-svn">configured
-</a>.
-      </p>
+        <a href="http://www.apache.org/dev/version-control.html#https-svn"
+        >configured</a>.</p>
       <p>See other notes for maintenance of
-        <a href="http://www.apache.org/dev/project-site.html">project websites
-</a>.
-      </p>
+        <a href="http://www.apache.org/dev/project-site.html"
+        >apache.org project websites</a>.</p>
     </section>
   </body>
 </document>

Modified: incubator/public/trunk/site-publish/guides/website.html
URL: http://svn.apache.org/viewcvs/incubator/public/trunk/site-publish/guides/website.html?rev=374901&r1=374900&r2=374901&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/website.html (original)
+++ incubator/public/trunk/site-publish/guides/website.html Sat Feb  4 10:26:39 2006
@@ -18,8 +18,7 @@
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="/style/style.css" type="text/css" />
-      <title>Updating the top-level website
- - Apache Incubator</title>
+      <title>Updating the top-level Incubator website - Apache Incubator</title>
  </head>
  <body>        
   <table border="0" width="100%" cellspacing="0">
@@ -71,113 +70,103 @@
     <!-- CONTENT -->
     <td align="left" valign="top" class="content">
                 <h2><img src="/images/redarrow.gif" />
-   <a name="Overview+of+the+Incubator+site">Overview of the Incubator site
-</a>
+   <a name="Overview+of+the+Incubator+site">Overview of the Incubator site</a>
 </h2>
 <div class="section-content">
-<p>The top-level Incubator website is currently generated by
-
-        <a href="http://jakarta.apache.org/velocity/docs/anakia.html">Apache Jakarta
Velocity Anakia
-</a>.
-      </p>
+<p>The source to the Incubator website lives at:</p>
+<div class="note">
+<note><a href="http://svn.apache.org/repos/asf/incubator/public/trunk">
+          http://svn.apache.org/repos/asf/incubator/public/trunk</a></note>
+</div>
+<p>The top-level Incubator website is currently generated by <a href="http://jakarta.apache.org/velocity/docs/anakia.html">Apache
Jakarta Velocity Anakia</a>.  (Say that ten times fast!)</p>
+<p>This is the same setup as used by the main www.apache.org site.  You
+         may find the main <a href="http://www.apache.org/dev/infra-site.html">apache.org
site help page</a> and <a 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>
 <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>
+         "site-author". The status reports for each project are in
+         site-author/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>
+         at "site-publish". That directory is then checked-out on the server
+         to re-create the website.</p>
 </div>
            <h2><img src="/images/redarrow.gif" />
-   <a name="Edit+the+content">Edit the content
-</a>
+   <a name="Edit+the+content">Edit the content</a>
 </h2>
 <div class="section-content">
 <p>People with commit access to the "incubator" SVN can edit the source
-documents in the "site-author" directory. Anyone else can send
-patches to those documents.
-</p>
+         documents in the "site-author" directory. Anyone else can send
+         patches to those documents to the general mailing list.</p>
 <h3>
-   <a name="Checkout+the+Incubator+SVN">Checkout the Incubator SVN
-</a>
+   <a name="Checkout+the+Incubator+SVN">Checkout the Incubator SVN site</a>
 </h3>
 <div class="section-content">
-<pre>
-cd /usr/local/svn
-svn co https://svn.apache.org/repos/asf/incubator/public/trunk incubator
+<code>
+svn co http://svn.apache.org/repos/asf/incubator/public/trunk incubator<br />
 cd incubator
-</pre>
+</code>
+<div class="note">
+<note>If you are a committer and intending to commit your changes,
+              please ensure you use https instead of http.</note>
+</div>
 </div>
 <h3>
-   <a name="Edit+the+source+documents">Edit the source documents
-</a>
+   <a name="Edit+the+source+documents">Edit the source documents</a>
 </h3>
 <div class="section-content">
-<p>The source content is in Anakia xdoc format at "site-author" directory.
-</p>
+<p>The source content is in Anakia xdoc format at "site-author"
+           directory.</p>
 </div>
 <h3>
-   <a name="Add+a+new+document">Add a new document
-</a>
+   <a name="Add+a+new+document">Add a new document</a>
 </h3>
 <div class="section-content">
 <p>Add new documents in the site-author directory, then do 'svn add'.
-Add a new entry to the menu structure by editing site-author/stylesheets/project.xml
-</p>
+           Add a new entry to the menu structure by editing
+           site-author/stylesheets/project.xml</p>
 </div>
 <h3>
-   <a name="Edit+your+project+status+report">Edit your project status report
-</a>
+   <a name="Edit+your+project+status+report">Edit your project status report</a>
 </h3>
 <div class="section-content">
-<p>The sources for the status reports are in site-author/projects/*.xml
-</p>
+<p>The sources for the status reports are in
+           site-author/projects/*.xml</p>
 <p>Add a new one by copying the template from
-site-author/projects/incubation-status-template.xml to
-site-author/projects/${project}.xml and doing 'svn add'.
-Also add an entry to the table at site-author/projects/index.xml
-</p>
+           site-author/projects/incubation-status-template.xml to
+           site-author/projects/${project}.xml and doing 'svn add'.
+           Also add an entry to the table at site-author/projects/index.xml</p>
 </div>
 </div>
            <h2><img src="/images/redarrow.gif" />
-   <a name="Generating+the+top-level+website">Generating the top-level website
-</a>
+   <a name="Generating+the+top-level+website">Generating the top-level website</a>
 </h2>
 <div class="section-content">
-<p>
-        <strong>Note:
-</strong>You can just commit the source changes and leave it to someone else
-to generate the website, however it is better to generate the site.
-
-      </p>
+<div class="note">
+<note>You can just commit the source changes and leave it to someone
+            else to generate the website, however it is better to generate the
+            site yourself and check it in.</note>
+</div>
 <p>In the top-level "incubator" SVN directory, do 'ant'
-to render the HTML files into the
-"site-publish" directory. 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 server.
-</p>
-<pre class="code">
-ssh people.apache.org
-cd /www/incubator.apache.org
+           to render the HTML files into the "site-publish" directory.
+           (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
-</pre>
+</code>
 </div>
            <h2><img src="/images/redarrow.gif" />
-   <a name="other">Other notes
-</a>
+   <a name="other">Other notes</a>
 </h2>
 <div class="section-content">
 <p>Make sure that your subversion client is properly
-        <a href="http://www.apache.org/dev/version-control.html#https-svn">configured
-</a>.
-      </p>
+        <a href="http://www.apache.org/dev/version-control.html#https-svn">configured</a>.</p>
 <p>See other notes for maintenance of
-        <a href="http://www.apache.org/dev/project-site.html">project websites
-</a>.
-      </p>
+        <a href="http://www.apache.org/dev/project-site.html">apache.org project websites</a>.</p>
 </div>
          </td>
     <!-- RIGHT SIDE NAVIGATION -->



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


Mime
View raw message