From b11381ff15cacd9302f6ef538c551029375d413e Mon Sep 17 00:00:00 2001
From: dcnieho <dcnieho@7f0cb862-5218-0410-a997-914c9d46530a>
Date: Fri, 5 Apr 2013 10:34:28 +0000
Subject: [PATCH] website: fixed errors in 3.0 roadmap (thank Ines Almeida!)
 Moved up the help out item in the left-side menu improved several texts i
 wrote earlier today.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1598 7f0cb862-5218-0410-a997-914c9d46530a
---
 freeglut/web-src/docs/api.php |  6 ++++++
 freeglut/web-src/help.php     |  2 ++
 freeglut/web-src/index.php    | 10 +++++-----
 freeglut/web-src/progress.php | 19 ++++++++++---------
 freeglut/web-src/template.php |  2 +-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/freeglut/web-src/docs/api.php b/freeglut/web-src/docs/api.php
index f363b3f..bc1f769 100644
--- a/freeglut/web-src/docs/api.php
+++ b/freeglut/web-src/docs/api.php
@@ -41,6 +41,12 @@ damages in connection with or arising from the use of information or programs
 contained herein.
 </p>
 
+<p>
+Note that the FreeGLUT 3.0 enhancements and additions are already
+mentioned in this API document. Some of the functions described here
+will thus not work with the currently available 2.8.1 release.
+</p>
+
 <h1>1. <a name="Contents"></a>Contents</h1>
 
 <ol>
diff --git a/freeglut/web-src/help.php b/freeglut/web-src/help.php
index 4998438..be207c5 100644
--- a/freeglut/web-src/help.php
+++ b/freeglut/web-src/help.php
@@ -27,6 +27,8 @@ Contributions can be nearly anything.  The point is involvement!</p>
 
 <p>Examples:
 <ul>
+    <li>Attack one of the <a href="progress.php">points on our todo
+    list</a></li>
 	<li>Use freeglut in your projects!</li>
 	<li>Tell us what you like.</li>
 	<li>Tell us what you'd change.</li>
diff --git a/freeglut/web-src/index.php b/freeglut/web-src/index.php
index 709da9d..acb60dc 100644
--- a/freeglut/web-src/index.php
+++ b/freeglut/web-src/index.php
@@ -35,14 +35,14 @@ generateHeader($_SERVER['PHP_SELF']);
 Android as well as a host of other enhancements. We are looking for
 developers to help out with further work on the Android port.
 Furthermore, ports to Cocoa/Carbon on OSX, and maybe even Wayland are
-planned. For more information, see the <a href="help.php">Help Out
-page</a> and <a
+planned, along with some enhancements to the API and implementation. See
+<a href="progress.php">here</a> for an overview of the major point on
+our todo list. For more information about helping out, see the <a
+href="help.php">Help Out page</a> and <a
 href="http://lists.sourceforge.net/lists/listinfo/freeglut-developer">join</a>
 the <a
 href="mailto:freeglut-developer@lists.sourceforge.net">freeglut-developer</a>
-mailing list.<br>Note that the FreeGLUT 3.0 enhancements are already in
-the API docs on the website, some of these will not work with the
-currently available 2.8.1 release.</p>
+mailing list.</p>
 
 <div class="textheader"><a name="download"></a>Downloads...</div>
 <p>Below are file links for the freeglut project. README files are included. Have fun!</p>
diff --git a/freeglut/web-src/progress.php b/freeglut/web-src/progress.php
index 3e5e6b4..7354f9c 100644
--- a/freeglut/web-src/progress.php
+++ b/freeglut/web-src/progress.php
@@ -15,7 +15,7 @@ href="help.php">Help</a> on any of these plans is very welcome!</p>
 <table>
 <tr>
 <th>Feature</th><th>Status</th><th>Milestone</th></tr>
-<tr><td>Andriod port</td><td>Basic but complete functionality by Sylvain
+<tr><td>Android port</td><td>Basic but complete functionality by Sylvain
 Beucler, but there are <a href=docs/android.php#roadmap>todo
 points</a></td><td>Basic functionality as is now done: 3.0. Future
 enhancements: 3.0 or later.</td></tr>
@@ -37,18 +37,19 @@ of these three the library will be compiled against. No work has been
 done on moving this to an at-runtime API.</td><td>Having this in 3.0
 would be nice, but not essential.</td></tr>
 
-<tr><td>Code reorganized such that platform and display server specific code
-are decoupled</td><td>Done, thanks John Fay! This already lead to a port
-to Android and support for GLES 2 on X11 (thanks Sylvain for both!), and
-paves the way for implementing native OSX and Wayland
-support</td><td>3.0</td></tr>
+<tr><td>Code reorganized such that platform-specific and display
+server-specific code are decoupled</td><td>Done, thanks John Fay! This
+already lead to a port to Android and support for GLES 1/2 on X11
+(thanks Sylvain for both!), and paves the way for implementing native
+OSX and Wayland support</td><td>3.0</td></tr>
 
 <tr><td>Position callback</td><td>Done: we now have a position callback
-notifying when position of the window changed.</td><td>3.0</td></tr>
+to notify the client when the position of the window
+changed.</td><td>3.0</td></tr>
 <tr><td>
 
 <tr><td>Carbon/Cocoa port</td><td>Not started. As Carbon is legacy, one
-might one to port to Cocoa first or even forget about Carbon all
+might want to port to Cocoa first or even forget about Carbon all
 together.</td><td>Undecided</td></tr>
 
 <tr><td>Wayland port</td><td>Not started.</td><td>Undecided</td></tr>
@@ -59,7 +60,7 @@ value) after each token are ignored. This is a significant way in which
 FreeGLUT is not compatible with GLUT. Could be a nice project for
 someone who want to become familiar with the intricacies of requesting
 specific display formats on at least one of the various window servers
-(Windows and X11 at the moment).
+(Windows and X11 at the moment).</td><td>Undecided</td></tr>
 </table>
 </p>
 
diff --git a/freeglut/web-src/template.php b/freeglut/web-src/template.php
index 22d5e05..c416d6b 100644
--- a/freeglut/web-src/template.php
+++ b/freeglut/web-src/template.php
@@ -11,6 +11,7 @@ $sidebarentries = array(0, # We skip this entry anyway...
 	array("name"=>"About",        "page"=>"/index.php"), 
 	array("name"=>"News",         "page"=>"/news.php"), 
 	array("name"=>"Progress",     "page"=>"/progress.php"),
+	array("name"=>"Help Out",     "page"=>"/help.php"),
 	1,
 	array("name"=>"Download",     "page"=>"/index.php#download"),
 	1,
@@ -18,7 +19,6 @@ $sidebarentries = array(0, # We skip this entry anyway...
 	array("name"=>"API",          "page"=>"/docs/api.php"),
 	array("name"=>"OpenGL Wikibook",     "page"=>"http://en.wikibooks.org/wiki/OpenGL_Programming"),
 	1,
-	array("name"=>"Help Out",     "page"=>"/help.php"),
 	array("name"=>"Report a Bug",        "page"=>"http://sourceforge.net/tracker/?func=browse&amp;group_id=1032&amp;atid=101032"),
 	array("name"=>"Request a Feature",   "page"=>"http://sourceforge.net/tracker/?func=browse&amp;group_id=1032&amp;atid=351032"),
 	array("name"=>"Project Interface",   "page"=>"http://sourceforge.net/projects/freeglut/")