Author: buildbot
Date: Wed Dec 4 20:47:08 2013
New Revision: 889131
Log:
Staging update by buildbot for db
Modified:
websites/staging/db/trunk/content/ (props changed)
websites/staging/db/trunk/content/communication.html
websites/staging/db/trunk/content/contact.html
websites/staging/db/trunk/content/decisions.html
websites/staging/db/trunk/content/guidelines.html
websites/staging/db/trunk/content/index.html
websites/staging/db/trunk/content/mail.html
websites/staging/db/trunk/content/management.html
websites/staging/db/trunk/content/newproject.html
websites/staging/db/trunk/content/roles.html
websites/staging/db/trunk/content/sitemap.html
websites/staging/db/trunk/content/source-repos.html
websites/staging/db/trunk/content/source.html
websites/staging/db/trunk/content/whoweare.html
Propchange: websites/staging/db/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec 4 20:47:08 2013
@@ -1 +1 @@
-1450737
+1547905
Modified: websites/staging/db/trunk/content/communication.html
==============================================================================
--- websites/staging/db/trunk/content/communication.html (original)
+++ websites/staging/db/trunk/content/communication.html Wed Dec 4 20:47:08
2013
@@ -150,7 +150,7 @@ aware of changes to the repository.</p>
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/contact.html
==============================================================================
--- websites/staging/db/trunk/content/contact.html (original)
+++ websites/staging/db/trunk/content/contact.html Wed Dec 4 20:47:08 2013
@@ -150,7 +150,7 @@ ASF correspondence and licensing questio
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/decisions.html
==============================================================================
--- websites/staging/db/trunk/content/decisions.html (original)
+++ websites/staging/db/trunk/content/decisions.html Wed Dec 4 20:47:08 2013
@@ -222,7 +222,7 @@ consensus.</p>
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/guidelines.html
==============================================================================
--- websites/staging/db/trunk/content/guidelines.html (original)
+++ websites/staging/db/trunk/content/guidelines.html Wed Dec 4 20:47:08 2013
@@ -156,7 +156,7 @@ general at db.apache.org <a href="mail.h
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/index.html
==============================================================================
--- websites/staging/db/trunk/content/index.html (original)
+++ websites/staging/db/trunk/content/index.html Wed Dec 4 20:47:08 2013
@@ -102,7 +102,7 @@
<div class="wiki-content">
<h1 id="db-mission">DB Mission</h1>
<p>DB is a Project of the
-<a href="#Apache Software Foundation">Apache Software Foundation</a>, charged
with the
+<a href="#Apache%20Software%20Foundation">Apache Software Foundation</a>,
charged with the
creation and maintenance of commercial-quality, open-source, database solutions
based on software licensed to the Foundation, for distribution at no charge to
the public.</p>
@@ -149,7 +149,7 @@ development process, an open and pragmat
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/mail.html
==============================================================================
--- websites/staging/db/trunk/content/mail.html (original)
+++ websites/staging/db/trunk/content/mail.html Wed Dec 4 20:47:08 2013
@@ -188,7 +188,7 @@ adding a new project to DB, please see <
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/management.html
==============================================================================
--- websites/staging/db/trunk/content/management.html (original)
+++ websites/staging/db/trunk/content/management.html Wed Dec 4 20:47:08 2013
@@ -164,7 +164,7 @@ known.</p>
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/newproject.html
==============================================================================
--- websites/staging/db/trunk/content/newproject.html (original)
+++ websites/staging/db/trunk/content/newproject.html Wed Dec 4 20:47:08 2013
@@ -158,14 +158,14 @@ Products which have lost their corporate
<strong>not</strong> make good candidates. These products will lack a
development
community and won't have the support needed to succeed under the DB
umbrella.</p>
<p>For example, we have seen proposals that contain paragraphs like this:</p>
-<div class="codehilite"><pre> <span class="n">FooProduct</span> <span
class="n">is</span> <span class="n">currently</span> <span class="n">a</span>
<span class="n">production</span> <span class="n">quality</span> <span
class="n">product</span><span class="p">,</span> <span class="ow">and</span>
<span class="n">in</span>
- <span class="n">fact</span> <span class="n">is</span> <span
class="n">being</span> <span class="n">used</span> <span class="n">by</span>
<span class="n">a</span> <span class="n">live</span> <span
class="n">website</span><span class="o">.</span> <span class="n">It</span>
<span class="n">was</span> <span class="n">developed</span> <span
class="n">as</span> <span class="n">a</span>
+<div class="codehilite"><pre> <span class="n">FooProduct</span> <span
class="n">is</span> <span class="n">currently</span> <span class="n">a</span>
<span class="n">production</span> <span class="n">quality</span> <span
class="n">product</span><span class="p">,</span> <span class="n">and</span>
<span class="n">in</span>
+ <span class="n">fact</span> <span class="n">is</span> <span
class="n">being</span> <span class="n">used</span> <span class="n">by</span>
<span class="n">a</span> <span class="n">live</span> <span
class="n">website</span><span class="p">.</span> <span class="n">It</span>
<span class="n">was</span> <span class="n">developed</span> <span
class="n">as</span> <span class="n">a</span>
<span class="n">product</span> <span class="n">by</span> <span
class="n">FooCompany</span><span class="p">,</span> <span class="n">with</span>
<span class="n">the</span> <span class="n">intention</span> <span
class="n">that</span> <span class="n">we</span> <span class="n">would</span>
<span class="n">sell</span>
- <span class="n">it</span><span class="o">.</span> <span
class="n">However</span><span class="p">,</span> <span class="n">due</span>
<span class="n">to</span> <span class="n">various</span> <span
class="n">economic</span> <span class="n">factors</span> <span
class="n">such</span> <span class="n">as</span> <span class="n">the</span>
- <span class="n">decline</span> <span class="n">in</span> <span
class="n">FooProduct</span><span class="err">'</span><span
class="n">s</span> <span class="n">intended</span> <span
class="n">market</span> <span class="ow">and</span> <span class="n">the</span>
+ <span class="n">it</span><span class="p">.</span> <span
class="n">However</span><span class="p">,</span> <span class="n">due</span>
<span class="n">to</span> <span class="n">various</span> <span
class="n">economic</span> <span class="n">factors</span> <span
class="n">such</span> <span class="n">as</span> <span class="n">the</span>
+ <span class="n">decline</span> <span class="n">in</span> <span
class="n">FooProduct</span><span class="o">'</span><span class="n">s</span>
<span class="n">intended</span> <span class="n">market</span> <span
class="n">and</span> <span class="n">the</span>
<span class="n">recent</span> <span class="n">difficulties</span> <span
class="n">in</span> <span class="n">obtaining</span> <span
class="n">venture</span> <span class="n">capital</span><span class="p">,</span>
<span class="n">we</span> <span class="n">have</span>
- <span class="n">decided</span> <span class="n">that</span> <span
class="n">at</span> <span class="n">this</span> <span class="nb">time</span>
<span class="n">it</span> <span class="n">is</span> <span class="ow">not</span>
<span class="n">feasible</span> <span class="k">for</span> <span
class="n">us</span> <span class="n">to</span>
- <span class="k">continue</span> <span class="n">in</span> <span
class="n">that</span> <span class="n">direction</span><span class="o">.</span>
+ <span class="n">decided</span> <span class="n">that</span> <span
class="n">at</span> <span class="n">this</span> <span class="n">time</span>
<span class="n">it</span> <span class="n">is</span> <span class="n">not</span>
<span class="n">feasible</span> <span class="k">for</span> <span
class="n">us</span> <span class="n">to</span>
+ <span class="k">continue</span> <span class="n">in</span> <span
class="n">that</span> <span class="n">direction</span><span class="p">.</span>
</pre></div>
@@ -173,7 +173,7 @@ community and won't have the support nee
we must believe that a product will attract volunteers to extend and maintain
it over the long term. A product like this, arriving with no volunteer
developers or open source community, does not further
-<a href="index.html#DB Mission">DB's mission</a>, and would not be
accepted.</p>
+<a href="index.html#DB%20Mission">DB's mission</a>, and would not be
accepted.</p>
<p>We generally recommend that an orphaned product start with an independent
host, and consider making a proposal after it has started to build a
community.</p>
@@ -250,7 +250,7 @@ regarding the proposal will occur the Ge
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/roles.html
==============================================================================
--- websites/staging/db/trunk/content/roles.html (original)
+++ websites/staging/db/trunk/content/roles.html Wed Dec 4 20:47:08 2013
@@ -135,26 +135,26 @@ letter that should be sent to the volunt
been received:</p>
<div class="codehilite"><pre> <span class="n">Dear</span> <span
class="n">Contributor</span><span class="p">,</span>
- <span class="n">The</span> <span class="n">DB</span> <span
class="n">project</span> <span class="n">would</span> <span
class="n">like</span> <span class="n">to</span> <span class="n">offer</span>
<span class="n">you</span> <span class="n">commit</span> <span
class="n">privileges</span><span class="o">.</span>
- <span class="n">We</span> <span class="n">have</span> <span
class="n">been</span> <span class="n">impressed</span> <span
class="n">with</span> <span class="n">your</span> <span
class="n">contributions</span> <span class="n">up</span> <span
class="n">till</span> <span class="n">now</span><span class="p">,</span> <span
class="ow">and</span>
+ <span class="n">The</span> <span class="n">DB</span> <span
class="n">project</span> <span class="n">would</span> <span
class="n">like</span> <span class="n">to</span> <span class="n">offer</span>
<span class="n">you</span> <span class="n">commit</span> <span
class="n">privileges</span><span class="p">.</span>
+ <span class="n">We</span> <span class="n">have</span> <span
class="n">been</span> <span class="n">impressed</span> <span
class="n">with</span> <span class="n">your</span> <span
class="n">contributions</span> <span class="n">up</span> <span
class="n">till</span> <span class="n">now</span><span class="p">,</span> <span
class="n">and</span>
<span class="n">believe</span> <span class="n">that</span> <span
class="n">your</span> <span class="n">involvement</span> <span
class="n">will</span> <span class="n">improve</span> <span class="n">the</span>
<span class="n">quality</span> <span class="n">of</span> <span
class="n">the</span>
- <span class="n">libraries</span> <span class="n">we</span> <span
class="n">produce</span><span class="o">.</span>
+ <span class="n">libraries</span> <span class="n">we</span> <span
class="n">produce</span><span class="p">.</span>
<span class="n">It</span> <span class="n">is</span> <span
class="n">important</span> <span class="n">that</span> <span
class="n">you</span> <span class="n">realize</span> <span class="n">that</span>
<span class="n">these</span> <span class="n">commit</span> <span
class="n">privileges</span> <span class="n">give</span>
<span class="n">you</span> <span class="n">access</span> <span
class="n">to</span> <span class="n">the</span> <span class="n">specific</span>
<span class="n">DB</span> <span class="n">project</span> <span
class="n">repository</span> <span class="k">for</span> <span
class="n">which</span> <span class="n">you</span>
- <span class="n">are</span> <span class="n">involved</span> <span
class="n">with</span><span class="o">.</span> <span class="n">They</span> <span
class="k">do</span> <span class="ow">not</span> <span class="n">provide</span>
<span class="n">commit</span> <span class="n">access</span> <span
class="n">to</span> <span class="n">any</span> <span class="n">other</span>
- <span class="n">Apache</span> <span class="n">based</span> <span
class="n">project</span><span class="o">.</span> <span class="n">Those</span>
<span class="n">projects</span> <span class="n">will</span> <span
class="n">have</span> <span class="n">to</span> <span class="n">grant</span>
<span class="n">you</span> <span class="n">commit</span>
- <span class="n">privileges</span> <span class="n">themselves</span><span
class="o">.</span>
+ <span class="n">are</span> <span class="n">involved</span> <span
class="n">with</span><span class="p">.</span> <span class="n">They</span> <span
class="n">do</span> <span class="n">not</span> <span class="n">provide</span>
<span class="n">commit</span> <span class="n">access</span> <span
class="n">to</span> <span class="n">any</span> <span class="n">other</span>
+ <span class="n">Apache</span> <span class="n">based</span> <span
class="n">project</span><span class="p">.</span> <span class="n">Those</span>
<span class="n">projects</span> <span class="n">will</span> <span
class="n">have</span> <span class="n">to</span> <span class="n">grant</span>
<span class="n">you</span> <span class="n">commit</span>
+ <span class="n">privileges</span> <span class="n">themselves</span><span
class="p">.</span>
<span class="n">If</span> <span class="n">you</span> <span
class="n">are</span> <span class="n">interested</span> <span
class="n">in</span> <span class="n">having</span> <span class="n">commit</span>
<span class="n">privileges</span><span class="p">,</span> <span
class="n">please</span> <span class="n">just</span> <span class="n">let</span>
<span class="n">us</span>
- <span class="n">know</span><span class="p">,</span> <span
class="ow">and</span> <span class="n">we</span> <span class="n">will</span>
<span class="n">setup</span> <span class="n">an</span> <span
class="n">account</span> <span class="n">on</span> <span
class="n">apache</span><span class="o">.</span><span class="n">org</span><span
class="o">.</span> <span class="n">It</span> <span class="n">would</span> <span
class="n">expedite</span>
- <span class="n">the</span> <span class="n">process</span> <span
class="k">if</span> <span class="n">you</span> <span class="n">could</span>
<span class="n">provide</span> <span class="n">your</span> <span
class="n">preferred</span> <span class="n">account</span> <span
class="n">name</span> <span class="ow">and</span>
- <span class="n">possibly</span> <span class="n">a</span> <span
class="n">public</span> <span class="n">SSH</span> <span
class="n">key</span><span class="o">.</span> <span class="n">This</span> <span
class="n">process</span> <span class="n">could</span> <span
class="n">take</span> <span class="n">a</span> <span class="n">few</span> <span
class="n">days</span> <span class="n">once</span>
- <span class="n">we</span> <span class="n">get</span> <span
class="n">this</span> <span class="n">information</span><span class="o">.</span>
+ <span class="n">know</span><span class="p">,</span> <span
class="n">and</span> <span class="n">we</span> <span class="n">will</span>
<span class="n">setup</span> <span class="n">an</span> <span
class="n">account</span> <span class="n">on</span> <span
class="n">apache</span><span class="p">.</span><span class="n">org</span><span
class="p">.</span> <span class="n">It</span> <span class="n">would</span> <span
class="n">expedite</span>
+ <span class="n">the</span> <span class="n">process</span> <span
class="k">if</span> <span class="n">you</span> <span class="n">could</span>
<span class="n">provide</span> <span class="n">your</span> <span
class="n">preferred</span> <span class="n">account</span> <span
class="n">name</span> <span class="n">and</span>
+ <span class="n">possibly</span> <span class="n">a</span> <span
class="n">public</span> <span class="n">SSH</span> <span
class="n">key</span><span class="p">.</span> <span class="n">This</span> <span
class="n">process</span> <span class="n">could</span> <span
class="n">take</span> <span class="n">a</span> <span class="n">few</span> <span
class="n">days</span> <span class="n">once</span>
+ <span class="n">we</span> <span class="n">get</span> <span
class="n">this</span> <span class="n">information</span><span class="p">.</span>
- <span class="n">We</span> <span class="n">all</span> <span
class="n">hope</span> <span class="n">that</span> <span class="n">you</span>
<span class="nb">accept</span> <span class="n">this</span> <span
class="n">invitation</span><span class="o">.</span>
+ <span class="n">We</span> <span class="n">all</span> <span
class="n">hope</span> <span class="n">that</span> <span class="n">you</span>
<span class="n">accept</span> <span class="n">this</span> <span
class="n">invitation</span><span class="p">.</span>
- <span class="n">The</span> <span class="n">DB</span> <span
class="n">Project</span> <span class="n">Management</span> <span
class="n">Committee</span><span class="o">.</span>
+ <span class="n">The</span> <span class="n">DB</span> <span
class="n">Project</span> <span class="n">Management</span> <span
class="n">Committee</span><span class="p">.</span>
</pre></div>
@@ -210,7 +210,7 @@ individual may then be approved with a 3
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/sitemap.html
==============================================================================
--- websites/staging/db/trunk/content/sitemap.html (original)
+++ websites/staging/db/trunk/content/sitemap.html Wed Dec 4 20:47:08 2013
@@ -136,7 +136,7 @@
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/source-repos.html
==============================================================================
--- websites/staging/db/trunk/content/source-repos.html (original)
+++ websites/staging/db/trunk/content/source-repos.html Wed Dec 4 20:47:08 2013
@@ -142,7 +142,7 @@
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/source.html
==============================================================================
--- websites/staging/db/trunk/content/source.html (original)
+++ websites/staging/db/trunk/content/source.html Wed Dec 4 20:47:08 2013
@@ -181,12 +181,12 @@ submit patches against the latest Subver
order to avoid conflicts. This will also ensure that you are not submitting a
patch for a problem that has already been resolved.</p>
<p>For example:</p>
-<div class="codehilite"><pre> <span class="n">diff</span> <span
class="o">-</span><span class="n">u</span> <span class="n">Main</span><span
class="o">.</span><span class="n">java</span><span class="o">.</span><span
class="n">orig</span> <span class="n">Main</span><span class="o">.</span><span
class="n">java</span> <span class="o">>></span> <span
class="n">patchfile</span><span class="o">.</span><span class="n">txt</span>
+<div class="codehilite"><pre> <span class="n">diff</span> <span
class="o">-</span><span class="n">u</span> <span class="n">Main</span><span
class="p">.</span><span class="n">java</span><span class="p">.</span><span
class="n">orig</span> <span class="n">Main</span><span class="p">.</span><span
class="n">java</span> <span class="o">>></span> <span
class="n">patchfile</span><span class="p">.</span><span class="n">txt</span>
</pre></div>
<p>or (preferred)</p>
-<div class="codehilite"><pre> <span class="n">svn</span> <span
class="n">diff</span> <span class="n">Main</span><span class="o">.</span><span
class="n">java</span> <span class="o">>></span> <span
class="n">patchfile</span><span class="o">.</span><span class="n">txt</span>
+<div class="codehilite"><pre> <span class="n">svn</span> <span
class="n">diff</span> <span class="n">Main</span><span class="p">.</span><span
class="n">java</span> <span class="o">>></span> <span
class="n">patchfile</span><span class="p">.</span><span class="n">txt</span>
</pre></div>
@@ -231,7 +231,7 @@ applying the patch at the same time.</p>
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
Modified: websites/staging/db/trunk/content/whoweare.html
==============================================================================
--- websites/staging/db/trunk/content/whoweare.html (original)
+++ websites/staging/db/trunk/content/whoweare.html Wed Dec 4 20:47:08 2013
@@ -408,6 +408,8 @@ others can also learn from common mistak
<td>PMC Member, Torque</td>
</tr>
+
+
</table>
<h2 id="committers">Committers</h2>
@@ -823,7 +825,7 @@ others can also learn from common mistak
</div>
<div id="copyright_footer">
<hr/>
-<p>Copyright © 2013 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>
+<p>Copyright © 2013 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, Apache DB, Apache Derby, Apache Torque, Apache JDO, Apache
DDLUtils, the Derby hat logo, the Apache JDO logo, and the Apache feather logo
are trademarks of The Apache Software Foundation. All other marks mentioned may
be trademarks or registered trademarks of their respective owners.</p>
</div>
</body>
