cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r123465 - in cocoon/site/site: . community devinfo link
Date Tue, 28 Dec 2004 03:25:31 GMT
Author: crossley
Date: Mon Dec 27 19:25:29 2004
New Revision: 123465

URL: http://svn.apache.org/viewcvs?view=rev&rev=123465
Log:
Publish old changes. These were fixed long ago, but people forgot to
do the publish steps.

Modified:
   cocoon/site/site/community/committer.html
   cocoon/site/site/community/contrib.html
   cocoon/site/site/community/mail-lists.html
   cocoon/site/site/community/members.html
   cocoon/site/site/devinfo/releasing.html
   cocoon/site/site/index.html
   cocoon/site/site/link/in-the-press.html
   cocoon/site/site/versioning.html

Modified: cocoon/site/site/community/committer.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/community/committer.html?view=diff&rev=123465&p1=cocoon/site/site/community/committer.html&r1=123464&p2=cocoon/site/site/community/committer.html&r2=123465
==============================================================================
--- cocoon/site/site/community/committer.html	(original)
+++ cocoon/site/site/community/committer.html	Mon Dec 27 19:25:29 2004
@@ -195,7 +195,7 @@
 <h3>Overview</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-        These are some tips to help committers to keep our CVS clean.
+        These are some tips to help committers to keep our Subversion (SVN) repository clean.
         See also
         <a href="http://www.apache.org/dev/committers.html">Committers FAQ</a>
         and
@@ -221,16 +221,28 @@
 <h3>Consistent whitespace</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-        Whitespace can cause big problems with CVS. If it is inconsistent,
+        Whitespace can cause big problems with SVN. If it is inconsistent,
         then diffs are very hard to follow - actual changes become lost in
         the noise of whitespace changes. Some developers use editors that
         attempt to automatically format the whitespace. The trouble is
-        that if CVS files are inconsistent, some of those editors just
+        that if SVN files are inconsistent, some of those editors just
         make it worse.
       </p>
 <p>
-        The solution is that some committers who have a proper editor
-        should occasionally correct the whitespace across all CVS files,
+        The solution comes in two parts:
+      </p>
+<p>
+        When a committer adds a new file, they need to ensure that the file 
+        has the correct line endings for their own operating system, and that
+        either their SVN client automatically sets the EOL settings for the 
+        file based upon the file extension, or they must do:
+      </p>
+<pre class="code">svn add myfile.txt
+svn propset svn:eol-style native myfile.txt
+
+</pre>
+<p>is that some committers who have a proper editor
+        should occasionally correct the whitespace across all SVN files,
         applying the following rules.
       </p>
 <p>For all text files:</p>
@@ -240,7 +252,7 @@
         
 <li>No trailing whitespace.</li>
         
-<li>No M$-DOS line endings.</li>
+<li>No MS-DOS line endings.</li>
         
 <li>Newline at end-of-file.</li>
         
@@ -266,13 +278,13 @@
 </div>
 
     
-<a name="N10066"></a><a name="dos2unix"></a>
+<a name="N10071"></a><a name="dos2unix"></a>
 <h3>dos2unix and other control-characters</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
         If you are on a UNIX system, when you receive a patch from a
         contributor on Windows then do a 'dos2unix'. If you are on a
-        Windows system, then ensure that you have a proper CVS client
+        Windows system, then ensure that you have a proper SVN client
         (it is supposed to convert to UNIX line-endings when you commit).
       </p>
 <p>
@@ -304,7 +316,7 @@
 </div>
 
     
-<a name="N1008A"></a><a name="valid-xml"></a>
+<a name="N10095"></a><a name="valid-xml"></a>
 <h3>Valid XML instances</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: cocoon/site/site/community/contrib.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/community/contrib.html?view=diff&rev=123465&p1=cocoon/site/site/community/contrib.html&r1=123464&p2=cocoon/site/site/community/contrib.html&r2=123465
==============================================================================
--- cocoon/site/site/community/contrib.html	(original)
+++ cocoon/site/site/community/contrib.html	Mon Dec 27 19:25:29 2004
@@ -187,7 +187,7 @@
 </ul>
 </li>
 <li>
-<a href="#CVS+Usage+Precis">CVS Usage Precis</a>
+<a href="#Subversion+Usage+Precis">Subversion Usage Precis</a>
 <ul class="minitoc">
 <li>
 <a href="#How+to+Establish+your+Local+Repository">How to Establish your Local Repository</a>
@@ -199,12 +199,12 @@
 <a href="#How+to+Generate+Differences">How to Generate Differences</a>
 </li>
 <li>
-<a href="#How+to+get+other+CVS+branches">How to get other CVS branches</a>
+<a href="#How+to+get+other+branches">How to get other branches</a>
 </li>
 </ul>
 </li>
 <li>
