[Boost-commit] svn:boost r52242 - in website/public_html/live: . doc feed

Subject: [Boost-commit] svn:boost r52242 - in website/public_html/live: . doc feed
From: daniel_james_at_[hidden]
Date: 2009-04-07 16:12:03

Author: danieljames
Date: 2009-04-07 16:12:02 EDT (Tue, 07 Apr 2009)
New Revision: 52242
URL: http://svn.boost.org/trac/boost/changeset/52242

Log:
Merge r52048,r52085,r52180-52181,r52239 from beta.

Remaing revisions for 1.39: r51130,r51725,r52086-52161,r52240.

Text files modified: 
   website/public_html/live/.htaccess         |     5 +++++                                   
   website/public_html/live/doc/libraries.xml |     4 ++--                                    
   website/public_html/live/feed/bbook2rss.py |    25 +++++++++++++++----------               
   3 files changed, 22 insertions(+), 12 deletions(-)

Modified: website/public_html/live/.htaccess
==============================================================================
--- website/public_html/live/.htaccess	(original)
+++ website/public_html/live/.htaccess	2009-04-07 16:12:02 EDT (Tue, 07 Apr 2009)
@@ -34,6 +34,11 @@
 RewriteRule ^regression/trunk(/.*) development/tests/trunk$1 [R=permanent,L]
 RewriteRule ^regression-logs/?$ development/testing.html [R=permanent,L]
 
+########## Shorter names for URL that must be printed during build process
+
+RewriteRule ^getting_started_unix.html doc/libs/release/more/getting_started/unix-variants.html
+RewriteRule ^getting_starged_windows.html doc/libs/release/more/getting_started/windows.html
+
 ########## Rewrite old site links to new locations.
 
 # The boost header subdir, goes to the docs. Note, mod_rewrite is broken in some

Modified: website/public_html/live/doc/libraries.xml
==============================================================================
--- website/public_html/live/doc/libraries.xml	(original)
+++ website/public_html/live/doc/libraries.xml	2009-04-07 16:12:02 EDT (Tue, 07 Apr 2009)
@@ -543,8 +543,8 @@
     <key>graph</key>
     <boost-version>1.18.0</boost-version>
     <name>Graph</name>
-    <authors>Jeremy Siek and a University of Notre Dame
-    team</authors>
+    <authors>Jeremy Siek and a University of Notre Dame team;
+    now maintained by Andrew Sutton and Jeremiah Willcock.</authors>
     <description>The BGL graph interface and graph components are
     generic, in the same sense as the the Standard Template Library
     (STL).</description>

Modified: website/public_html/live/feed/bbook2rss.py
==============================================================================
--- website/public_html/live/feed/bbook2rss.py	(original)
+++ website/public_html/live/feed/bbook2rss.py	2009-04-07 16:12:02 EDT (Tue, 07 Apr 2009)
@@ -121,27 +121,32 @@
         return result
     
     def x_article(self,node):
-        description_xhtml = self.new_node('div',klass='description')
         brief_xhtml = self.new_node('span',
             self.x(self.get_child(self.get_child(node,tag='articleinfo'),
                 tag='articlepurpose'
                 )),
             klass='brief'
             )
-        body_item = self.get_child(node,tag='title').nextSibling
+
+        title_xhtml = self.new_node('title',
+            *self.x_children(self.get_child(node,tag='title')))
+
+        description_xhtml = self.new_node('div',klass='description')
         download_item = None
+        body_item = node.firstChild
         while body_item:
-            item = self.x(body_item)
-            if item:
-                download_i = self.get_child(item,tag='boostbook:download')
-                if download_i:
-                    download_item = download_i
-                else:
-                    description_xhtml.appendChild(item)
+            if body_item.nodeName not in ['title', 'articleinfo']:
+                item = self.x(body_item)
+                if item:
+                    download_i = self.get_child(item,tag='boostbook:download')
+                    if download_i:
+                        download_item = download_i
+                    else:
+                        description_xhtml.appendChild(item)
             body_item = body_item.nextSibling
         return self.new_node(
             'item',
-            self.new_text('title',node.getAttribute('name')),
+            title_xhtml,
             self.new_text('pubDate',node.getAttribute('last-revision')),
             self.new_text('boostbook:purpose',brief_xhtml.toxml('utf-8')),
             download_item,