This is an automated email from the ASF dual-hosted git repository.

gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 582525d  update pmc, update links to torque, dev tools
582525d is described below

commit 582525d078777f8b716be5658272b5dd1d8905ab
Author: Georg Kallidis <[email protected]>
AuthorDate: Wed Nov 3 15:52:45 2021 +0100

    update pmc, update links to torque, dev tools
---
 xdocs/common/developer-links.xml | 15 +++++++++++----
 xdocs/fsd.xml                    |  2 +-
 xdocs/index.xml                  |  2 +-
 xdocs/turbine-concepts.xml       |  2 +-
 xdocs/who-we-are.xml             | 18 ++++++++++++++++--
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/xdocs/common/developer-links.xml b/xdocs/common/developer-links.xml
index bc0fe0a..0278409 100644
--- a/xdocs/common/developer-links.xml
+++ b/xdocs/common/developer-links.xml
@@ -35,11 +35,14 @@ This document contains links that can aid you in the 
development of turbine
 <ul>
 <li>Servlet Specs:
   <a href="http://java.sun.com/products/servlet/download.html";><b>2.2</b></a>,
-  <a 
href="http://www.jcp.org/aboutJava/communityprocess/final/jsr053/";><b>2.3</b></a>
+  <a 
href="http://www.jcp.org/aboutJava/communityprocess/final/jsr053/";><b>2.3</b></a>,
+  <a href="https://jcp.org/en/jsr/detail?id=315";><b>3.0</b></a>,
+  <a href="https://jcp.org/en/jsr/detail?id=340";><b>3.1 </b></a>
 </li>
 <li>Servlet API:
   <a href="http://java.sun.com/products/servlet/2.2/javadoc/";><b>2.2</b></a>,
-  <a href="http://java.sun.com/products/servlet/2.3/javadoc/";><b>2.3</b></a>
+  <a href="http://java.sun.com/products/servlet/2.3/javadoc/";><b>2.3</b></a>,
+  <a 
href="https://www.javadoc.io/doc/javax.servlet/javax.servlet-api/3.1.0/index.html";><b>3.1</b></a>
 </li>
 
 <li>Servlet Deltas:
@@ -47,14 +50,18 @@ This document contains links that can aid you in the 
development of turbine
   <a 
href="http://www.servlets.com/soapbox/servlet23.html";><b>2.2-&gt;2.3</b></a></li>
 <li>HTTP RFCs:
 <b><a href="http://www.servlets.com/rfcs/rfc1945.txt";>1.0</a></b>,
-<b><a href="http://www.servlets.com/rfcs/rfc2616.txt";>1.1</a></b>
+<b><a href="http://www.servlets.com/rfcs/rfc2616.txt";>1.1</a></b>,
+<b><a href="https://datatracker.ietf.org/doc/html/rfc7540";>2</a></b>,
+<b><a href="https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol";>Updtes 
and Overview</a></b>
+
 </li>
 <li>File Upload RFCs:
        <a href="http://www.servlets.com/rfcs/rfc1867.txt";><b>1867</b></a>,
        <b><a href="http://www.servlets.com/rfcs/rfc2388.txt";>2388</a></b></li>
 <li>HTML Specs:
 <b><a href="http://www.w3.org/TR/REC-html32";>3.2</a></b>,
-<b><a href="http://www.w3.org/TR/html4/";>4.0</a></b>
+<b><a href="http://www.w3.org/TR/html4/";>4.0</a></b>,
+<b><a href="https://html.spec.whatwg.org/multipage/";>5.0</a></b>
 </li>
 <li>Cookie Specs:
 <a 
href="http://wp.netscape.com/newsref/std/cookie_spec.html";><b>Netscape</b></a>,
diff --git a/xdocs/fsd.xml b/xdocs/fsd.xml
index 8bad20b..ed30f84 100644
--- a/xdocs/fsd.xml
+++ b/xdocs/fsd.xml
@@ -394,7 +394,7 @@ that all you need to do is get an instance of the database 
class, get a
 connection and go. There is no need to pass around a Connection object. Turbine
 comes with pool implementations for many of the most popular databases. 
Creating
 your own is quite simple as well, all you need to do is look at the existing
-code and create your own. By default <a 
href="https://db.apache.org/torque/torque-4.0/index.html";>Torque</a> 
+code and create your own. By default <a 
href="https://db.apache.org/torque/torque-5.0/index.html";>Torque</a> 
 is used as ORM-Mapper, find more info 
 <a 
href="https://db.apache.org/torque/torque-4.0/documentation/orm-reference/index.html";>here</a>.
 If you need help or want someone to create one for
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 45157c1..e3e70e8 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -38,7 +38,7 @@
   <p>
     Turbine is a matured and well established framework that is used as
     the base of many other projects (like e.g. the excellent <a
-    href="https://portals.apache.org/jetspeed-1/";>Jetspeed 1</a>
+    href="https://portals.apache.org/jetspeed-1/";>Jetspeed 1 (Retired)</a>
     Portals framework.
   </p>
 
diff --git a/xdocs/turbine-concepts.xml b/xdocs/turbine-concepts.xml
index cf3264a..9c10fd6 100644
--- a/xdocs/turbine-concepts.xml
+++ b/xdocs/turbine-concepts.xml
@@ -307,7 +307,7 @@ 
href="http://turbine.apache.org/";>http://turbine.apache.org/</a>.
 <p>
 A very good tutorial on using Torque is also on the Turbine web site,
 here <a
-href="http://db.apache.org/torque/torque-4.0/documentation/tutorial/index.html";>http://db.apache.org/torque/torque-4.0/documentation/tutorial/</a>.
+href="http://db.apache.org/torque/torque-5.0/documentation/tutorial/index.html";>http://db.apache.org/torque/torque-5.0/documentation/tutorial/</a>.
 </p>
 
 <p>Velocity is available from <a
diff --git a/xdocs/who-we-are.xml b/xdocs/who-we-are.xml
index 9650576..3e458c7 100644
--- a/xdocs/who-we-are.xml
+++ b/xdocs/who-we-are.xml
@@ -97,19 +97,33 @@ common mistakes and as a community we all grow together.
             <td>Forio Business Simulations</td>
             <td>PMC Member</td>
         </tr>
-        <tr class="a">
+         <tr class="a">
+            <td>Georg Kallidis</td>
+            <td>gk</td>
+            <td>[email protected]</td>
+            <td>FU Berlin, UB, CeDiS</td>
+            <td>PMC Chair, PMC Member</td>
+        </tr>
+        <tr class="b">
             <td>Siegfried Goeschl</td>
             <td>sgoeschl</td>
             <td>[email protected]</td>
             <td>IT20one</td>
             <td>PMC Member</td>
         </tr>
+         <tr class="a">
+            <td>Jeffery Painter</td>
+            <td>painter</td>
+            <td>[email protected]</td>
+            <td>jivecast</td>
+            <td>PMC Member</td>
+        </tr>
         <tr class="b">
             <td>Thomas Vandahl</td>
             <td>tv</td>
             <td>[email protected]</td>
             <td>TeWiSoft GmbH</td>
-            <td>PMC Chair</td>
+            <td>PMC Member</td>
         </tr>
     </tbody>
 </table>

Reply via email to