-<a href="#CVS+Committer+with+Secure+Shell+access">CVS Committer with Secure Shell access</a>
+<a href="#Committer+repository+access">Committer repository access</a>
 </li>
 <li>
 <a href="#Procedure+for+Raising+Development+Issues">Procedure for Raising Development
Issues</a>
@@ -238,10 +238,9 @@
    list archives). Listen-in for a while, to hear how others make contibutions.
   </p>
 <p>You can get your local working copy of the
-   <a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/">latest and
-   greatest code</a> (which you find in the cocoon-2.1 module in
-   the cvs.apache.org CVS code repository, or from the
-   <a href="http://xml.apache.org/cocoon/mirror.cgi#nightly">CVS snapshots</a>).
+   <a href="http://svn.apache.org/viewcvs.cgi/cocoon/branches/BRANCH_2_1_X/">current
release branch</a>,
+   or the <a href="http://svn.apache.org/viewcvs.cgi/cocoon/trunk/">latest development
branch</a>
+   from Subversion (SVN). 
    Review the <a href="http://cocoon.apache.org/2.1/todo.html">todo</a> list,
choose a task
    (or perhaps you have noticed something that needs patching). Make the
    changes, do the testing, generate a patch, if you need then discuss it on
@@ -317,7 +316,7 @@
 <p>
      The Cocoon committers have been granted access by a vote of confidence,
      so they are assumed to be trustworthy enough to make changes directly in
-     CVS. Other contributors need to submit a patch via the Cocoon issue
+     the source repository. Other contributors need to submit a patch via the Cocoon issue
      tracker, Bugzilla.
    </p>
 <p>
@@ -347,7 +346,7 @@
 <li>At least JDK version 1.3.x</li>
    
 </ul>
-<p>And obviously, it should be tested against the current CVS snapshot of Cocoon!</p>
+<p>And obviously, it should be tested using the current Cocoon source code!</p>
 <p>This testing is designed to iron out the most common kinds of incompatibility
     problems (Servlet &gt;2.2 requirements; platform-dependent assumptions; JDK &gt;1.2
code).
     These requirements are, of course, open to review and discussion. Note that
@@ -390,20 +389,15 @@
    conditions</strong> - like most open source projects, 
    we do not have the resources nor the inclination to obtain signed statements from all
    contributors!</p>
-<p>
-<strong>Note:</strong> Since the <span class="codefrag">contrib/</span>
directory of Cocoon CVS contains
-   third-party. completely optional extensions, one of the above requirements is relaxed.
-   Code in the contrib directory does not have to have its copyright assigned to the ASF
-   - but it must still be released under the Apache license.</p>
 </div>
 </div>
 
  
-<a name="cvshowto"></a>
- <a name="N10106"></a><a name="CVS+Usage+Precis"></a>
-<h3>CVS Usage Precis</h3>
+<a name="svnhowto"></a>
+ <a name="N10100"></a><a name="Subversion+Usage+Precis"></a>
+<h3>Subversion Usage Precis</h3>
 <div style="margin-left: 0 ; border: 2px">
-<p>An overview of how to use CVS to participate in Cocoon development.
+<p>An overview of how to use Subversion to participate in Cocoon development.
    Do not be afraid - you cannot accidently destroy the actual code repository,
    because you are working with a local copy as an anonymous user. Therefore,
    you do not have the system permissions to change anything. You can only 
@@ -411,58 +405,52 @@
    repository.
   </p>
 <p>
