openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1009879 - in /websites/staging/openoffice/trunk/content: ./ community-faqs.html contact.html contributing-code.html css/ooo.css people.html press.html trademarks.html
Date Wed, 05 Apr 2017 20:31:33 GMT
Author: buildbot
Date: Wed Apr  5 20:31:33 2017
New Revision: 1009879

Log:
Staging update by buildbot for openoffice

Modified:
    websites/staging/openoffice/trunk/content/   (props changed)
    websites/staging/openoffice/trunk/content/community-faqs.html
    websites/staging/openoffice/trunk/content/contact.html
    websites/staging/openoffice/trunk/content/contributing-code.html
    websites/staging/openoffice/trunk/content/css/ooo.css
    websites/staging/openoffice/trunk/content/people.html
    websites/staging/openoffice/trunk/content/press.html
    websites/staging/openoffice/trunk/content/trademarks.html

Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr  5 20:31:33 2017
@@ -1 +1 @@
-1790141
+1790326

Modified: websites/staging/openoffice/trunk/content/community-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/community-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/community-faqs.html Wed Apr  5 20:31:33 2017
@@ -132,7 +132,7 @@ appropriate, have it considered by the c
 sounds inefficient and frustrating. Don't despair though, The Apache Way has a
 set of simple processes to ensure things proceed at a good pace.</p>
 <p>In ASF projects we don't like to vote. We reserve that for the few things that need

-official approval for legal or process reasons (e.g. a release or a new committer). 
+official approval for legal or process reasons (e.g. a release or a new committer).
 Most of the time we work with the consensus building techniques documented below.</p>
 <h2 id="what-is-lazy-consensus">What is "Lazy Consensus"?<a class="headerlink" href="#what-is-lazy-consensus"
title="Permanent link">&para;</a></h2>
 <p><a href="/docs/governance/lazyConsensus.html">Lazy consensus</a> is
the first, and possibly the most important, consensus building 
@@ -148,7 +148,7 @@ consensus</a> model.</p>
 <h2 id="what-about-voting">What about voting?<a class="headerlink" href="#what-about-voting"
title="Permanent link">&para;</a></h2>
 <p>Occasionally a "feel" for consensus is not enough. Sometimes we need to 
 have a measurable consensus. For example, when <a href="/docs/governance/voting.html">voting</a>
in new committers or 
-to approve a release. </p>
+to approve a release.</p>
   </div>
 
   <div id="footera">

