You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/17 23:49:00 UTC

svn commit: r476348 - in /struts/site/src/site: fml/helping.fml xdoc/dev/builds.xml xdoc/downloads.xml

Author: husted
Date: Fri Nov 17 14:49:00 2006
New Revision: 476348

URL: http://svn.apache.org/viewvc?view=rev&rev=476348
Log:
SITE-14 Fixes. 

Modified:
    struts/site/src/site/fml/helping.fml
    struts/site/src/site/xdoc/dev/builds.xml
    struts/site/src/site/xdoc/downloads.xml

Modified: struts/site/src/site/fml/helping.fml
URL: http://svn.apache.org/viewvc/struts/site/src/site/fml/helping.fml?view=diff&rev=476348&r1=476347&r2=476348
==============================================================================
--- struts/site/src/site/fml/helping.fml (original)
+++ struts/site/src/site/fml/helping.fml Fri Nov 17 14:49:00 2006
@@ -478,12 +478,23 @@
             <answer>
             
             	<p>
-            	    The Struts 2 documentation is maintained using a 
-            	    Atlassian Confluence wiki and then exported to HTML 
-            	    for viewing on the website. 
-            	    To help out, 
-            	    <a href="http://confluence.twdata.org/display/WW/Home">
-            	    sign up for account on the wiki.</a>
+            	    The Struts 2 documentation is maintained using the
+            	    Atlassian Confluence wiki software and automatically exported to HTML
+            	    for viewing on the website.
+                    To help with the Struts 2 documentation,
+                    you must create an account at
+                    <a href="http://cwiki.apache.org/confluence">cwki.apache.org/confluence</a>,
+                    AND you must file a
+                    <a href="http://apache.org/licenses/icla.txt">Contributor License Agreement</a>
+                    with the ASF.
+                </p>
+                <p>
+                    Other ways to help out with the documentation is to
+                    just leave a comment on a page that needs fixing.
+                    If you have a cwiki Confluence account,
+                    you can also create pages on the
+                    <a href="http://cwiki.apache.org/S2WIKI/home.html">Struts 2 Wiki</a>
+                    without filing a CLA.
                 </p>
                 <p>
                     The Struts 1 documentation is maintained in the repository
@@ -851,10 +862,10 @@
                     <a href="http://apache.org/foundation/how-it-works.html">
                         "How the ASF Works"</a>
                     and the
-                    <a href="bylaws.html">Apache Struts Charter.</a>
+                    <a href="dev/bylaws.html">Apache Struts Charter.</a>
                     For more about project infrastructure,
                     see "Project Maintenance and Resources" in the
-                    <a href="http://wiki.apache.org/struts/">Apache Struts
+                    <a href="http://wiki.apache.org/struts/">Struts 1
                         wiki.</a>
                 </p>
 

Modified: struts/site/src/site/xdoc/dev/builds.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/builds.xml?view=diff&rev=476348&r1=476347&r2=476348
==============================================================================
--- struts/site/src/site/xdoc/dev/builds.xml (original)
+++ struts/site/src/site/xdoc/dev/builds.xml Fri Nov 17 14:49:00 2006
@@ -208,7 +208,7 @@
                 </ul>
 
                 <p>
-                    If you do not plan to contribute to the development of the framework,
+                    If you do <strong>not</strong> plan to contribute to the development of the framework,
                     then you probably want to download a
                     <a href="../downloads.html">Release</a> instead.
                 </p>

Modified: struts/site/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?view=diff&rev=476348&r1=476347&r2=476348
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Fri Nov 17 14:49:00 2006
@@ -83,10 +83,10 @@
                 </ul>
 
             <p>
-                Project releases are approved by a vote the
+                Project releases are approved by vote of the
                 Apache Struts  <a href="bylaws.html">Project Management Committee.</a>
                 Support for a release is provided by 
-                <a href="volunteers.html">project volunteers</a> 
+                <a href="dev/volunteers.html">project volunteers</a> 
                 on the <a href="mail.html">User mailing list.</a>
                 Additional free support is provided by many other 
                 volunteer subscribers to the list.