-   (Further general CVS usage information is at
-   <a href="http://www.cvshome.org/">www.cvshome.org</a> and your local
-   <span class="codefrag">info cvs</span> pages or <span class="codefrag">man
cvs</span> pages or user
-   documentation.) 
+   (Further general Subversion usage information is at
+   <a href="http://subversion.tigris.org/">subversion.tigris.org</a>. Other resources
include 
+   <a href="http://svnbook.red-bean.com/">"Version Control with Subversion"</a>
and
+   <a href="http://softech.informatik.uni-kl.de/softech/content/einfothek/e2348/e2328/index_ger.html">a
fast introduction</a>.
   </p>
 <p>
    Let us lead by example. We will show you how to establish your local
    repository, how to keep it up-to-date, and how to generate the differences
    to create a patch. (The commands are for Linux.)
   </p>
-<a name="N1011E"></a><a name="How+to+Establish+your+Local+Repository"></a>
+<a name="N1011A"></a><a name="How+to+Establish+your+Local+Repository"></a>
 <h4>How to Establish your Local Repository</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-   This will checkout the current copy of the master cvs repository and
+   Decide whether you want to work with the "release branch" (2.1.X) or with
+   the trunk (2.2). Some developers use both.
+  </p>
+<p>
+   The following procedure will checkout the current copy of the release branch
+   of the master repository and
    download it to your local disk. It will create a sub-directory called
-   <span class="codefrag">cocoon-2.1</span>
+   <span class="codefrag">BRANCH_2_1_X</span>
   
 </p>
 <ol>
    
 <li>
-<span class="codefrag">cd /usr/local/cvs</span>
-</li>
-   
-<li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login</span>
-</li>
-   
-<li>... use this password: <span class="codefrag">anoncvs</span>
-</li>
-   
-<li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout
cocoon-2.1</span>
+<span class="codefrag">cd /usr/local/svn/cocoon</span>
 </li>
    
 <li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic logout</span>
+<span class="codefrag">svn co http://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/</span>
 </li>
    
 <li>
-<span class="codefrag">cd cocoon-2.1</span>
+<span class="codefrag">cd BRANCH_2_1_X</span>
 </li>
   
 </ol>
 <p>
-   You now have the HEAD branch of the current development cvs repository
+   You now have the release branch of the current source repository
    for Cocoon on your local system. Go ahead and build and deploy as
    usual. Make some changes, re-build, and see the effect.
   </p>
 </div>
-<a name="N10149"></a><a name="How+to+Keep+it+Up-to-date"></a>
+<a name="N1013B"></a><a name="How+to+Keep+it+Up-to-date"></a>
 <h4>How to Keep it Up-to-date</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -478,28 +466,20 @@
 <ol>
    
 <li>
-<span class="codefrag">cd /usr/local/cvs</span>
+<span class="codefrag">cd /usr/local/svn/cocoon/BRANCH_2_1_X</span>
 </li>
    
 <li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login</span>
-</li>
-   
-<li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic update
-d -P cocoon-2.1</span>
+<span class="codefrag">svn update</span>
 </li>
    
 <li>
 <strong>... pay attention to the update messages</strong>
 </li>
-   
-<li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic logout</span>
-</li>
   
 </ol>
 </div>
-<a name="N10169"></a><a name="How+to+Generate+Differences"></a>
+<a name="N10153"></a><a name="How+to+Generate+Differences"></a>
 <h4>How to Generate Differences</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -522,81 +502,74 @@
        thoroughly</li>
    
 <li>
-<span class="codefrag">cd /usr/local/cvs/cocoon-2.1/xdocs</span>
-</li>
-   
-<li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login</span>
-</li>
-   
-<li>
-<span class="codefrag">cvs diff -u contrib.xml &gt; $WORK/cocoon/contrib.xml.diff</span>
+<span class="codefrag">cd /usr/local/svn/cocoon/BRANCH_2_1_X/xdocs</span>
 </li>
    
 <li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic logout</span>
+<span class="codefrag">svn diff contrib.xml &gt; $WORK/cocoon/contrib.xml.diff</span>
 </li>
   
 </ol>
 </div>
-<a name="N10191"></a><a name="How+to+get+other+CVS+branches"></a>
-<h4>How to get other CVS branches</h4>
+<a name="N10173"></a><a name="How+to+get+other+branches"></a>
+<h4>How to get other branches</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>OK that got the HEAD branch of CVS into your local working copy.
+<p>Okay, that got the current release branch of Cocoon into your local working copy.
    If you want some other branch, then find the relevant branch name
    from ViewCVS
-   <a href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/">http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/</a>
(see the Tags list at the bottom).
+   <a href="http://svn.apache.org/viewcvs.cgi/cocoon/">http://svn.apache.org/viewcvs.cgi/cocoon/</a>
    Then follow the same checkout procedure described above, using this ...
   </p>
 <ul>
    
 <li>
-<span class="codefrag">cd /usr/local/cvs/cocoon_some_branch</span>
+<span class="codefrag">cd /usr/local/svn/cocoon</span>
 </li>
    
 <li>
-<span class="codefrag">cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout
cocoon-2.0</span>
+<span class="codefrag">svn co http://svn.apache.org/repos/asf/cocoon/branches/BRANCHNAME</span>
 </li>
   
 </ul>
-</div>
-</div>
-
- 
-<a name="ssh"></a>
- <a name="N101AD"></a><a name="CVS+Committer+with+Secure+Shell+access"></a>
-<h3>CVS Committer with Secure Shell access</h3>
-<div style="margin-left: 0 ; border: 2px">
-<p>After a developer has consistently provided contributions (code,
-   documentation and discussion), then the rest of the cocoon-dev community
-   may vote to grant this developer commit access to CVS.
-  </p>
-<p>You will need secure access to the repository to be able to commit
-   patches. Here are some resources that help to get your machine configured
-   to use the repository over SSH.
+<p>
+   If you want to work with the trunk, then do this to create a local directory
+   called "cocoon-trunk" ...
   </p>
 <ul>
    
 <li>
-<a href="http://cvsbook.red-bean.com/">The CVS Book</a>
+<span class="codefrag">cd /usr/local/svn/cocoon</span>
 </li>
    
 <li>
-<a href="http://www.cvshome.org/">www.cvshome.org</a>
+<span class="codefrag">svn co http://svn.apache.org/repos/asf/cocoon/trunk cocoon-trunk</span>
 </li>
-   
-<li>
-<a href="http://jakarta.apache.org/site/cvsindex.html">Jakarta
-    Guide: CVS Repository</a>
-    - See the bottom of the page for links to tips for UNIX and Windows.
-    Even if you are on UNIX, the Windows page will also help.</li>
   
 </ul>
 </div>
+</div>
+
+ 
+<a name="committer"></a>
+ <a name="N1019D"></a><a name="Committer+repository+access"></a>
+<h3>Committer repository access</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>After a developer has consistently provided contributions (code,
+   documentation and discussion), then the rest of the cocoon-dev community
+   may vote to grant this developer commit access to the repository.   To be able to 
+   commit you will first need to generate a subversion password. To do this, ssh to 
+   minotaur.apache.org and run <span class="codefrag">svnpasswd username</span>.
 This will ask 
+   you for a subversion password. This is the user and password you can use when 
+   checking in code.
+   See also
+   <a href="http://www.apache.org/dev/version-control.html">ASF developer notes</a>
+   about version control.
+   </p>
+</div>
 
  
 <a name="procedure"></a>
- <a name="N101CF"></a><a name="Procedure+for+Raising+Development+Issues"></a>
+ <a name="N101B0"></a><a name="Procedure+for+Raising+Development+Issues"></a>
 <h3>Procedure for Raising Development Issues</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Documentation contributions can usually be added directly to the
@@ -665,7 +638,7 @@
 
  
 <a name="tips"></a>
- <a name="N10213"></a><a name="Contribution+Notes+and+Tips"></a>
+ <a name="N101F4"></a><a name="Contribution+Notes+and+Tips"></a>
 <h3>Contribution Notes and Tips</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -764,13 +737,10 @@
    </li>
    
 <li>
-    You would usually do any development work against the HEAD branch of CVS.
-   </li>
-   
-<li>
-    When sending a patch, you usually do not need to worry about which CVS
+    When sending a patch, you usually do not need to worry about which
     branch it should be applied to. The maintainers of the repository will
-    decide.
+    decide and might also apply it to the trunk. Please indicate on the
+    Bugzilla entry which branch you have used to prepare your patch.
    </li>
    
 <li>

Modified: cocoon/site/site/community/mail-lists.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/community/mail-lists.html?view=diff&rev=123465&p1=cocoon/site/site/community/mail-lists.html&r1=123464&p2=cocoon/site/site/community/mail-lists.html&r2=123465
==============================================================================
--- cocoon/site/site/community/mail-lists.html	(original)
+++ cocoon/site/site/community/mail-lists.html	Mon Dec 27 19:25:29 2004
@@ -426,13 +426,14 @@
    
 </p>
 <p>This <strong>read-only</strong> list sends out notification messages
detailing
-    any change made to the CVS repository where all the source code and libraries
+    any change made to the Subversion (SVN) repository where all the source code and libraries
     are stored for development purposes. The average user probably doesn't need to
-    subscribe to this list.</p>
+    subscribe to this list. (It is named CVS due to the fact that Cocoon previously used
+    CVS as its repository.)</p>
 <div class="frame note">
 <div class="label">Note</div>
 <div class="content">You should never post to this list at all. Only the
-    CVS server should post to it.</div>
+    SVN server should post to it.</div>
 </div>
 </div>
 

Modified: cocoon/site/site/community/members.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/community/members.html?view=diff&rev=123465&p1=cocoon/site/site/community/members.html&r1=123464&p2=cocoon/site/site/community/members.html&r2=123465
==============================================================================
--- cocoon/site/site/community/members.html	(original)
+++ cocoon/site/site/community/members.html	Mon Dec 27 19:25:29 2004
@@ -208,8 +208,10 @@
 <h3>The Community</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-    This list contains all committers of all times of the various Cocoon projects
-    in strict alphabetical order.
+    This list contains all past and present committers on the various Cocoon projects
+    in strict alphabetical order. For details of contributors to a specific version of
+    Cocoon, see the relevant version pages 
+    (e.g. <a href="http://cocoon.apache.org/2.1/who.html">2.1</a>).
     </p>
 <ul>
       
@@ -225,8 +227,14 @@
       
 <li>Mark Butler (butlermh.at.apache.org)</li>
       
+<li>Guido Casper (gcasper.at.apache.org)</li>
+      
+<li>Ugo Cei (ugo.at.apache.org)</li>
+      
 <li>Steven Coffman (gears.at.apache.org)</li>
       
+<li>Tony Collen (tony.at.apache.org)</li>
+      
 <li>Marcus Crafter (crafterm.at.apache.org)</li>
       
 <li>David Crossley (crossley.at.apache.org)</li>
@@ -239,12 +247,18 @@
       
 <li>Bruno Dumon (bruno.at.apache.org)</li>
       
+<li>Daniel Fagerstr&ouml;m (danielf.at.apache.org)</li>
+      
 <li>Gerhard Froehlich (froehlich.at.apache.org)</li>
       
 <li>Pier Fumagalli (pier.at.apache.org)</li>
       
 <li>Antonio Gallardo (antonio.at.apache.org)</li>
       
+<li>Leszek Gawron (lgawron.at.apache.org)</li>
+      
+<li>Ralph Goers (rgoers.at.apache.org)</li>
+      
 <li>Robin Green (greenrd.at.apache.org)</li>
       
 <li>Vadim Gritsenko (vgritsenko.at.apache.org)</li>
@@ -253,6 +267,8 @@
       
 <li>J&ouml;rg Heinicke (joerg.at.apache.org)</li>
       
+<li>Unico Hommes (unico.at.apache.org)</li>
+      
 <li>Geoff Howard (ghoward.at.apache.org)</li>
       
 <li>Bernhard Huber (huber.at.apache.org)</li>
@@ -261,6 +277,8 @@
       
 <li>Matthew Langham (mlangham.at.apache.org)</li>
       
+<li>Tim Larson (tim.at.apache.org)</li>
+      
 <li>Ben Laurie (ben.at.apache.org)</li>
       
 <li>Berin Loritsch (bloritsch.at.apache.org)</li>
@@ -285,6 +303,10 @@
       
 <li>Konstantin Piroumian (kpiroumian.at.apache.org)</li>
       
+<li>Marc Portier (mpo.at.apache.org)</li>
+      
+<li>Reinhard P&ouml;tz(reinhard.at.apache.org)</li>
+      
 <li>Ovidiu Predescu (ovidiu.at.apache.org)</li>
       
 <li>Jeremy Quinn (jeremy.at.apache.org)</li>
@@ -308,6 +330,8 @@
 <li>Davanum Srinivas (dims.at.apache.org)</li>
       
 <li>Jeff Turner (jefft.at.apache.org)</li>
+      
+<li>Upayavira (upayavira.at.apache.org)</li>
       
 <li>Sylvain Wallez (sylvain.at.apache.org)</li>
       

Modified: cocoon/site/site/devinfo/releasing.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/devinfo/releasing.html?view=diff&rev=123465&p1=cocoon/site/site/devinfo/releasing.html&r1=123464&p2=cocoon/site/site/devinfo/releasing.html&r2=123465
==============================================================================
--- cocoon/site/site/devinfo/releasing.html	(original)
+++ cocoon/site/site/devinfo/releasing.html	Mon Dec 27 19:25:29 2004
@@ -337,14 +337,14 @@
           noone will check in during the release process. If someone checks in 
           during the building, testing and tagging, the release process has to 
           be started at the beginning again. Otherwise the release version is
-          not the one tagged in CVS.
+          not the one tagged in Subversion.
         </p>
 </div>
 <a name="N1007A"></a><a name="Get+the+Version"></a>
 <h4>Get the Version</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-          Check-out a fresh copy from the cvs on a unix platform (this is important, 
+          Check-out a fresh copy from Subversion on a unix platform (this is important, 
           do not use windows!)
         </p>
 </div>
@@ -406,7 +406,7 @@
 <h4>Continuing the Release Process</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-          Now check-in the changed version from the first step and tag the release in cvs.
+          Now check-in the changed version from the first step and tag the release in Subversion.
           Currently three files should have been changed in the last steps:
         </p>
 <ul>

Modified: cocoon/site/site/index.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/index.html?view=diff&rev=123465&p1=cocoon/site/site/index.html&r1=123464&p2=cocoon/site/site/index.html&r2=123465
==============================================================================
--- cocoon/site/site/index.html	(original)
+++ cocoon/site/site/index.html	Mon Dec 27 19:25:29 2004
@@ -279,8 +279,11 @@
 <div class="content">
 <table class="title" summary="">
 <tr>
-<td valign="top">
+<td valign="middle">
 <h1>The Apache Cocoon Project</h1>
+</td>
+</tr>
+</table>
 <ul class="minitoc">
 <li>
 <a href="#what">Apache Cocoon</a>
@@ -292,21 +295,7 @@
 <a href="#docs">Documentation</a>
 </li>
 </ul>
-
-</td>
-<td>
-<!-- ApacheCon advert -->
-<a href="http://ApacheCon.Com/2004/US/">
-<img src="http://ApacheCon.Com/2004/US/logos/logo_only.gif"
-  width="170" height="100" alt="ApacheCon!" title="Come to ApacheCon!"
-  border="0" /></a>
-<br/>
-Come to ApacheCon 2004!
-<!-- end ApacheCon advert -->
-</td>
-</tr>
-</table>
-
+    
 <a name="N10013"></a><a name="what"></a>
 <h3>Apache Cocoon</h3>
 <div style="margin-left: 0 ; border: 2px">

Modified: cocoon/site/site/link/in-the-press.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/link/in-the-press.html?view=diff&rev=123465&p1=cocoon/site/site/link/in-the-press.html&r1=123464&p2=cocoon/site/site/link/in-the-press.html&r2=123465
==============================================================================
--- cocoon/site/site/link/in-the-press.html	(original)
+++ cocoon/site/site/link/in-the-press.html	Mon Dec 27 19:25:29 2004
@@ -247,274 +247,276 @@
 <a href="#How+to+get+listed">How to get listed</a>
 </li>
 </ul>
-
-		
+        
 <a name="N10017"></a><a name="English+articles"></a>
 <h3>English articles</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
-        
+                
 <li>
-          
+                    
+<a href="http://www-106.ibm.com/developerworks/library/j-contin.html">
+                        Use continuations to develop complex Web applications
+                    </a>
+                    
+<br>
+                    An article in IBW Developersworks about continuations
+                </li>
+                
+<li>
+                    
 <a href="http://www.xml.com/pub/a/2003/04/23/cocoon-magazine.html">
-            Online Magazines with Apache Cocoon
-          </a>
-          
-<br>
-          An article about aggregation of news with RSS.
-        </li>
-        
+                        Online Magazines with Apache Cocoon
+                    </a>
+                    
+<br>
+                    An article about aggregation of news with RSS.
+                </li>
+                
 <li>
-          
+                    
 <a href="http://webservices.xml.com/pub/a/ws/2003/03/18/cocoon.html">
-            Creating SOAP Services with Cocoon
-          </a>
-          
-<br>
-          An article about building webservices with Cocoon.
-        </li>
-        
+                        Creating SOAP Services with Cocoon
+                    </a>
+                    
+<br>
+                    An article about building webservices with Cocoon.
+                </li>
+                
 <li>
-          
+                    
 <a href="http://webservices.xml.com/pub/a/ws/2003/01/29/cocoon-xforms.html">
-            XML Forms, Web Services and Apache Cocoon
-          </a>
-          
-<br>
-          Using XML Forms with Cocoon.
-        </li>
-        
+                        XML Forms, Web Services and Apache Cocoon
+                    </a>
+                    
+<br>
+                    Using XML Forms with Cocoon.
+                </li>
+                
 <li>
-          
+                    
 <a href="http://www.xml.com/pub/a/2003/01/22/cocoon-excel.html">
-            Excel Reports with Apache Cocoon and POI
-          </a>
-          
-<br>
-          Creating Excel reports.
-        </li>
-				
+                        Excel Reports with Apache Cocoon and POI
+                    </a>
+                    
+<br>
+                    Creating Excel reports.
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.xml.com/pub/a/2002/02/13/cocoon2.html">
-						Introducing Cocoon 2.0
-					</a>
-					
-<br>
-					An article by Stefano Mazzocchi on xml.com... need we say more to make you read it ?
-				</li>
-				
+                        Introducing Cocoon 2.0
+                    </a>
+                    
+<br>
+                    An article by Stefano Mazzocchi on xml.com... need we say more to make
you read it ?
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.sys-con.com/java/articleprint.cfm?id=1480">
-						Spread your Wings with Cocoon, David Rosenstrauch, Java Developer's Journal, Volume
07, Issue 06
-					</a>
-					
-<br>
-					The title says it all...
-				</li>
-				
+                        Spread your Wings with Cocoon, David Rosenstrauch, Java Developer's
Journal, Volume 07, Issue 06
+                    </a>
+                    
+<br>
+                    The title says it all...
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.webreference.com/xml/column52/">
-						Generating Web content with Cocoon
-					</a>
-					
-<br>
-					Introductory article about Cocoon pipelines.
-				</li>
-				
+                        Generating Web content with Cocoon
+                    </a>
+                    
+<br>
+                    Introductory article about Cocoon pipelines.
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.webservices.org/index.php/article/articleview/613/1/24/">
-						Portal Syndication with Web services and Cocoon
-					</a>
-					
-<br>
-					Good case-study
-				</li>
-				
+                        Portal Syndication with Web services and Cocoon
+                    </a>
+                    
+<br>
+                    Good case-study
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.javaworld.com/javaworld/jw-09-2002/jw-0920-cocoon.html">
-						Transform data into Web applications with Cocoon, Lajos Moczar, JavaWorld, September
2002
-					</a>
-					
-<br>
-					Emphasis on the Java parts of Cocoon (XSP and Actions, basically)
-				</li>
-        
+                        Transform data into Web applications with Cocoon, Lajos Moczar, JavaWorld,
September 2002
+                    </a>
+                    
+<br>
+                    Emphasis on the Java parts of Cocoon (XSP and Actions, basically)
+                </li>
+                
 <li>
-          
+                    
 <a href="http://www.xml.com/pub/a/2002/07/10/cocoon2.html">
-            Getting Started With Cocoon 2
-          </a>
-          
-<br>
-          How to get started with Cocoon.
-        </li>
-
-
-        
+                        Getting Started With Cocoon 2
+                    </a>
+                    
+<br>
+                    How to get started with Cocoon.
+                </li>
+                
 <li>
-          
+                    
 <a href="http://www.webreference.com/xml/column52/">
-            Generating Web content with Cocoon
-          </a>
-          
-<br>
-          Basic article to dive into Cocon.
-        </li>
-
-				
+                        Generating Web content with Cocoon
+                    </a>
+                    
+<br>
+                    Basic article to dive into Cocon.
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.javaworld.com/javaworld/jw-02-2001/jw-0209-xmlj2ee_p.html">
-						Add XML to your J2EE applications, Eoin Lane, JavaWorld, February 2001
-					</a>
-					
-<br>
-					Comprehensive article about integrating Cocoon and a J2EE framework.
-				</li>
- 				
+                        Add XML to your J2EE applications, Eoin Lane, JavaWorld, February
2001
+                    </a>
+                    
+<br>
+                    Comprehensive article about integrating Cocoon and a J2EE framework.
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.sdmagazine.com/articles/2001/0105/">
-						Is open source for you ?, Rick Wayne, Software Development, May 2001
-					</a>
-					
-<br>
-					A worthy mention of Cocoon
-				</li>
-				
+                        Is open source for you ?, Rick Wayne, Software Development, May 2001
+                    </a>
+                    
+<br>
+                    A worthy mention of Cocoon
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.sdmagazine.com/products/prev_reviews.html">
-						Products review, Software Development, December 2001,
-					</a>
-					
-<br>
-					Little review of Cocoon 2.0
-				</li>
-				
+                        Products review, Software Development, December 2001,
+                    </a>
+                    
+<br>
+                    Little review of Cocoon 2.0
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.sdmagazine.com/articles/2001/0106/">
-						The Apache XML Project: How to Get Read All Over, Rick Wayne, Software Development,
June 2001,
-					</a>
-					
-<br>
-					Nice article about Cocoon 1
-				</li>
-				
+                        The Apache XML Project: How to Get Read All Over, Rick Wayne, Software
Development, June 2001,
+                    </a>
+                    
+<br>
+                    Nice article about Cocoon 1
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.fawcette.com/archives/premier/mgznarch/javapro/2000/08aug00/kj0008/kj0008.asp">
-						A Better Way for Web Development, Kevin Jones, XML Magazine, Fall 2000
-					</a>
-					
-<br>
-					Another article about Cocoon 1
-				</li>
-			
+                        A Better Way for Web Development, Kevin Jones, XML Magazine, Fall
2000
+                    </a>
+                    
+<br>
+                    Another article about Cocoon 1
+                </li>
+            
 </ul>
 </div>
-
-		
-<a name="N100B0"></a><a name="German+articles"></a>
+        
+<a name="N100B9"></a><a name="German+articles"></a>
 <h3>German articles</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
-				
+                
 <li>
-					
+                    
 <a href="http://www.computerwoche.de/index.cfm?pageid=267&type=ArtikelDetail&id=80106336&cfid=142863&cftoken=29262623&nr=1">
-						  Publishing mit freier Apache-Software, COMPUTERWOCHE Nr. 06 vom 08.02.2002  (Langham/Ziegeler)
-					</a>
-				
+                          Publishing mit freier Apache-Software, COMPUTERWOCHE Nr. 06 vom
08.02.2002  (Langham/Ziegeler)
+                    </a>
+                
 </li>
-				
+                
 <li>
- 					Cocoon - aber sicher, XML Magazin &amp; Web Services, Issue 3, 2002 (Langham/Ziegeler)
-					<br>
-					The article introduces the reader to the authentication components in Cocoon and
-					how they integrate into the central sitemap.
-				</li>
-				
-<li>
- 					Ante Portas! XML Portale mit dem Open Source Projekt Cocoon, XML Magazin &amp;
Web Services, Issue 3, 2002 (Langham/Ziegeler)
-					<br>
-					The article shows how the Cocoon portal components can be used to build XML portals.
-				</li>
-			
+                    Cocoon - aber sicher, XML Magazin &amp; Web Services, Issue 3, 2002
(Langham/Ziegeler)
+                    <br>
+                    The article introduces the reader to the authentication components in
Cocoon and
+                    how they integrate into the central sitemap.
+                </li>
+                
+<li>
+                    Ante Portas! XML Portale mit dem Open Source Projekt Cocoon, XML Magazin
&amp; Web Services, Issue 3, 2002 (Langham/Ziegeler)
+                    <br>
+                    The article shows how the Cocoon portal components can be used to build
XML portals.
+                </li>
+            
 </ul>
 </div>
-
-		
-<a name="N100CA"></a><a name="Italian+articles"></a>
+        
+<a name="N100D3"></a><a name="Italian+articles"></a>
 <h3>Italian articles</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
-				
+                
 <li>
-					
+                    
 <a href="http://www.latoserver.it/cocoon/install_c2/">
-						Installazione di Tomcat 4 e Cocoon 2 su Mac OS X e Linux Debian
-					</a>
-				
-<br>
-				Installazione di Cocoon 2
-				</li>
-				
+                        Installazione di Tomcat 4 e Cocoon 2 su Mac OS X e Linux Debian
+                    </a>
+                    
+<br>
+                    Installazione di Cocoon 2
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.latoserver.it/cocoon/install_c1/">
-						Installazione di Tomcat e Cocoon
-					</a>
-				
-<br>
-				Installazione di Cocoon 1
-				</li>
-				
+                        Installazione di Tomcat e Cocoon
+                    </a>
+                    
+<br>
+                    Installazione di Cocoon 1
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.latoserver.it/cocoon/sitemg/">
-						Gestione di un sito con XML e Cocoon
-					</a>
-				
-<br>
-				Introduttorio, con Cocoon 1
-				</li>
-				
+                        Gestione di un sito con XML e Cocoon
+                    </a>
+                    
+<br>
+                    Introduttorio, con Cocoon 1
+                </li>
+                
 <li>
-					
+                    
 <a href="http://www.latoserver.it/cocoon/sm/">
-						Intervista a Stefano Mazzocchi
-					</a>
-				
-<br>
-				Intervista datata (Febbraio 2001), ma sempre interessante
-				</li>
-			
+                        Intervista a Stefano Mazzocchi
+                    </a>
+                    
+<br>
+                    Intervista datata (Febbraio 2001), ma sempre interessante
+                </li>
+            
 </ul>
 </div>
-
-		
-<a name="N100F7"></a><a name="How+to+get+listed"></a>
+        
+<a name="N10100"></a><a name="How+to+get+listed"></a>
 <h3>How to get listed</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-    			If you do not find your book here, make sure you
-    			<a href="mailto:users@cocoon.apache.org?subject=Link: Article:">tell us</a>.
-    			Enter the title after the words "Link: Article:" in the subject, and
-    			provide the title and publications of your article. Do not forget to tell us the URL
if
-    			possible.
-    			You could also follow the <a href="../community/contrib.html">Contributing</a>
-    			page to make it easier for everyone.
-   			</p>
+                If you do not find your book here, make sure you
+                <a href="mailto:users@cocoon.apache.org?subject=Link: Article:">tell
us</a>.
+                Enter the title after the words "Link: Article:" in the subject, and
+                provide the title and publications of your article. Do not forget to tell
us the URL if
+                possible.
+                You could also follow the <a href="../community/contrib.html">Contributing</a>
+                page to make it easier for everyone.
+            </p>
 </div>
-
-	
+    
 <div class="attribution">by&nbsp;Luca Morandini,&nbsp;Stephan Michels</div>
 </div>
 </td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif"
class="spacer"></td>

Modified: cocoon/site/site/versioning.html
Url: http://svn.apache.org/viewcvs/cocoon/site/site/versioning.html?view=diff&rev=123465&p1=cocoon/site/site/versioning.html&r1=123464&p2=cocoon/site/site/versioning.html&r2=123465
==============================================================================
--- cocoon/site/site/versioning.html	(original)
+++ cocoon/site/site/versioning.html	Mon Dec 27 19:25:29 2004
@@ -310,7 +310,7 @@
 <a href="#repositories">Versioning and Repositories</a>
 </li>
 <li>
-<a href="#reality">Realitiy</a>
+<a href="#reality">Reality</a>
 </li>
 </ul>
     
@@ -609,7 +609,7 @@
 </div>
     
 <a name="N100DA"></a><a name="reality"></a>
-<h3>Realitiy</h3>
+<h3>Reality</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
         The above expresses the intentions of the Cocoon community to support a 

Mime
View raw message