From 571195361f83ada2fed96a321d9b5a3d1f60e59f Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 11 Aug 2011 15:11:23 +0200
Subject: [PATCH] Sync up to svn revision 2870

---
 pgweb/util/contexts.py              |  2 +-
 templates/index.html                | 14 +++++++-------
 templates/pages/developer/beta.html |  6 +++---
 templates/pages/docs/books.html     | 13 +++++++++++++
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/pgweb/util/contexts.py b/pgweb/util/contexts.py
index 66a70150..10bc3464 100644
--- a/pgweb/util/contexts.py
+++ b/pgweb/util/contexts.py
@@ -35,7 +35,7 @@ sitenav = {
 			{'title': 'Japanese',   'link':'http://www.postgresql.jp/document/'},
 		]},
 		{'title': 'Security',           'link':'/support/security/'},
-		{'title': 'What''s New',        'link':'/docs/8.4/static/release-8-4.html'},
+		{'title': 'What''s New',        'link':'/docs/9.0/static/release-9-0.html'},
 		{'title': 'FAQ',                'link':'http://wiki.postgresql.org/wiki/Category:FAQ'},
 		{'title': 'Books',              'link':'/docs/books/'},
 		{'title': 'Wiki',               'link':'http://wiki.postgresql.org'},
diff --git a/templates/index.html b/templates/index.html
index ba3b9799..60c6b6c0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,19 +6,19 @@
             <div id="pgFrontFeature">
               <div id="pgFrontFeatureContent">
                 <h1 id="txtFrontFeatureHeading">
-                 PostgreSQL 9.0 now available!
+                 PostgreSQL 9.1 Beta 3 now available!
                 </h1>
                 <p>
-The most anticipated PostgreSQL version in five years has been released.
-With built-in binary replication and over a dozen new major features,
-PostgreSQL 9.0 has compelling reasons to upgrade or migrate for every
-database user and developer.
+Beta release 9.1 Beta 3 is now available for download. We encourage
+developers and users to test this version. The release includes
+synchronous replication, writeable common table expressions,
+per-column collation, serializable snapshot isolation and many
+other features.
 		</p>
 		<div id="txtFrontFeatureLink">
                   <br/>
-                  <img src="/media/img/layout/blt_blu_arrow.png" width="6" height="6" alt="" /><a href="/about/news.1235" title="Release Announcement">Release Announcement</a><br />
+                  <img src="/media/img/layout/blt_blu_arrow.png" width="6" height="6" alt="" /><a href="/about/news.1331" title="Release Announcement">Release Announcement</a><br />
                   <img src="/media/img/layout/blt_blu_arrow.png" width="6" height="6" alt="" /><a href="/download" title="Download">Download</a><br />
-                  <img src="/media/img/layout/blt_blu_arrow.png" width="6" height="6" alt="" /><a href="http://wiki.postgresql.org/wiki/PostgreSQL_9.0_Press_Coverage" title="In the New">In The News</a><br />
                 </div>
               </div>
             </div> <!-- pgFrontFeature -->
diff --git a/templates/pages/developer/beta.html b/templates/pages/developer/beta.html
index 3bfb3a23..f66498c0 100644
--- a/templates/pages/developer/beta.html
+++ b/templates/pages/developer/beta.html
@@ -16,7 +16,7 @@ As we approach release, we will release a series of betas, as needed.
 </p>
 
 <p>
-The current beta is 9.1 Beta 2.
+The current beta is 9.1 Beta 3.
 </p>
 
 <p>
@@ -24,8 +24,8 @@ Betas are meant for everyone who uses PostgreSQL to test before we release the f
 
 <p>
 <ul>
-<li><a href="http://www.postgresql.org/ftp/source/v9.1beta2">Download 9.1 Beta 2 source code</a></li>
-<li><a href="http://www.enterprisedb.com/products-services-training/pgdevdownload">Download 9.1 Beta 2 installers</a> (offsite link)</li>
+<li><a href="http://www.postgresql.org/ftp/source/v9.1beta3">Download 9.1 Beta 3 source code</a></li>
+<li><a href="http://www.enterprisedb.com/products-services-training/pgdevdownload">Download 9.1 Beta 3 installers</a> (offsite link)</li>
 <li><a href="http://www.postgresql.org/docs/9.1/static/release-9-1.html">9.1 Beta Release Notes</a></li>
 </ul>
 </p>
diff --git a/templates/pages/docs/books.html b/templates/pages/docs/books.html
index 3ea8514d..8f103fe2 100644
--- a/templates/pages/docs/books.html
+++ b/templates/pages/docs/books.html
@@ -101,6 +101,19 @@
 		<b>Published</b>: August 2009<br />
 	</td>
 </tr>
+<tr>
+	<td class="colFirst">
+	  	<a href="http://www.amazon.com/PostgreSQL-French-Fran%C3%83%C2%A7ois-Marie-Colonna/dp/2746043815"><img src="/layout/images/docs/books/51im2FLd-IL._SL500_AA300_.jpg" alt="PostgreSQL" /></a>
+        </td>
+        <td class="colLast">
+                <b>Title</b>: PostgreSQL<br />
+                <b>Author</b>: François-Marie Colonna<br />
+                <b>Language</b>: French<br />
+        <b>Current version at publication</b>: 8.3<br />
+		<b>Format</b>: Paperback<br />
+                <b>Published</b>: November 2008<br />
+        </td>
+</tr>
 <tr>
         <td class="colFirst">
 		<a href="http://www.amazon.de/PostgreSQL-Administration-Peter-Eisentraut/dp/3897217775/"><img src="/media/img/docs/books/21r2crI2nWL._SL500_AA180_.jpg" alt="PostgreSQL-Administration" /></a>
-- 
2.39.5