Modified: websites/staging/openoffice/trunk/content/contact.html
==============================================================================
--- websites/staging/openoffice/trunk/content/contact.html (original)
+++ websites/staging/openoffice/trunk/content/contact.html Wed Apr  5 20:31:33 2017
@@ -124,8 +124,10 @@ h2:hover > .headerlink, h3:hover > .head
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
> .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink
{ visibility: visible }</style>
-<p>Any questions dealing with the use of Apache OpenOffice maybe directed to either
the user web forums at:
-  - [http://forum.openoffice.org]</p>
+<p>Any questions dealing with the use of Apache OpenOffice maybe directed to either
the user web forums at:</p>
+<ul>
+<li>[https://forum.openoffice.org]</li>
+</ul>
 <p>or if you prefer to use a mailing list:</p>
 <ul>
 <li>Subscribe: users-subscribe@openoffice.apache.org</li>

Modified: websites/staging/openoffice/trunk/content/contributing-code.html
==============================================================================
--- websites/staging/openoffice/trunk/content/contributing-code.html (original)
+++ websites/staging/openoffice/trunk/content/contributing-code.html Wed Apr  5 20:31:33 2017
@@ -125,37 +125,37 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
> .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink
{ visibility: visible }</style>
 <p>If you have code that you want to contribute to the Apache OpenOffice project, then
we would <a href="mailto:dev@openoffice.apache.org">love to talk to you</a> about
this.</p>
-<p>Apache projects put a strong emphasis on code pedigree and reviewing and documenting
licenses and notices, more so than many other open source projects.  This is done to make
our
-projects more valuable to users, especially to other developers.  This is one of the ways
we add value, one of the things that makes Apache special.  So please don't be offended
-if one of the first things we question you about is the license and the pedigree of the code.
</p>
+<p>Apache projects put a strong emphasis on code pedigree and reviewing and documenting
licenses and notices, more so than many other open source projects. This is done to make our
+projects more valuable to users, especially to other developers. This is one of the ways
we add value, one of the things that makes Apache special. So please don't be offended
+if one of the first things we question you about is the license and the pedigree of the code.</p>
 <p>The main requirements for contributing code to Apache OpenOffice are:</p>
 <ul>
 <li>The code must be under the Apache License 2.0 and it must be
 contributed by or with permission of the original author(s) of the code.
 Dependencies on third party libraries should be
-discussed on the <a href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public">dev
list</a>,
+discussed on the <a href="https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public">dev
list</a>,
 to see how these can be brought into conformance with
-<a href="http://www.apache.org/legal/resolved.html#category-a">ASF policy</a>.</li>
+<a href="https://www.apache.org/legal/resolved.html#category-a">ASF policy</a>.</li>
 <li>The code must be of sufficient quality and value  to the project that our programmer
(Committers) approve it, or at least don't reject it.</li>
-<li>We're happy to accept a small patch to fix a bug here or there, without further
commitment from the code author.  But the larger the contribution 
-the greater is the need for help integrating, testing and maintaining the code.  This doesn't
necessarily
-require participation from the original author(s) of the code, though this is encouraged.
 But we will want to see that there is support in the community
+<li>We're happy to accept a small patch to fix a bug here or there, without further
commitment from the code author. But the larger the contribution 
+the greater is the need for help integrating, testing and maintaining the code. This doesn't
necessarily
+require participation from the original author(s) of the code, though this is encouraged.
But we will want to see that there is support in the community
 sufficient for sustaining the development of significant contributions.</li>
 </ul>
 <p>Some specific scenarios:</p>
 <ul>
-<li>For small bug fixes and enhancements, contributed by the original author of the
code, these are best submitted as patches attached to a <a href="https://issues.apache.org/ooo/">Bugzilla
issue</a></li>
+<li>For small bug fixes and enhancements, contributed by the original author of the
code, these are best submitted as patches attached to a <a href="https://bz.apache.org/ooo/">Bugzilla
issue</a></li>
 <li>For larger contributions, contributed by a single original author, we might ask
you to
-  submit an <a href="http://www.apache.org/licenses/icla.txt">Individual Contributor
License Agreement (ICLA)</a> form.
+  submit an <a href="https://www.apache.org/licenses/icla.txt">Individual Contributor
License Agreement (ICLA)</a> form.
   The copyright on your code will still belong to you, but the ICLA helps
-  protect the users of Apache OpenOffice.  All project Committers have also signed this form.</li>
+  protect the users of Apache OpenOffice. All project Committers have also signed this form.</li>
 <li>For contributions of multi-author code, it is best to start a discussion on our
<a href="mailto:dev@openoffice.apache.org">dev mailing list</a> so we can discuss
the most appropriate way of processing it.</li>
-<li>For large codebases developed outside of Apache, especially ones created behind
a corporate firewall, we typically require a <a href="http://www.apache.org/licenses/cla-corporate.txt">Software
Grant Agreement</a> 
-  before we can accept the contribution.  Again, an early discussion on our <a href="mailto:dev@openoffice.apache.org">dev
mailing list</a> is recommended.</li>
+<li>For large codebases developed outside of Apache, especially ones created behind
a corporate firewall, we typically require a <a href="https://www.apache.org/licenses/cla-corporate.txt">Software
Grant Agreement</a> 
+  before we can accept the contribution. Again, an early discussion on our <a href="mailto:dev@openoffice.apache.org">dev
mailing list</a> is recommended.</li>
 </ul>
-<p>Note: It is perfectly fine for a programmer to contribute the same bug fix or feature
patch to multiple open source projects.  As the author you have the right to make your code
available
-to us under the Apache License as well as to make the same code available to another project
under LGPL.  Similarly, if you have code that you've contributed to another project under
-MPL or LGPL you can also make it available to us under the Apache License, maximizing the
number of people who will benefit from your work.  For small patches it would be sufficient
to 
+<p>Note: It is perfectly fine for a programmer to contribute the same bug fix or feature
patch to multiple open source projects. As the author you have the right to make your code
available
+to us under the Apache License as well as to make the same code available to another project
under LGPL. Similarly, if you have code that you've contributed to another project under
+MPL or LGPL you can also make it available to us under the Apache License, maximizing the
number of people who will benefit from your work. For small patches it would be sufficient
to 
 <a href="mailto:dev@openoffice.apache.org">send us a note</a> pointing to an
existing patch or VCS revision containing your contribution and stating that you wish to contribute
it to
 us under the Apache License as well.</p>
   </div>

Modified: websites/staging/openoffice/trunk/content/css/ooo.css
==============================================================================
--- websites/staging/openoffice/trunk/content/css/ooo.css (original)
+++ websites/staging/openoffice/trunk/content/css/ooo.css Wed Apr  5 20:31:33 2017
@@ -329,11 +329,12 @@ td {
 
 #copyrighta a {
  color: #107EC0;
- text-decoration:underline;
+ text-decoration:none;
 }
 
 #copyrighta a:hover {
  background-color: #e6ebed;
+ text-decoration:underline;
 }
 
 #poweredby {

Modified: websites/staging/openoffice/trunk/content/people.html
==============================================================================
--- websites/staging/openoffice/trunk/content/people.html (original)
+++ websites/staging/openoffice/trunk/content/people.html Wed Apr  5 20:31:33 2017
@@ -126,9 +126,9 @@ h2:hover > .headerlink, h3:hover > .head
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
> .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink
{ visibility: visible }</style>
 <ul>
 <li>A list of current project volunteers can be found on our wiki <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers">here</a>.
-The information there is self-managed by volunteers.</li>
-<li>Project Committers and PMC members  are listed in the <a href="https://people.apache.org/phonebook.html">Apache
Phone Book</a> under Apache OpenOffice. New developers are announced on the <a href="http://openoffice.apache.org/mailing-lists.html">Development
Mailing List</a>.</li>
-<li>We also have a large cumulative list of <a href="http://www.openoffice.org/welcome/credits.html">legacy
contributors</a> to OpenOffice </li>
+    The information there is self-managed by volunteers.</li>
+<li>Project Committers and PMC members  are listed in the <a href="https://people.apache.org/phonebook.html">Apache
Phone Book</a> under Apache OpenOffice. New developers are announced on the <a href="https://openoffice.apache.org/mailing-lists.html">Development
Mailing List</a>.</li>
+<li>We also have a large cumulative list of <a href="https://www.openoffice.org/welcome/credits.html">legacy
contributors</a> to OpenOffice </li>
 </ul>
   </div>
 

Modified: websites/staging/openoffice/trunk/content/press.html
==============================================================================
--- websites/staging/openoffice/trunk/content/press.html (original)
+++ websites/staging/openoffice/trunk/content/press.html Wed Apr  5 20:31:33 2017
@@ -125,7 +125,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
> .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink
{ visibility: visible }</style>
 <h2 id="press-inquiries">Press Inquiries<a class="headerlink" href="#press-inquiries"
title="Permanent link">&para;</a></h2>
-<p>The Apache OpenOffice Project Management Committee welcomes inquiries from the press.
 We can be contacted via email at <a href="mailto:press@openoffice.apache.org">press@openoffice.apache.org</a>.
</p>
+<p>The Apache OpenOffice Project Management Committee welcomes inquiries from the press.
We can be contacted via email at <a href="mailto:press@openoffice.apache.org">press@openoffice.apache.org</a>.</p>
 <p>For members of the media and analyst communities with questions of a broader Apache
nature, please contact the 
 <a href="https://www.apache.org/press/">ASF Press Team</a> directly.</p>
 <h2 id="unofficial-communication">Unofficial Communication<a class="headerlink"
href="#unofficial-communication" title="Permanent link">&para;</a></h2>
@@ -135,7 +135,7 @@ always express their personal opinions w
 lists or forums, write articles on personal blogs, post comments
 on news websites or blogs or use social networks.</p>
 <p>Personal opinions do not necessarily reflect the views of the
-Apache OpenOffice project.  For official responses the press should inquire by
+Apache OpenOffice project. For official responses the press should inquire by
 e-mailing <a href="mailto:press@openoffice.apache.org">press@openoffice.apache.org</a>.</p>
   </div>
 

Modified: websites/staging/openoffice/trunk/content/trademarks.html
==============================================================================
--- websites/staging/openoffice/trunk/content/trademarks.html (original)
+++ websites/staging/openoffice/trunk/content/trademarks.html Wed Apr  5 20:31:33 2017
@@ -126,9 +126,9 @@ h2:hover > .headerlink, h3:hover > .head
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover
> .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink
{ visibility: visible }</style>
 <h2 id="getting-permission-to-use-our-trademarks">Getting permission to use our trademarks<a
class="headerlink" href="#getting-permission-to-use-our-trademarks" title="Permanent link">&para;</a></h2>
 <p>The Apache Software Foundation holds trademarks on behalf of its
-projects.  For the Apache OpenOffice project these trademarks include
+projects. For the Apache OpenOffice project these trademarks include
 the names Apache OpenOffice™ and OpenOffice.org®, as well as the
-<a href="http://www.openoffice.org/marketing/art/galleries/logos/index.html">graphical
logos</a>.  Use of these marks is prohibited without explicit
+<a href="https://www.openoffice.org/marketing/art/galleries/logos/index.html">graphical
logos</a>. Use of these marks is prohibited without explicit
 permission from the ASF.</p>
 <p>However, the Apache OpenOffice project is happy to work with 3rd
 parties who desire to use these trademarks in ways that are beneficial
@@ -137,12 +137,12 @@ fully in conformance with Apache policie
 <p>To request such permission, follow these steps:</p>
 <ol>
 <li>
-<p>First familiarize yourself with the <a href="http://www.apache.org/foundation/marks/">Apache
Trademark Policy</a>.
-Many of the common cases are already addressed there.  And some uses
+<p>First familiarize yourself with the <a href="https://www.apache.org/foundation/marks/">Apache
Trademark Policy</a>.
+Many of the common cases are already addressed there. And some uses
 of ASF marks ("nominative use") are automatically allowed.</p>
 </li>
 <li>
-<p>Email a proposal to <a href="mailto:private@openoffice.apache.org?subject=Trademark">private@openoffice.apache.org</a>.
 In the
+<p>Email a proposal to <a href="mailto:private@openoffice.apache.org?subject=Trademark">private@openoffice.apache.org</a>.
In the
 proposal, please include:</p>
 <ol>
 <li>
@@ -153,7 +153,7 @@ requesting the permission</p>
 <p>A list of what ASF controlled marks you wish to use</p>
 </li>
 <li>
-<p>A description of how these marks would be used.  Give supporting
+<p>A description of how these marks would be used. Give supporting
 detail, along with context  If you are requesting use of the logo, for
 example, provide a prototype of how the logo would appear in the
 context of the overall design.</p>
@@ -195,7 +195,7 @@ relevant details, especially, a URL for
 </ol>
 <h2 id="the-get-it-here-download-logo">The "Get it here!" download logo<a class="headerlink"
href="#the-get-it-here-download-logo" title="Permanent link">&para;</a></h2>
 <p>A specific logo is recommended for use by those who wish to help promote the 
-project by hosting a download logo on their website.  The <a href="http://openoffice.apache.org/get-it-here.html">"Get
it here!"</a> 
+project by hosting a download logo on their website. The <a href="https://openoffice.apache.org/get-it-here.html">"Get
it here!"</a> 
 logo may be used according to the requirements listed on that page.</p>
   </div>
 



Mime
View raw message