river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r778767 [1/2] - /websites/staging/river/trunk/content/
Date Fri, 05 Nov 2010 23:41:11 GMT
Author: buildbot
Date: Fri Nov  5 23:41:10 2010
New Revision: 778767

URL: http://svn.apache.org/viewvc?rev=778767&view=rev
Log:
Staging update by buildbot

Modified:
    websites/staging/river/trunk/content/banner.html
    websites/staging/river/trunk/content/committers.html
    websites/staging/river/trunk/content/community-top-link.html
    websites/staging/river/trunk/content/community.html
    websites/staging/river/trunk/content/development-process.html
    websites/staging/river/trunk/content/development-top-link.html
    websites/staging/river/trunk/content/development.html
    websites/staging/river/trunk/content/documentation-top-link.html
    websites/staging/river/trunk/content/documentation.html
    websites/staging/river/trunk/content/downloads-top-link.html
    websites/staging/river/trunk/content/downloads.html
    websites/staging/river/trunk/content/found-a-bug.html
    websites/staging/river/trunk/content/get-involved.html
    websites/staging/river/trunk/content/get_involved.html
    websites/staging/river/trunk/content/index-top-link.html
    websites/staging/river/trunk/content/index.html
    websites/staging/river/trunk/content/javadoc.html
    websites/staging/river/trunk/content/license.html
    websites/staging/river/trunk/content/mailing-lists.html
    websites/staging/river/trunk/content/river-applications.html
    websites/staging/river/trunk/content/river-users.html
    websites/staging/river/trunk/content/sidenav-quick-links.html
    websites/staging/river/trunk/content/sidenav.html
    websites/staging/river/trunk/content/source-code.html
    websites/staging/river/trunk/content/top-navigation-bar.html
    websites/staging/river/trunk/content/user-guide-basic-river-services.html
    websites/staging/river/trunk/content/user-guide-glossary.html
    websites/staging/river/trunk/content/user-guide-river-jar-artifacts.html
    websites/staging/river/trunk/content/user-guide-socketfactories.html
    websites/staging/river/trunk/content/using.html

