Author: mseidel
Date: Wed Apr 5 20:31:25 2017
New Revision: 1790326
URL: http://svn.apache.org/viewvc?rev=1790326&view=rev
Log:
Updated links, fixed typos
Modified:
openoffice/site/trunk/content/community-faqs.mdtext
openoffice/site/trunk/content/contact.mdtext
openoffice/site/trunk/content/contributing-code.mdtext
openoffice/site/trunk/content/css/ooo.css
openoffice/site/trunk/content/people.mdtext
openoffice/site/trunk/content/press.mdtext
openoffice/site/trunk/content/trademarks.mdtext
Modified: openoffice/site/trunk/content/community-faqs.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/community-faqs.mdtext?rev=1790326&r1=1790325&r2=1790326&view=diff
==============================================================================
--- openoffice/site/trunk/content/community-faqs.mdtext (original)
+++ openoffice/site/trunk/content/community-faqs.mdtext Wed Apr 5 20:31:25 2017
@@ -27,7 +27,7 @@ sounds inefficient and frustrating. Don'
set of simple processes to ensure things proceed at a good pace.
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.
@@ -51,7 +51,7 @@ consensus][12] model.
Occasionally a "feel" for consensus is not enough. Sometimes we need to
have a measurable consensus. For example, when [voting][13] in new committers
or
-to approve a release.
+to approve a release.
Modified: openoffice/site/trunk/content/contact.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/contact.mdtext?rev=1790326&r1=1790325&r2=1790326&view=diff
==============================================================================
--- openoffice/site/trunk/content/contact.mdtext (original)
+++ openoffice/site/trunk/content/contact.mdtext Wed Apr 5 20:31:25 2017
@@ -17,7 +17,8 @@ Notice: Licensed to the Apache Softwa
under the License.
Any questions dealing with the use of Apache OpenOffice maybe directed to
either the user web forums at:
- - [http://forum.openoffice.org]
+
+ - [https://forum.openoffice.org]
or if you prefer to use a mailing list:
Modified: openoffice/site/trunk/content/contributing-code.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/contributing-code.mdtext?rev=1790326&r1=1790325&r2=1790326&view=diff
==============================================================================
--- openoffice/site/trunk/content/contributing-code.mdtext (original)
+++ openoffice/site/trunk/content/contributing-code.mdtext Wed Apr 5 20:31:25
2017
@@ -18,38 +18,37 @@ Notice: Licensed to the Apache Softwa
If you have code that you want to contribute to the Apache OpenOffice project,
then we would [love to talk to you](mailto:[email protected]) about
this.
-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.
+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.
The main requirements for contributing code to Apache OpenOffice are:
- 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 [dev
list](http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public),
+discussed on the [dev
list](https://openoffice.apache.org/mailing-lists.html#development-mailing-list-public),
to see how these can be brought into conformance with
-[ASF policy](http://www.apache.org/legal/resolved.html#category-a).
+[ASF policy](https://www.apache.org/legal/resolved.html#category-a).
- 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.
- - 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
+ - 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.
Some specific scenarios:
- - For small bug fixes and enhancements, contributed by the original author
of the code, these are best submitted as patches attached to a [Bugzilla
issue](https://issues.apache.org/ooo/)
+ - For small bug fixes and enhancements, contributed by the original author
of the code, these are best submitted as patches attached to a [Bugzilla
issue](https://bz.apache.org/ooo/)
- For larger contributions, contributed by a single original author, we
might ask you to
- submit an [Individual Contributor License Agreement
(ICLA)](http://www.apache.org/licenses/icla.txt) form.
+ submit an [Individual Contributor License Agreement
(ICLA)](https://www.apache.org/licenses/icla.txt) 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.
+ protect the users of Apache OpenOffice. All project Committers have also
signed this form.
- For contributions of multi-author code, it is best to start a discussion
on our [dev mailing list](mailto:[email protected]) so we can discuss
the most appropriate way of processing it.
- - For large codebases developed outside of Apache, especially ones created
behind a corporate firewall, we typically require a [Software Grant
Agreement](http://www.apache.org/licenses/cla-corporate.txt)
- before we can accept the contribution. Again, an early discussion on our
[dev mailing list](mailto:[email protected]) is recommended.
+ - For large codebases developed outside of Apache, especially ones created
behind a corporate firewall, we typically require a [Software Grant
Agreement](https://www.apache.org/licenses/cla-corporate.txt)
+ before we can accept the contribution. Again, an early discussion on our
[dev mailing list](mailto:[email protected]) is recommended.
-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
+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
[send us a note](mailto:[email protected]) 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.
-
Modified: openoffice/site/trunk/content/css/ooo.css
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/css/ooo.css?rev=1790326&r1=1790325&r2=1790326&view=diff
==============================================================================
--- openoffice/site/trunk/content/css/ooo.css (original)
+++ openoffice/site/trunk/content/css/ooo.css Wed Apr 5 20:31:25 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: openoffice/site/trunk/content/people.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/people.mdtext?rev=1790326&r1=1790325&r2=1790326&view=diff
==============================================================================
--- openoffice/site/trunk/content/people.mdtext (original)
+++ openoffice/site/trunk/content/people.mdtext Wed Apr 5 20:31:25 2017
@@ -17,7 +17,7 @@ Notice: Licensed to the Apache Softwa
under the License.
- A list of current project volunteers can be found on our wiki
[here](https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers).
-The information there is self-managed by volunteers.
- - Project Committers and PMC members are listed in the [Apache Phone
Book](https://people.apache.org/phonebook.html) under Apache OpenOffice. New
developers are announced on the [Development Mailing
List](http://openoffice.apache.org/mailing-lists.html).
- - We also have a large cumulative list of [legacy
contributors](http://www.openoffice.org/welcome/credits.html) to OpenOffice
+ The information there is self-managed by volunteers.
+ - Project Committers and PMC members are listed in the [Apache Phone
Book](https://people.apache.org/phonebook.html) under Apache OpenOffice. New
developers are announced on the [Development Mailing
List](https://openoffice.apache.org/mailing-lists.html).
+ - We also have a large cumulative list of [legacy
contributors](https://www.openoffice.org/welcome/credits.html) to OpenOffice
Modified: openoffice/site/trunk/content/press.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/press.mdtext?rev=1790326&r1=1790325&r2=1790326&view=diff
==============================================================================
--- openoffice/site/trunk/content/press.mdtext (original)
+++ openoffice/site/trunk/content/press.mdtext Wed Apr 5 20:31:25 2017
@@ -18,7 +18,7 @@ Notice: Licensed to the Apache Softwa
## Press Inquiries
-The Apache OpenOffice Project Management Committee welcomes inquiries from the
press. We can be contacted via email at [[email protected]][1].
+The Apache OpenOffice Project Management Committee welcomes inquiries from the
press. We can be contacted via email at [[email protected]][1].
For members of the media and analyst communities with questions of a broader
Apache nature, please contact the
[ASF Press Team][2] directly.
@@ -32,7 +32,7 @@ lists or forums, write articles on perso
on news websites or blogs or use social networks.
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 [[email protected]][3].
[1]: mailto:[email protected]
Modified: openoffice/site/trunk/content/trademarks.mdtext
URL:
http://svn.apache.org/viewvc/openoffice/site/trunk/content/trademarks.mdtext?rev=1790326&r1=1790325&r2=1790326&view=diff
==============================================================================
--- openoffice/site/trunk/content/trademarks.mdtext (original)
+++ openoffice/site/trunk/content/trademarks.mdtext Wed Apr 5 20:31:25 2017
@@ -18,9 +18,9 @@ Notice: Licensed to the Apache Softwa
##Getting permission to use our trademarks
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
-[graphical logos] [5]. Use of these marks is prohibited without explicit
+[graphical logos] [5]. Use of these marks is prohibited without explicit
permission from the ASF.
However, the Apache OpenOffice project is happy to work with 3rd
@@ -31,10 +31,10 @@ fully in conformance with Apache policie
To request such permission, follow these steps:
1. First familiarize yourself with the [Apache Trademark Policy] [1].
-Many of the common cases are already addressed there. And some uses
+Many of the common cases are already addressed there. And some uses
of ASF marks ("nominative use") are automatically allowed.
-1. Email a proposal to [[email protected]] [2]. In the
+1. Email a proposal to [[email protected]] [2]. In the
proposal, please include:
1. Name and contact information of the company, organization or person
@@ -42,7 +42,7 @@ requesting the permission
1. A list of what ASF controlled marks you wish to use
- 1. A description of how these marks would be used. Give supporting
+ 1. 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.
@@ -77,11 +77,11 @@ relevant details, especially, a URL for
##The "Get it here!" download logo
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 ["Get it here!"][3]
+project by hosting a download logo on their website. The ["Get it here!"][3]
logo may be used according to the requirements listed on that page.
-[1]: http://www.apache.org/foundation/marks/
+[1]: https://www.apache.org/foundation/marks/
[2]: mailto:[email protected]?subject=Trademark
-[3]: http://openoffice.apache.org/get-it-here.html
+[3]: https://openoffice.apache.org/get-it-here.html
[4]:
mailto:[email protected]?subject=Possible%20trademark%20infringement
-[5]: http://www.openoffice.org/marketing/art/galleries/logos/index.html
+[5]: https://www.openoffice.org/marketing/art/galleries/logos/index.html
