Author: husted
Date: Fri Nov 17 17:28:54 2006
New Revision: 476404
URL: http://svn.apache.org/viewvc?view=rev&rev=476404
Log:
SITE-14 Third draft. OK I'm done for now.
The big changes to date were
* Separating mail into mail and dev-mail
* Moving the links to the prior releases to the downloads (Releases) page.
* Keeping 1.3.5 on the main menu bar (as it is our only GA right now).
* Marking 2.0.x and 1.3.x docs as "draft".
* Moving the "development" pages into a "dev" folder.
Otherwise, it was just a matter of reorganizing the navigation so that the
concern of product support is separated from the concern of product
development, and also bringing the FAQs up to date.
Modified:
struts/site/src/site/fml/helping.fml
struts/site/src/site/fml/kickstart.fml
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/site.xml
struts/site/src/site/xdoc/announce.xml
struts/site/src/site/xdoc/dev/builds.xml
struts/site/src/site/xdoc/dev/dev-mail.xml
struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/javadoc.xml
struts/site/src/site/xdoc/primer.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=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/fml/helping.fml (original)
+++ struts/site/src/site/fml/helping.fml Fri Nov 17 17:28:54 2006
@@ -434,9 +434,8 @@
suggestion
in the
<a href="#issues">issue tracker.</a>
- .
- <strong>After creating the ticket</strong>
- , you can go back and upload a
+ <strong>After creating the ticket.</strong>
+ you can go back and upload a
file containing your patch.
</p>
@@ -696,9 +695,9 @@
<ul>
<li>
- Most importantly, download the latest nightly
- build or
- development release
+ Most importantly, download the latest
+ <a href="dev/builds.html#NightlyBuilds">nightly
build</a>
+ or development release
and test it against your own applications.
Report any and all issues or suspected issues to
<a href="http://issues.apache.org/struts/";>
Modified: struts/site/src/site/fml/kickstart.fml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Fri Nov 17 17:28:54 2006
@@ -25,24 +25,19 @@
</question>
<answer>
<p>
- The best available release of Apache Struts is
- <a href="http://struts.apache.org/announce-2005.html#a20050322";>
- Struts 1.2.9.</a>
- The Struts 1.2.9 release has its
- <a href="http://struts.apache.org/1.2.9/index.html";>
- own area of the website</a>.
+ The best place to start is with the "best available"
+ <a href="downloads.html">release.</a>
If you are new to Java or web development, as well as Apache
Struts,
be sure to review the
- <a href="http://struts.apache.org/1.2.9/userGuide/index.html";>
- Preface to the User Guide</a>.
+ <a href="primer.html">
+ Key Technologies Primer.</a>
</p>
<p>
The main Struts web site covers the latest, unreleased version of
each major release series (Struts 1.3 and Struts 2.0).
- The documentation for past releases are also available online.
- See the navigational menu for links to the documentation for
- each release.
+ Documentation for past <a href="downloads.html">releases</a>
+ is also available.
</p>
<p>
@@ -50,14 +45,14 @@
<a href="http://www.StrutsCentral.net/";>Struts Central</a>,
which catalogs all the known resources about Apache Struts for both
<a href="http://struts.apache.org/1.x/";>Struts 1</a> and
- <a href="http://struts.apache.org/2.0/";>Struts 2</a>.
+ <a href="http://struts.apache.org/2.x/";>Struts 2</a>.
To keep up on the latest news about "everything Struts",
point your RSS reader at the
<a href="http://www.PlanetStruts.org/";>Planet Struts</a> news site.
If you still have questions, you can search the
<a href="mail.html#Archives">User Mailing List archives,</a>
or <a href="mail.html">post your own question to the list</a>.
- (Plain old Google often works too!)</p>
+ (Plain old Google usually works too!)</p>
</answer>
</faq>
@@ -149,7 +144,7 @@
For more, see the
<a
href="http://wiki.apache.org/struts/StrutsMyFavoriteIDE";>
IDE discussion page</a>
- in the wiki.
+ in the Struts 1 wiki.
</p>
</answer>
</faq>
@@ -270,8 +265,6 @@
favorite newsgroup reader from the
<a href="http://news.gmane.org/";>GMane News Site.</a>
Subscribe to groups
- <code>gmane.comp.jakarta.struts.devel</code>
- for the developer list, or
<code>gmane.comp.jakarta.struts.user</code>
for the user list.
</p>
@@ -307,9 +300,9 @@
<p>
To get the best response to an inquiry,
please specify which version of Struts is being used,
- including the milestone ("Struts 1.2.4", for example).
- You can also include the label <strong>[struts1]</strong>
or
- <strong>[struts2]</strong> in the subject line of your
post.
+ including the milestone ("Struts 1.2.9", for example).
+ You can also include the label <strong>[s1]</strong> or
+ <strong>[s2]</strong> in the subject line of your post.
</p>
</answer>
</faq>
Modified: struts/site/src/site/fml/roadmap.fml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Fri Nov 17 17:28:54 2006
@@ -85,7 +85,7 @@
trouble.
</p>
<p>
- There have been several proposals for a new Struts 2
codebase.
+ There were several proposals for a new Struts 2 codebase.
The first formal proposal was
<a
href="http://wiki.apache.org/struts/StrutsJericho";>Jericho,</a>
followed by
@@ -274,9 +274,9 @@
should I use Struts 2 or WebWork 2?</question>
<answer>
<p>
- An initial release of Struts 2 is anticipated in the
- third quarter of 2006.
- In the meantime,
+ A beta release of Struts 2 is now available, and
+ a stable release is anticipated by the end of the year.
+ In the meantime,
unless you are an eager early-adopter,
the prudent course would be to start new projects with
<a href="http://www.opensymphony.com/webwork/";>
@@ -340,7 +340,7 @@
There are
<a
href="http://opensource.atlassian.com/confluence/oss/display/BOOKS/Books+about+Struts";>
dozens of books</a> and
- <a
href="http://www.StrutsCentral.net/Resources/Action/articles-2006.html";>
+ <a
href="http://www.StrutsCentral.net/Resources/Struts1/articles-2006.html";>
hundreds of articles</a> available to help people get
started with
Struts 1 or improve the application they already have.
</p>
@@ -356,8 +356,8 @@
Of course, if you are starting a new project, and have your
choice of frameworks,
this might be a good time to consider whether you would
like to
- continue to use Struts 1 or <a href="#choice">
- whether it's time to try Struts 2.</a>
+ continue to use Struts 1 or
+ whether it's time to try Struts 2.
</p>
</answer>
</faq>
Modified: struts/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Fri Nov 17 17:28:54 2006
@@ -33,6 +33,10 @@
href="downloads.html"
/>
<item
+ name="Announcements"
+ href="announce.html"
+ />
+ <item
name="Kickstart FAQ"
href="kickstart.html"
/>
@@ -50,18 +54,9 @@
<item
name="Key Technologies"
href="primer.html" />
- <item
- name="Javadoc Index"
- href="javadoc.html" />
- <item
- name="Struts 2.x"
- href="http://struts.apache.org/2.x/index.html"/>
- <item
- name="Struts 1.3"
- href="http://struts.apache.org/1.x/index.html"/>
- <item
- name="Struts 1.2"
- href="http://struts.apache.org/1.2.x/index.html"/>
+ <item
+ name="Struts 1.3.5"
+ href="http://struts.apache.org/1.3.5/index.html"; />
</menu>
<menu name="Support">
@@ -77,19 +72,25 @@
<menu name="Development">
<item
+ name="Struts 2.x Draft Docs"
+ href="http://struts.apache.org/2.x/index.html"/>
+
+ <item
+ name="Struts 1.3 Draft Docs"
+ href="http://struts.apache.org/1.x/index.html"/>
+
+ <item
name="How to Help FAQ"
href="helping.html"
/>
-
<item
- name="Development Mailing List"
+ name="Development Lists"
href="dev\dev-mail.html"
/>
<item
name="Source Code"
href="dev\builds.html"
/>
-
<item
name="Release Guidelines"
href="dev\releases.html"
Modified: struts/site/src/site/xdoc/announce.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Fri Nov 17 17:28:54 2006
@@ -653,7 +653,7 @@
<section>
<p class="right">
<strong>Next:</strong>
- <a href="faqs.html">Frequently Asked Questions</a>
+ <a href="kickstart.html">Kickstart FAQ</a>
</p>
</section>
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=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/xdoc/dev/builds.xml (original)
+++ struts/site/src/site/xdoc/dev/builds.xml Fri Nov 17 17:28:54 2006
@@ -195,22 +195,16 @@
<p>
As part of our continuous integration practice,
- we also make available each morning the latest development
build.
+ we also make available each morning the
+ <a
href="http://people.apache.org/builds/struts/nightlies/";>
+ latest development build.</a>
<em>Again: Use at your own risk!</em>
</p>
- <ul>
-
- <li>
- <a
href="http://people.apache.org/builds/struts/nightlies/";>
- Struts Nightly Builds</a>
- </li>
- </ul>
-
<p>
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.
+ <a href="../downloads.html">release</a> instead.
</p>
<p>
@@ -246,7 +240,7 @@
When a test build is upgraded to "Beta" or "GA"
by a vote of the project members,
we make the distribution available as
- a formal <a href="download.html">Apache Release.</a>
+ a formal <a href="../downloads.html">release.</a>
</p>
<a name="MavenSnapshots"/>
<subsection name="Maven Snapshots">
Modified: struts/site/src/site/xdoc/dev/dev-mail.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/dev-mail.xml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/xdoc/dev/dev-mail.xml (original)
+++ struts/site/src/site/xdoc/dev/dev-mail.xml Fri Nov 17 17:28:54 2006
@@ -24,7 +24,7 @@
<body>
- <section name="Mailing Lists">
+ <section name="Development Lists">
<p>
The project hosts several mailing lists. The
@@ -163,7 +163,7 @@
<section>
<p class="right">
<strong>Next:</strong>
- <a href="builds.html">Nightly Builds</a>
+ <a href="builds.html">Source Code</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Fri Nov 17 17:28:54 2006
@@ -27,7 +27,7 @@
<p>
Releases of the Apache Struts framework
- are made available to the public at no charge,
+ are made available to the general public at no charge,
under the
<a href="http://apache.org/licenses/";>Apache License,</a>
in both binary and source distributions.
@@ -168,7 +168,7 @@
<section>
<p class="right">
Next:
- <a href="kickstart.html">Kickstart FAQ</a>
+ <a href="announce.html">Announcements</a>
</p>
</section>
Modified: struts/site/src/site/xdoc/javadoc.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/javadoc.xml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/xdoc/javadoc.xml (original)
+++ struts/site/src/site/xdoc/javadoc.xml Fri Nov 17 17:28:54 2006
@@ -25,7 +25,13 @@
<body>
- <section name="Javadoc">
+ <section name="Draft Javadocs">
+ <p>
+ These Javadocs pertain to the latest development revision.
+ See the documentation bundled with a
+ <a href="downloads.html">release</a>
+ for the Javadocs for that release.
+ </p>
<table>
<tr>
<th>
Modified: struts/site/src/site/xdoc/primer.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/primer.xml?view=diff&rev=476404&r1=476403&r2=476404
==============================================================================
--- struts/site/src/site/xdoc/primer.xml (original)
+++ struts/site/src/site/xdoc/primer.xml Fri Nov 17 17:28:54 2006
@@ -1614,14 +1614,6 @@
</subsection>
</section>
-
- <section>
- <p class="right">
- <strong>Next:</strong>
- <a href="javadoc.html">Javadoc Index</a>
- </p>
- </section>
-
-
+
</body>
</document>