Modified: websites/staging/river/trunk/content/banner.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/banner.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/banner.html (original)
+++ websites/staging/river/trunk/content/banner.html Fri Nov  5 23:41:10 2010
@@ -1,35 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Banner</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>{html:output=html|noPanel=true}
-    <div id="header_background">
-    <div id="river_logo">
-            <a style="float:left; width:280px;display:block;text-indent:-5000px;text-decoration:none;line-height:60px; margin-top:10px; margin-left:100px;" href="http://incubator.apache.org/river">Apache River</a>
-    </div>
-    </div>
-{html}</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/committers.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/committers.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/committers.html (original)
+++ websites/staging/river/trunk/content/committers.html Fri Nov  5 23:41:10 2010
@@ -1,66 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Committers</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>The people listed below are the set of committers to the Apache River project. They have all made significant contributions over time to Jini technology and the Jini Community.</p>
-<p>If you would like to contribute to Apache River, please engage on the [mailing lists].</p>
-<p>If you would like to become a committer, please see the [Get Involved] page.</p>
-<p>Committers:
-||Name||Organization
-|Bill Venners|Artima, Inc.
-|Mark Brouwer|&nbsp;
-|Jim Waldo|Sun Microsystems 
-|John McClain|Sun Microsystems 
-|Brian Murphy|&nbsp;
-|Peter Jones|Sun Microsystems
-|Juan Ramirez|Sun Microsystems
-|Frank Barnaby|Sun Microsystems
-|Robert Resendes|Sun Microsystems
-|Vinod Johnson|Sun Microsystems
-|Ron Mann|Sun Microsystems
-|Jim Hurley|Sun Microsystems
-|Jonathan Costers|&nbsp;
-|Peter Firmstone|&nbsp;
-|Tom Hobbs|&nbsp;
-|Sim IJskes|QCG
-|Patricia Shanahan|&nbsp;</p>
-<p>Emeriti:
-||Name||Organization
-|Bob Scheifler|Sun Microsystems
-|Dan Creswell|&nbsp;
-|Fred Oliver| Sun Microsystems
-|Geir Magnusson Jr|&nbsp;
-|Nigel Daley|&nbsp;</p>
-<p>Mentors:
-||Name|
-|Niclas Hedhman|
-|Jukka Zitting|
-|Benson Margulies|</p>
-<p>Former mentors:
-||Name|
-|Phil Steitz|
-|Gianugo Rabellino|</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/community-top-link.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/community-top-link.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/community-top-link.html (original)
+++ websites/staging/river/trunk/content/community-top-link.html Fri Nov  5 23:41:10 2010
@@ -1,29 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Community Top Link</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>[Community]</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/community.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/community.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/community.html (original)
+++ websites/staging/river/trunk/content/community.html Fri Nov  5 23:41:10 2010
@@ -1,29 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Community</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>{children:all=true|excerpt=true}</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/development-process.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/development-process.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/development-process.html (original)
+++ websites/staging/river/trunk/content/development-process.html Fri Nov  5 23:41:10 2010
@@ -1,99 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Development Process</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="river_development_process">River Development Process</h1>
-<h3 id="tracking_issues_and_changes">Tracking issues and changes</h3>
-<ul>
-<li>A JIRA issue is required for any substantive change.
-In order to keep the list of JIRA issues under control, it is expected that any controversial issue or user request for a feature or design change be discussed on the dev list prior to entering it into JIRA.</li>
-<li>JIRA issues are not needed for small (e.g., typos) changes.</li>
-<li>Issue discussions
-The preferred place of discussion on issues is the river-dev mail list. A link to the beginning of the mail thread on the issue should be placed in the JIRA issue so that users looking through JIRA can easily view the thread of discussion on an issue. Please keep the Subject line the same so that the email thread hangs together.  It's also recommended that a summary/conclusion on the thread be recorded in the JIRA issue itself.</li>
-</ul>
-<h4 id="handling_security_-related_issues">Handling Security -related Issues</h4>
-<p>There are three options associated with the "Security Level" field in the JIRA instance:
-<em> "None"
-</em> "Security risk, visible to committers" - only committers have access to the issue with this option set
-* "Security risk, visible to anyone" - the issue has a security risk associated with it, and the committers understand the impact. A resolution/fix has been developed.</p>
-<p>When a potential security -related issue is identified in the River sourcebase, initial discussion on it should occur on the private PPMC list.  If the person(s) who identified the issue are not on the PPMC, they should be included in the discussion.</p>
-<p>If the issue is acknowledged as a valid security issue, a JIRA issue needs to be created with the "Security Level" field marked to "Security risk, visible to committers".</p>
-<p>As soon as appropriate (for example, when the impact is understood and/or there is a resolution/fix developed), the "Security Level" should be changed to "Security risk, visible to anyone" and an explanation/discussion should occur in the broader River community on the river-dev list.</p>
-<h3 id="code_reviews">Code Reviews</h3>
-<ul>
-<li>
-<p>for public API changes:
-<a href="http://apache.org/foundation/glossary.html#ReviewThenCommit">RTC</a> These changes have potentially broad effects on developers and users, and therefore will require a code review and vote. Since some of these changes will affect the API docs ('specs'), everyone within the Jini/River community is encouraged to review and vote. The Committer votes are binding, but the sentiment of the entire community will be strongly considered.</p>
-</li>
-<li>
-<p>for all other changes:
-<a href="http://apache.org/foundation/glossary.html#CommitThenReview">CTR</a> Although CTR is what is specified, developers should feel comfortable requesting the list for peer review before committing.</p>
-</li>
-</ul>
-<h3 id="testing">Testing</h3>
-<p>Developing test cases and running test suites are desired but not required prior to an integration.  If unit tests are created for a change, the developer is encouraged to add them to the JIRA issue for sharing.</p>
-<h3 id="version_numbering">Version Numbering</h3>
-<p>Each Apache River deliverable has a version number of:</p>
-<p>{{m.n.r}}</p>
-<p>{{m}} = major version
-  {{n}} = minor version
-  {{r}} = maintenance version</p>
-<p>The major version number will in general only be increased in case of major changes that might introduce compatibility problems or represent some fundamental improvements. The minor versions reflect the various feature releases, the last part of the version number reflects the maintenance release.</p>
-<h3 id="branching_policy">Branching Policy</h3>
-<p>Ongoing development for the next release takes place in the {{/trunk}}. Once feature complete for a (non maintenance) release the trunk is branched into {{/branches/<m.n>}} which in general also reflects the moment a release candidate is presented to the public in a fairly short period of time. Ongoing development continues in the {{/trunk}}, issues found against the release candidate will be fixed in {{/branches/<m.n>}} and likely merged into the {{/trunk}}.</p>
-<p>Once a release candidate is ready for a first customer release {{/branches/<m.n>}} is branched into {{/tags/<m.n>.0}}. When support is required for a particular release {{m.n}}, the development for a fix-release is conducted in {{/branches/<m.n>}}. When a bug-fix release is ready it is branched into {{/tags/<m.n.r>}} where {{r}} is a positive number and increased for each maintenance release.</p>
-<p>Although ongoing development should take place in {{/trunk}}, there is a {{/skunk}} branch that can be utilized for 'experimental' work that must not disturb the {{/trunk}}, that needs to be visible to others and/or might require participation of others. In general the lifetime of such branch should be short to give it a chance of successful integration into the {{/trunk}} when the 'experiment' has been found valuable.</p>
-<p><em>Summarized</em></p>
-<p>||branch||description||
-|{{.../river/<product>/trunk}}|mainline development|
-|{{.../river/<product>/branches}}|maintenance branches|
-|{{.../river/<product>/tags}}|frozen release tags|
-|{{.../river/<product>/skunk}}|development and 'skunk works' branches|
-{noformat:nopanel=true}
-/trunk
-   |
-   |--------  /branches/2.1/
-   |        
-   |          -------  /tags/2.1.0/
-   |          
-   |            -------  /tags/2.1.1/
-   |            
-   |
-   |--------  /branches/2.2/
-   |        
-   |          -------  /tags/2.2.0/
-   |          
-   |
-   |--------  /skunk/<catchy_name>
-   |
-   |
-   |--------  /branches/3.0/
-   |        
-   |          -------  /tags/3.0.0/
-   |          
-   |            -------  /tags/3.0.1/
-{noformat}</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/development-top-link.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/development-top-link.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/development-top-link.html (original)
+++ websites/staging/river/trunk/content/development-top-link.html Fri Nov  5 23:41:10 2010
@@ -1,29 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Development Top Link</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>[Development]</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/development.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/development.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/development.html (original)
+++ websites/staging/river/trunk/content/development.html Fri Nov  5 23:41:10 2010
@@ -1,30 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Development</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="apache_river_development">Apache River Development</h1>
-<p>{children:all=true|excerpt=true}</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/documentation-top-link.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/documentation-top-link.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/documentation-top-link.html (original)
+++ websites/staging/river/trunk/content/documentation-top-link.html Fri Nov  5 23:41:10 2010
@@ -1,29 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Documentation Top Link</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>[Documentation]</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/documentation.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/documentation.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/documentation.html (original)
+++ websites/staging/river/trunk/content/documentation.html Fri Nov  5 23:41:10 2010
@@ -1,52 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Documentation</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="apache_river_documentation">Apache River Documentation</h1>
-<p>The original Jini documentation (including the formal specifications) can be found <a href="http://incubator.apache.org/river/doc/index.html">here</a>.  For more general help and information please see the list of topics below.</p>
-<table>
-<thead>
-<tr>
-<th />
-<th>Document</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><a href="User Guide - Glossary">Glossary</a></td>
-<td>A definition of a few of the common terms when using Jini/River</td>
-</tr>
-<tr>
-<td><a href="User Guide - River JAR Artifacts">River Artifacts</a></td>
-<td>An extract from the developer list discussing the history behind River's JAR artifacts</td>
-</tr>
-<tr>
-<td><a href="User Guide - SocketFactories">Socket Factories</a></td>
-<td>A note on the correct use of SocketFactories in EndPoints</td>
-</tr>
-</tbody>
-</table></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/downloads-top-link.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/downloads-top-link.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/downloads-top-link.html (original)
+++ websites/staging/river/trunk/content/downloads-top-link.html Fri Nov  5 23:41:10 2010
@@ -1,29 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Downloads Top Link</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>[Downloads]</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/downloads.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/downloads.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/downloads.html (original)
+++ websites/staging/river/trunk/content/downloads.html Fri Nov  5 23:41:10 2010
@@ -1,58 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Downloads</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="apache_river_downloads">Apache River Downloads</h1>
-<p>Use the links below to download Apache River releases from one of our mirrors. You should verify the integrity of the files using the signatures and checksums available from this page.</p>
-<p>Apache River releases are available under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. See the NOTICE.txt file contained in each release artifact for applicable copyright attribution notices.</p>
-<h2 id="apache_river_v212_incubating">Apache River v2.1.2 (incubating)</h2>
-<ul>
-<li>Source code: <a href="http://www.apache.org/dyn/closer.cgi/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip">apache-river-2.1.2-incubating-src.zip</a> (<a href="http://www.apache.org/dist/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip.asc">PGP</a>, <a href="http://www.apache.org/dist/incubator/river/source/2.1.2/apache-river-2.1.2-incubating-src.zip.sha">SHA1</a>)</li>
-<li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip">apache-river-2.1.2-incubating-bin.zip</a> (<a href="http://www.apache.org/dist/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip.asc">PGP</a>, <a href="http://www.apache.org/dist/incubator/river/binaries/2.1.2/apache-river-2.1.2-incubating-bin.zip.sha">SHA1</a>)</li>
-</ul>
-<h2 id="release_archive">Release Archive</h2>
-<p>Only current, recommended releases are available on www.apache.org and the mirror sites. Older releases, when available, can be obtained from the <a href="http://archive.apache.org/dist/incubator/river/">archive site</a>.</p>
-<h2 id="nightly_snapshots">Nightly Snapshots</h2>
-<p>Being worked on - none yet.</p>
-<h2 id="pgp_signatures">PGP Signatures</h2>
-<p>All of the release distribution packages have been digitally signed (using PGP or GPG) by the Apache Group members that constructed them. There will be an accompanying distribution.asc file in the same directory as the distribution. The PGP keys can be found in the MIT key repository (hkp://pgp.mit.edu), the OpenPGP Public Key repository (hkp://subkeys.pgp.net), and within this project's KEYS file, which is located within each download directory.</p>
-<p>Always use the signature files to verify the authenticity of the distribution, e.g.,</p>
-<p>{code}
-% pgpk -a KEYS
-% pgpv filename.zip.asc
-{code}</p>
-<p>or,</p>
-<p>{code}
-% pgp -ka KEYS
-% pgp filename.zip.asc
-{code}</p>
-<p>or,</p>
-<p>{code}
-% gpg --import KEYS
-% gpg --verify filename.zip.asc
-{code}</p>
-<p>We offer MD5 hashes as an alternative to validate the integrity of the downloaded files. A unix program called md5 or md5sum is included in many unix distributions. It is also available as part of <a href="http://www.gnu.org/software/coreutils">GNU Core Utilities package</a>.</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/found-a-bug.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/found-a-bug.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/found-a-bug.html (original)
+++ websites/staging/river/trunk/content/found-a-bug.html Fri Nov  5 23:41:10 2010
@@ -1,33 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Found a Bug</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h2 id="found_a_bug">Found a Bug?</h2>
-<p>If you think you've found a problem with Apache River you can search JIRA, our issue-tracking system, to see if the problem has already been noted (visit <a href="http://issues.apache.org/jira/browse/RIVER">JIRA</a>). If the issue is not listed there, you can add a new JIRA issue describing it, please include detailed steps to reproduce the problem. Often it is best to raise an issue not yet listed in JIRA first on the River Developer mailing list (see [Mailing Lists]) before adding it directly in JIRA.</p>
-<p>If you have a fix for the issue, you can generate a patch file to send the fix to us. You need to check out the current source code from Subversion, make the necessary changes, and then do a full build. And, of course, confirm that the problem is actually fixed. Then, go to the base directory of your RIVER checkout, and run a command like {{svn diff &gt; fix-for-my-bug.patch}} to generate a patch file.</p>
-<p>To submit a patch, create an issue in JIRA that describes the problem, and add your patch file as an attachment. Please include detailed steps to reproduce the problem in the issue description, and a test case in the patch where possible.</p>
-<p>Thanks for interest, and working with us to improve Apache River!</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/get-involved.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/get-involved.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/get-involved.html (original)
+++ websites/staging/river/trunk/content/get-involved.html Fri Nov  5 23:41:10 2010
@@ -1,45 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Get Involved</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h2 id="join_the_apache_river_community">Join the Apache River Community</h2>
-<p>The Apache River project is being built by the open source community for the open source community. We truly welcome your input and contributions!</p>
-<h3 id="what_we_are_looking_for">What we are looking for:</h3>
-<ul>
-<li>Bug fixes and code enhancement contributions</li>
-<li>Source code contributions</li>
-<li>Documentation assistance and contributions</li>
-<li>Feature suggestions</li>
-<li>Detailed and constructive feedback</li>
-<li>Articles and whitepapers</li>
-</ul>
-<h3 id="how_do_i_contribute">How do I Contribute?</h3>
-<ul>
-<li>To discuss Apache River topics check out the [mailing lists].</li>
-<li>Bugs and other issues can be posted in the <a href="http://issues.apache.org/jira/browse/RIVER">RIVER</a> issue tracker.</li>
-<li>The <a href="http://wiki.apache.org/river/">River wiki</a> is open for anyone to contribute related documentation.</li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/get_involved.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/get_involved.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/get_involved.html (original)
+++ websites/staging/river/trunk/content/get_involved.html Fri Nov  5 23:41:10 2010
@@ -1,45 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Get Involved</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="join_the_apache_river_community">Join the Apache River Community</h1>
-<p>The Apache River project is being built by the open source community for the open source community. We truly welcome your input and contributions!</p>
-<h2 id="what_we_are_looking_for">What we are looking for:</h2>
-<ul>
-<li>Bug fixes and code enhancement contributions</li>
-<li>Source code contributions</li>
-<li>Documentation assistance and contributions</li>
-<li>Feature suggestions</li>
-<li>Detailed and constructive feedback</li>
-<li>Articles and whitepapers</li>
-</ul>
-<h2 id="how_do_i_contribute">How do I Contribute?</h2>
-<ul>
-<li>To discuss Apache River topics check out the [mailing lists].</li>
-<li>Bugs and other issues can be posted in the <a href="http://issues.apache.org/jira/browse/RIVER">RIVER</a> issue tracker.</li>
-<li>The <a href="http://wiki.apache.org/river/">River wiki</a> is open for anyone to contribute related documentation.</li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/index-top-link.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/index-top-link.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/index-top-link.html (original)
+++ websites/staging/river/trunk/content/index-top-link.html Fri Nov  5 23:41:10 2010
@@ -1,29 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Index Top Link</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>[Index]</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/index.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/index.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/index.html (original)
+++ websites/staging/river/trunk/content/index.html Fri Nov  5 23:41:10 2010
@@ -1,41 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Index</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h2 id="welcome_to_apache_river">Welcome to Apache River</h2>
-<p>Welcome to Apache River, a project furthering the development and advancement of Jini technology.</p>
-<p>Jini is a service oriented architecture that defines a programming model which both exploits and extends Java technology to enable the construction of secure, distributed systems consisting of federations of services and clients. Jini technology can be used to build adaptive network systems that are scalable, evolvable and flexible as typically required in dynamic computing environments.</p>
-<p>Apache River is an effort undergoing incubation at <a href="http://www.apache.org/">The Apache Software Foundation</a> (ASF), sponsored by the <a href="http://incubator.apache.org/">Apache Incubator</a> PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
-<h2 id="news">News</h2>
-<p>{blog-posts:5} </p>
-<h2 id="resources">Resources</h2>
-<ul>
-<li>Apache Incubator <a href="http://wiki.apache.org/incubator/RiverProposal">Proposal for the River project </a></li>
-<li><a href="http://www.jini.org">Jini.org </a></li>
-<li><a href="http://jini.dev.java.net">Jini project area on Java.net </a></li>
-<li>Jan Newmarch's <a href="http://jan.newmarch.name/java/jini/tutorial/Jini.xml">Guide to Jini Technologies </a></li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/javadoc.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/javadoc.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/javadoc.html (original)
+++ websites/staging/river/trunk/content/javadoc.html Fri Nov  5 23:41:10 2010
@@ -1,31 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Javadoc</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="apache_river_javadoc">Apache River Javadoc</h1>
-<p>The javadocs generated from the latest, unreleased version of River can be browsed at:
-[http://hudson.zones.apache.org/hudson/view/River/job/River-trunk/javadoc/]</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/license.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/license.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/license.html (original)
+++ websites/staging/river/trunk/content/license.html Fri Nov  5 23:41:10 2010
@@ -1,229 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>License</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h2 id="apache_license_v20">Apache License v2.0</h2>
-<p>{noformat}</p>
-<div class="codehilite"><pre>                         <span class="n">Apache</span> <span class="n">License</span>
-                    <span class="n">Version</span> <span class="mi">2</span><span class="o">.</span><span class="mi">0</span><span class="p">,</span> <span class="n">January</span> <span class="mi">2004</span>
-                 <span class="n">http:</span><span class="sr">//</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/licenses/</span>
-</pre></div>
-
-
-<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
-<ol>
-<li>
-<p>Definitions.</p>
-<p>"License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.</p>
-<p>"Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.</p>
-<p>"Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.</p>
-<p>"You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.</p>
-<p>"Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.</p>
-<p>"Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.</p>
-<p>"Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-  (an example is provided in the Appendix below).</p>
-<p>"Derivative Works" shall mean any work, whether in Source or Object
-  form, that is based on (or derived from) the Work and for which the
-  editorial revisions, annotations, elaborations, or other modifications
-  represent, as a whole, an original work of authorship. For the purposes
-  of this License, Derivative Works shall not include works that remain
-  separable from, or merely link (or bind by name) to the interfaces of,
-  the Work and Derivative Works thereof.</p>
-<p>"Contribution" shall mean any work of authorship, including
-  the original version of the Work and any modifications or additions
-  to that Work or Derivative Works thereof, that is intentionally
-  submitted to Licensor for inclusion in the Work by the copyright owner
-  or by an individual or Legal Entity authorized to submit on behalf of
-  the copyright owner. For the purposes of this definition, "submitted"
-  means any form of electronic, verbal, or written communication sent
-  to the Licensor or its representatives, including but not limited to
-  communication on electronic mailing lists, source code control systems,
-  and issue tracking systems that are managed by, or on behalf of, the
-  Licensor for the purpose of discussing and improving the Work, but
-  excluding communication that is conspicuously marked or otherwise
-  designated in writing by the copyright owner as "Not a Contribution."</p>
-<p>"Contributor" shall mean Licensor and any individual or Legal Entity
-  on behalf of whom a Contribution has been received by Licensor and
-  subsequently incorporated within the Work.</p>
-</li>
-<li>
-<p>Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.</p>
-</li>
-<li>
-<p>Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.</p>
-</li>
-<li>
-<p>Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:</p>
-<p>(a) You must give any other recipients of the Work or
-      Derivative Works a copy of this License; and</p>
-<p>(b) You must cause any modified files to carry prominent notices
-      stating that You changed the files; and</p>
-<p>(c) You must retain, in the Source form of any Derivative Works
-      that You distribute, all copyright, patent, trademark, and
-      attribution notices from the Source form of the Work,
-      excluding those notices that do not pertain to any part of
-      the Derivative Works; and</p>
-<p>(d) If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must
-      include a readable copy of the attribution notices contained
-      within such NOTICE file, excluding those notices that do not
-      pertain to any part of the Derivative Works, in at least one
-      of the following places: within a NOTICE text file distributed
-      as part of the Derivative Works; within the Source form or
-      documentation, if provided along with the Derivative Works; or,
-      within a display generated by the Derivative Works, if and
-      wherever such third-party notices normally appear. The contents
-      of the NOTICE file are for informational purposes only and
-      do not modify the License. You may add Your own attribution
-      notices within Derivative Works that You distribute, alongside
-      or as an addendum to the NOTICE text from the Work, provided
-      that such additional attribution notices cannot be construed
-      as modifying the License.</p>
-<p>You may add Your own copyright statement to Your modifications and
-  may provide additional or different license terms and conditions
-  for use, reproduction, or distribution of Your modifications, or
-  for any such Derivative Works as a whole, provided Your use,
-  reproduction, and distribution of the Work otherwise complies with
-  the conditions stated in this License.</p>
-</li>
-<li>
-<p>Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.</p>
-</li>
-<li>
-<p>Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.</p>
-</li>
-<li>
-<p>Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.</p>
-</li>
-<li>
-<p>Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.</p>
-</li>
-<li>
-<p>Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.</p>
-</li>
-</ol>
-<p>END OF TERMS AND CONDITIONS</p>
-<p>APPENDIX: How to apply the Apache License to your work.</p>
-<div class="codehilite"><pre>  <span class="n">To</span> <span class="n">apply</span> <span class="n">the</span> <span class="n">Apache</span> <span class="n">License</span> <span class="n">to</span> <span class="n">your</span> <span class="n">work</span><span class="p">,</span> <span class="n">attach</span> <span class="n">the</span> <span class="n">following</span>
-  <span class="n">boilerplate</span> <span class="n">notice</span><span class="p">,</span> <span class="n">with</span> <span class="n">the</span> <span class="n">fields</span> <span class="n">enclosed</span> <span class="n">by</span> <span class="n">brackets</span> <span class="s">&quot;[]&quot;</span>
-  <span class="n">replaced</span> <span class="n">with</span> <span class="n">your</span> <span class="n">own</span> <span class="n">identifying</span> <span class="n">information</span><span class="o">.</span> <span class="p">(</span><span class="n">Don</span><span class="err">&#39;</span><span class="n">t</span> <span class="n">include</span>
-  <span class="n">the</span> <span class="n">brackets</span><span class="o">!</span><span class="p">)</span>  <span class="n">The</span> <span class="n">text</span> <span class="n">should</span> <span class="n">be</span> <span class="n">enclosed</span> <span class="n">in</span> <span class="n">the</span> <span class="n">appropriate</span>
-  <span class="n">comment</span> <span class="n">syntax</span> <span class="k">for</span> <span class="n">the</span> <span class="n">file</span> <span class="nb">format</span><span class="o">.</span> <span class="n">We</span> <span class="n">also</span> <span class="n">recommend</span> <span class="n">that</span> <span class="n">a</span>
-  <span class="n">file</span> <span class="ow">or</span> <span class="n">class</span> <span class="n">name</span> <span class="ow">and</span> <span class="n">description</span> <span class="n">of</span> <span class="n">purpose</span> <span class="n">be</span> <span class="n">included</span> <span class="n">on</span> <span class="n">the</span>
-  <span class="n">same</span> <span class="s">&quot;printed page&quot;</span> <span class="n">as</span> <span class="n">the</span> <span class="n">copyright</span> <span class="n">notice</span> <span class="k">for</span> <span class="n">easier</span>
-  <span class="n">identification</span> <span class="n">within</span> <span class="n">third</span><span class="o">-</span><span class="n">party</span> <span class="n">archives</span><span class="o">.</span>
-</pre></div>
-
-
-<p>Copyright [yyyy] [name of copyright owner]</p>
-<p>Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at</p>
-<div class="codehilite"><pre>   <span class="n">http:</span><span class="sr">//</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/licenses/</span><span class="n">LICENSE</span><span class="o">-</span><span class="mi">2</span><span class="o">.</span><span class="mi">0</span>
-</pre></div>
-
-
-<p>Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-{noformat}</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/mailing-lists.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/mailing-lists.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/mailing-lists.html (original)
+++ websites/staging/river/trunk/content/mailing-lists.html Fri Nov  5 23:41:10 2010
@@ -1,57 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Mailing Lists</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h2 id="project_mailing_lists">Project Mailing Lists</h2>
-<p>These are the mailing lists that have been established for the Apache River project. For each list, there is a subscribe, unsubscribe, and an archive link.</p>
-<table>
-<thead>
-<tr>
-<th />
-<th>Name</th>
-<th />
-<th>Subscribe</th>
-<th />
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>River User List</td>
-<td><a href="mailto:river-user-subscribe@incubator.apache.org">river-user-subscribe</a></td>
-<td><a href="mailto:river-user-unsubscribe@incubator.apache.org">river-user-unsubscribe</a></td>
-<td><a href="mailto:river-user@incubator.apache.org">river-user</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/incubator-river-user/">mail-archives.apache.org</a></td>
-</tr>
-<tr>
-<td>River Commits List</td>
-<td><a href="mailto:river-commits-subscribe@incubator.apache.org">river-commits-subscribe</a></td>
-<td><a href="mailto:river-commits-unsubscribe@incubator.apache.org">river-commits-unsubscribe</a></td>
-<td><a href="mailto:river-commits@incubator.apache.org">river-commits</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/incubator-river-commits/">mail-archives.apache.org</a></td>
-</tr>
-</tbody>
-</table></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/river-applications.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river-applications.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/river-applications.html (original)
+++ websites/staging/river/trunk/content/river-applications.html Fri Nov  5 23:41:10 2010
@@ -1,30 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>River Applications</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="river_applications">River Applications</h1>
-<p>The following is a list of applications that provide additional value and functionality on top of River.</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/river-users.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/river-users.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/river-users.html (original)
+++ websites/staging/river/trunk/content/river-users.html Fri Nov  5 23:41:10 2010
@@ -1,30 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>River Users</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="river_users">River Users</h1>
-<p>The following a list companies and projects which successfully use River (or the original Jini code).</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/sidenav-quick-links.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/sidenav-quick-links.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/sidenav-quick-links.html (original)
+++ websites/staging/river/trunk/content/sidenav-quick-links.html Fri Nov  5 23:41:10 2010
@@ -1,35 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>SideNav Quick Links</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><ul>
-<li><a href="Index">Home</a> </li>
-<li>[License]</li>
-<li><a href="http://apache.org">ASF</a></li>
-<li>[Downloads]</li>
-<li>[Site Map]</li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/sidenav.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/sidenav.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/sidenav.html (original)
+++ websites/staging/river/trunk/content/sidenav.html Fri Nov  5 23:41:10 2010
@@ -1,60 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>SideNav</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h3 id="community">[Community]</h3>
-<ul>
-<li>[Get Involved]</li>
-<li>[River Users]</li>
-<li>[River Applications]</li>
-<li>[Downloads]</li>
-<li>[Documentation]</li>
-<li>[Mailing Lists]</li>
-<li>[Committers]</li>
-<li>[Found a Bug]?</li>
-</ul>
-<h3 id="development">[Development]</h3>
-<ul>
-<li>[Javadoc]</li>
-<li>[Source Code]</li>
-<li>[Development Process]</li>
-<li><a href="https://issues.apache.org/jira/browse/RIVER">Issue Tracker</a></li>
-<li><a href="http://wiki.apache.org/river/">Wiki</a></li>
-</ul>
-<h3 id="search">Search</h3>
-<p>{html}
-<DIV>
-<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
-<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
-  <INPUT maxlength="255" name="q" size="15" type="text" value></INPUT><BR></BR>
-  <INPUT name="btnG" type="submit" value="Search"></INPUT>
-  <INPUT name="domains" type="hidden" value="incubator.apache.org/river"></INPUT>
-  <INPUT name="sitesearch" type="hidden" value="incubator.apache.org/river"></INPUT>
-</FORM>
-</DIV>
-{html}</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/source-code.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/source-code.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/source-code.html (original)
+++ websites/staging/river/trunk/content/source-code.html Fri Nov  5 23:41:10 2010
@@ -1,72 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Source Code</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="river_source_code">River source code</h1>
-<p>River uses <a href="http://subversion.tigris.org/">Subversion</a> to manage its source code. Instructions on Subversion use can be found <a href="http://svnbook.red-bean.com">here</a>.</p>
-<p>The source code for the various deliverables of Apache River can be freely browsed at [http://svn.apache.org/viewvc/incubator/river/]. </p>
-<h2 id="anonymous_access">Anonymous access</h2>
-<p>The Apache River source can be checked out anonymously with this command (for the jtsk deliverable):</p>
-<p>{noformat}
-svn checkout http://svn.apache.org/repos/asf/incubator/river/jtsk/trunk river
-{noformat}</p>
-<h2 id="access_from_behind_a_firewall">Access from behind a firewall</h2>
-<p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via HTTPS:</p>
-<p>{noformat}
-svn checkout https://svn.apache.org/repos/asf/incubator/river/jtsk/trunk river
-{noformat}</p>
-<h2 id="access_through_a_proxy">Access through a proxy</h2>
-<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
-<p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p>
-<p>Example : Edit the 'servers' file and add something like :</p>
-<p>{noformat}
-[global]
-http-proxy-host = your.proxy.name
-http-proxy-port = 3128
-{noformat}</p>
-<h2 id="submitting_a_patch">Submitting a Patch</h2>
-<p>If you make changes to River, and would like to contribute the to the project, you should create a patch and post it to the <a href="http://issues.apache.org/jira/browse/RIVER">River JIRA issue tracker</a>. To create a patch, simply execute the following command:</p>
-<p>{noformat}
-svn diff &gt; your-changes.patch
-{noformat}</p>
-<p>If you've added new files, remember to "svn add" them so they get included in the diff.</p>
-<h2 id="developer_access">Developer Access</h2>
-<p>Everyone can access the River Subversion repository via HTTPS, but River Committers must checkout the Subversion repository via HTTPS.</p>
-<p>{noformat}
-svn checkout https://svn.apache.org/repos/asf/incubator/river/jtsk/trunk river
-{noformat}</p>
-<p>To commit changes to the repository, you must set your password on the Apache Subversion server. To set your password, use ssh to connect to svn.apache.org, and enter the command <em>svnpasswd</em>. This will prompt you to enter a svn password of your choice (pick a safe password). Now, now your are ready to commit changes using your username/password. Execute the following command to commit your changes (svn will prompt you for your password)</p>
-<p>{noformat}
-svn commit --username your-username
-Authentication realm: <a href="https://svn.apache.org:443">https://svn.apache.org:443</a> ASF Committers
-Password for 'your-username': your-password
-{noformat}</p>
-<p>You can also pass your password on the command line directly, but this is a security problem on multiuser unix computers (the command line arguments are available via the ps command). Here is the command if you are Windows or a single user unix computer:</p>
-<p>{noformat}
-svn commit --username your-username --password your-password
-{noformat}</p>
-<p>Remember to replace 'your-username' and 'your-password' with your actual username and password on svn.apache.org.</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file

Modified: websites/staging/river/trunk/content/top-navigation-bar.html
URL: http://svn.apache.org/viewvc/websites/staging/river/trunk/content/top-navigation-bar.html?rev=778767&r1=778766&r2=778767&view=diff
==============================================================================
--- websites/staging/river/trunk/content/top-navigation-bar.html (original)
+++ websites/staging/river/trunk/content/top-navigation-bar.html Fri Nov  5 23:41:10 2010
@@ -1,29 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en"><head>
-
-
-<!-- Quick and dirty template to get things on the road -->
-  
-    <title>Top Navigation Bar</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-    <link rel="stylesheet" type="text/css" media="screen" href="skeleton_files/style.html">
-    <script type="text/javascript" src="skeleton_files/jquery.html"></script>
-    <script type="text/javascript" src="skeleton_files/apache_boot.html"></script>
-    </head>
-<body>
-
-    
-    
-  
-    <div id="page" class="container_16">
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"></div></div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright © 2010 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body></html>
+single_narrative.html
\ No newline at end of file



Mime
View raw message