misc updates

1 files changed, 24 insertions, 22 deletions

diff --git a/www/_SiteTemplate.tmpl b/www/_SiteTemplate.tmpl
index 586e7a0..857e16a 100644
--- a/www/_SiteTemplate.tmpl
+++ b/www/_SiteTemplate.tmpl
@@ -118,7 +118,7 @@
        Cheetah are <a href="whouses$htmlExt">used by many of the Fortune
        500</a>. One prominent new user is <a
        href="http://reddit.com/">reddit.com</a>, a startup funded by Paul
-       Graham.  It has over 20,000 unique visitors a day.</p>
+       Graham.  It has over 50,000 unique visitors a day.</p>
 
      </td>
      <td width="300">
@@ -138,8 +138,8 @@
   <div class="homePageDownloadBar">
    <div class="homePageDownloadBarInner">
     <b>Download</b> <a
-  href="http://sourceforge.net/project/showfiles.php?group_id=28961">Cheetah 2.0rc6</a>
- (released on Feb 4, 2006): major feature enhancements.
+  href="http://sourceforge.net/project/showfiles.php?group_id=28961">Cheetah 2.0rc7</a>
+ (released on July 4, 2006): major feature enhancements.
     </div>
   </div>
 
@@ -404,11 +404,6 @@ href="http://www.webwareforpython.org/">Webware for Python</a> email list.</p>
 
   <h3>Unofficial Documentation and Articles</h3>
 
-  <p><a
-  href="http://coderseye.com/2006/how-to-install-cheetah-on-dreamhost.html">How
-  to install Cheetah on Dreamhost</a>, a blog article published by Bruce Kroeze
-  in January 2006.</p>
-
   <p><a href="$('http://www-128.ibm.com/developerworks/opensource/library/'
   'os-pythcheetah/?ca=dgr-lnxw06PythonCheetah')">Building and filling out
   templates with Python and Cheetah</a> by Leonard Richardson, Software Engineer
@@ -426,15 +421,21 @@ href="http://www.webwareforpython.org/">Webware for Python</a> email list.</p>
   <p><a href="http://www.devshed.com/c/a/Python/Templating-with-Cheetah/">Templating with
   Cheetah</a>, a DevShed article by Peyton McCullough.  Published in December 2005.</p>
 
-  <p>The <a href="Py10.html">Python10 conference paper</a> about Cheetah, by
-  Tavis Rudd, Mike Orr, and Ian Bicking.  It provides a high-level introduction
-  to Cheetah and the philosophy behind its design.  Published in December
-  2001.</p>
-
   <p><a href="http://linuxgazette.net/117/orr.html">Templating in Python</a>, a
   Linux Gazette article by Mike Orr.  Published in Issue 117 of Linux Gazette,
   August 2005.</p>
 
+  <p><a href="http://www.unixreview.com/documents/s=10075/ur0604h/">Regular
+  Expressions: CherryPy proves its worth</a>, an Unix Review article by Miki
+  Tebeka and Cameron Laid.  They build a small addressbook application in less
+  than 150 lines of code using the CherryPy web framework and Cheetah.
+  Published May 2006.</p>
+
+  <p><a
+  href="http://coderseye.com/2006/how-to-install-cheetah-on-dreamhost.html">How
+  to install Cheetah on Dreamhost</a>, a blog article published by Bruce Kroeze
+  in January 2006.</p>
+
   <p><a href="$('http://www.linuxenterprise.de/itr/online_artikel/'
   'psecom,id,639,nodeid,9.html')">Tierisch gut Das Cheetah Templating-System in
   der Praxis</a>, a German-language article by Markus Jais. Published in the
@@ -457,6 +458,11 @@ href="http://www.webwareforpython.org/">Webware for Python</a> email list.</p>
   application. "Given my recent experience with Python and Cheetah, I can't
   imagine an easier way to generate code!" Published March 1st, 2004.</p>
 
+  <p>The <a href="Py10.html">Python10 conference paper</a> about Cheetah, by
+  Tavis Rudd, Mike Orr, and Ian Bicking.  It provides a high-level introduction
+  to Cheetah and the philosophy behind its design.  Published in December
+  2001.</p>
+
   <p>Cheetah is covered in <a
   href="$('http://www.amazon.com/exec/obidos/tg/detail/-/0596001886/'
   'ref=pd_sim_b_2/002-9262270-4252038?%5Fencoding=UTF8&amp;v=glance')">Python in a
@@ -479,16 +485,12 @@ href="http://www.webwareforpython.org/">Webware for Python</a> email list.</p>
 #def downloadPageContents
 
   <p>The most <a
-  href="$('http://sourceforge.net/project/showfiles.php?'
-   'group_id=28961&amp;package_id=20864&amp;release_id=375898')">recent
-  stable release</a> was 1.0 on Dec 4, 2005. Don$(apos)t let the version number fool
-  you. Cheetah has been <b>stable, production quality, post-beta code since
-  2001</b>. All new releases since then (40+) have been almost <b>100% backwards
-  compatible</b>.</p>
-
-  <p>The most <a
   href="http://sourceforge.net/project/showfiles.php?group_id=28961">recent
-  development release</a> was 2.0rc6 on Feb 4, 2006.</p>
+  stable release</a> was 2.0rc7 on July 4th, 2006. Cheetah has been <b>stable,
+  production quality, post-beta code since 2001</b>. All new releases since then
+  (40+) have been almost <b>100% backwards compatible</b>. The 'rc' in this
+  release name only indicates that we have yet to update the documentation.
+  The 2.0 code itself is production ready.</p>
 
   <p>Here$(apos)s the documentation on <a
   href="http://cheetahtemplate.org/docs/CHANGES">recent changes</a>.</p>