Author: gk
Date: Thu Apr 12 10:18:38 2018
New Revision: 1828967
URL: http://svn.apache.org/viewvc?rev=1828967&view=rev
Log:
- Update documentation, add events
Modified:
turbine/site/README.txt
turbine/site/src/site/site.xml
turbine/site/xdocs/index.xml
turbine/site/xdocs/news.xml
turbine/site/xdocs/turbine/index.xml
Modified: turbine/site/README.txt
URL:
http://svn.apache.org/viewvc/turbine/site/README.txt?rev=1828967&r1=1828966&r2=1828967&view=diff
==============================================================================
--- turbine/site/README.txt (original)
+++ turbine/site/README.txt Thu Apr 12 10:18:38 2018
@@ -34,3 +34,5 @@ To deploy the site execute:
mvn site-deploy
To do this you need an account on the people.apache.org machine!!
+- after deployment check/cleanup local deployment path as defined in
turbine.site.cache. By default it's in user.home/turbine-sites/site.
+
Modified: turbine/site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/site/src/site/site.xml?rev=1828967&r1=1828966&r2=1828967&view=diff
==============================================================================
--- turbine/site/src/site/site.xml (original)
+++ turbine/site/src/site/site.xml Thu Apr 12 10:18:38 2018
@@ -32,6 +32,7 @@
<version position="left" />
<body>
+
<menu name="General Information">
<item name="Overview" href="/index.html"/>
@@ -54,6 +55,10 @@
<item name="User's Guide"
href="http://wiki.apache.org/turbine/Turbine2/UsersGuide"/>
<item name="Development"
href="https://wiki.apache.org/turbine/Turbine5"/>
</menu>
+
+ <menu name="Events">
+ <item name="" title="Apache Conferences"
href="https://www.apache.org/events/current-event.html";
img="https://www.apache.org/events/current-event-125x125.png"; target="_blank"/>
+ </menu>
<menu name="Turbine Releases">
<item name="Overview" href="/turbine/index.html"/>
Modified: turbine/site/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/index.xml?rev=1828967&r1=1828966&r2=1828967&view=diff
==============================================================================
--- turbine/site/xdocs/index.xml (original)
+++ turbine/site/xdocs/index.xml Thu Apr 12 10:18:38 2018
@@ -95,11 +95,8 @@
these enhancements are realized in the
<a href="turbine/turbine-2.3.3/">2.3.3</a> release). One significant
change in 4.0 is the introduction of a pipeline concept that allows you to
define
- via an XML file all the stages for processing a request.
- It is based on the
- <a href="turbine/turbine-4.0-M2/">Milestone Release 4.0-M2</a>, which you
may
- download from one of the
- <a
href="http://www.apache.org/dyn/closer.cgi/turbine/turbine-4.0-M2/";>Apache
Mirrors</a></li>
+ via <strong>XML</strong> all the stages for processing a request.
+ </li>
<li><a href="turbine/development/turbine-4.1/">Turbine 4.1</a> is
the shape of things to come...
@@ -113,7 +110,7 @@
<p></p>
<ul>
<li>
- <a href="/fulcrum/">Fulcrum</a> is by default in use since Turbine 4.x. It
is a collection of services originally
+ <a href="/fulcrum/">Fulcrum</a> components are by default in use since
Turbine 4.x. It is a collection of services originally
developed as part of Turbine, but now decoupled and usable in any
environment
that supports <a
href="http://wiki.apache.org/excalibur/AvalonFramework";>Avalon</a> components.
</li>
@@ -123,7 +120,7 @@
<section name="Turbine Alumni">
<p>
- As a longtime, but now ex-member of the <a
href="http://jakarta.apache.org/";>Jakarta Project</a>,
+ As a longtime, but now ex-member of the <a
href="http://jakarta.apache.org/";>Apache Jakarta Project</a>,
Turbine has influenced quite a number of projects:
</p>
<ul>
Modified: turbine/site/xdocs/news.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/news.xml?rev=1828967&r1=1828966&r2=1828967&view=diff
==============================================================================
--- turbine/site/xdocs/news.xml (original)
+++ turbine/site/xdocs/news.xml Thu Apr 12 10:18:38 2018
@@ -27,6 +27,14 @@
<body>
<section name="News And Status">
+ <h4>05 Mar 2018 - Release of Turbine 4.0.1</h4>
+ <p>
+ The Turbine Team is proud to announce the 4.0.1 release of the Turbine
Framework. This is mainly a bugfix release.
+ Download source and binary releases through the Apache mirror system at
+ <a href="http://www.apache.org/dyn/closer.cgi/turbine";>the turbine
download site</a>.
+ See <a href="/turbine/turbine-4.0/changes-report.html">what's new.</a>
+ </p>
+
<h4>10 Nov 2017 - Release of Turbine 4.0</h4>
<p>
The Turbine Team is proud to announce the 4.0 release of the Turbine
Framework.
Modified: turbine/site/xdocs/turbine/index.xml
URL:
http://svn.apache.org/viewvc/turbine/site/xdocs/turbine/index.xml?rev=1828967&r1=1828966&r2=1828967&view=diff
==============================================================================
--- turbine/site/xdocs/turbine/index.xml (original)
+++ turbine/site/xdocs/turbine/index.xml Thu Apr 12 10:18:38 2018
@@ -33,10 +33,10 @@
<subsection name="Turbine 4.0 Release Branch">
<ul>
- <li><a href="turbine-4.0-M1/">Apache Turbine 4.0 Milestone 1</a></li>
+ <li><a href="turbine-4.0/">Apache Turbine 4.0</a> - Current 4.0
Development tree</li>
<li><a href="turbine-4.0-M2/">Apache Turbine 4.0 Milestone 2</a></li>
+ <li><a href="turbine-4.0-M1/">Apache Turbine 4.0 Milestone 1</a></li>
<li><a href="development/turbine-4.1/">Apache Turbine 4.1-SNAPSHOT</a> -
Current 4.1 Development tree</li>
- <li><a href="turbine-4.0/">Apache Turbine 4.0</a> - Current 4.0
Development tree</li>
</ul>
</subsection>
![https://www.apache.org/events/current-event-125x125.png"](https://www.apache.org/events/current-event-125x125.png"){kind=link}