Author: kschenk
Date: Fri Jan 13 23:37:42 2012
New Revision: 802588
Log:
Publishing merge to ooo-site site by kschenk
Added:
websites/production/ooo-site/content/es/descargas/
- copied from r802587,
websites/staging/ooo-site/trunk/content/es/descargas/
websites/production/ooo-site/content/es/descargas/0101GS3-IntroduccionOOo.odt
- copied unchanged from r802587,
websites/staging/ooo-site/trunk/content/es/descargas/0101GS3-IntroduccionOOo.odt
websites/production/ooo-site/content/es/descargas/0101GS3-IntroduccionOOo.pdf
- copied unchanged from r802587,
websites/staging/ooo-site/trunk/content/es/descargas/0101GS3-IntroduccionOOo.pdf
Modified:
websites/production/ooo-site/ (props changed)
websites/production/ooo-site/content/about/index.html
Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 23:37:42 2012
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-802300
+/websites/staging/ooo-site/trunk:797592-802587
Modified: websites/production/ooo-site/content/about/index.html
==============================================================================
--- websites/production/ooo-site/content/about/index.html (original)
+++ websites/production/ooo-site/content/about/index.html Fri Jan 13 23:37:42
2012
@@ -59,10 +59,9 @@ open-source project</a>. Both have been
<blockquote style="font-weight: bolder; font-style: oblique; font-size:
110%;">To create, as a community, the leading international office suite that
will
run on all major platforms and provide access to all functionality and data
through open-component based APIs and an XML-based file format.</blockquote>
-<p>The OpenOffice.org project is primarily sponsored by Oracle, which is the
- primary contributor of code to the project. Our other corporate contributors
-include RedFlag CH2000 (<a href="www.redoffice.com/">RedOffice.com</a>), and
-IBM, to name but two. Additionally over 500,000 people--unaffiliated
individuals,
+<p>Since its inception as an open source project. our corporate contributors
have
+included Oracle, RedFlag CH2000 (<a
href="www.redoffice.com/">RedOffice.com</a>), and
+IBM. Additionally over 500,000 people--unaffiliated individuals,
business and government employees, and students from nearly every curve of the
globe--have joined the project with the aim of creating the best possible
office
suite that all can use. Their work as a community is both invaluable and
practical:
@@ -76,14 +75,14 @@ contribute to it.</p>
<li><a href="#history">Historical background</a></li>
<li><a href="#licenses">Licenses</a></li>
<li><a href="#organization">Project Organization</a></li>
- <li><a href="#participation">Participation</a></li>
- <li><a href="#todos">To-Dos</a></li>
- <li><a href="#joining">Joining</a></li>
- <li><a href="#subscribing">Subscribing</a></li>
- <li><a href="#gov">Governance</a></li>
- <li><a href="#esc">Engineering Steering Committee</a></li>
- <li><a href="#logo">Logo and Trademark</a></li>
- <li><a href="#distribution">Community Distribution</a></li>
+ <li><a href="#participation">General Participation</a></li>
+ <!-- <li><a href="#todos">To-Dos</a></li> -->
+ <!-- <li><a href="#joining">Joining</a></li> -->
+ <li><a href="#subscribing">Mailing Lists</a></li>
+ <!-- <li><a href="#gov">Governance</a></li>
+ <li><a href="#esc">Engineering Steering Committee</a></li> -->
+ <li><a href="#logo">Logos and Trademark</a></li>
+ <li><a href="#distribution">Community Distribution</a></li>
<li><a href="#marketing">Marketing</a></li>
<li><a href="#presskit">Press Kit </a></li>
<li><a href="#testimonials">Testimonials</a></li>
@@ -108,10 +107,9 @@ beginning with 6.0, were built using the
and reference implementation. Sun continued to sponsor development on
OpenOffice.org
for the next 10 years, a period during which not only did the project grow
tremendously
and became truly global, but the user base also saw an extraordinary increase,
-and as of the end of 2010 was estimated to be in excess of 100 Million. Since
-its acquisition of Sun in 2010, Oracle is now the princip<font face="Arial,
Helvetica, sans-serif"><font face="Verdana, Geneva, sans-serif"><font
face="Arial, Helvetica, sans-serif"></font></font></font>al
-contributor of code to OpenOffice.org. <a
href="http://www.collab.net/";>CollabNet</a> hosts
-the website infrastructure for development of the product.</p>
+and as of the end of 2010 was estimated to be in excess of 100 Million. With
its acquisition of Sun in 2010, Oracle was the principal
+contributor of code to OpenOffice.org. On June 1, 2011, OpenOffice.org, the
project and product
+was donated to the Apache Software Foundation.</p>
<p>The source is written in C++ and delivers language-neutral and scriptable
functionality, including Java(TM) APIs. This source technology introduces the
@@ -125,11 +123,13 @@ other resources.</p>
<p><i>Foundations of Office Productivity in a Networked Age</i>, a <a
href="white_papers/index.html">white paper</a> from Sun available on this site,
presents a general outline for the technology roadmap. There you will find
outlined the design of the source. However, because of the nature of open
source, the community at large is ultimately responsible for realizing
OpenOffice.org's promises.</p>
-->
+<!--
<p>A <a href="http://www.openoffice.org/FAQs/mostfaqs.html#7";>FAQ</a> addresses
the changing differences between OpenOffice.org and StarOffice. (Information
differentiating OpenOffice.org and Oracle Open Office, successor to
StarOffice,
is forthcoming.).</p>
<br />
+-->
</div>
@@ -138,7 +138,7 @@ other resources.</p>
<h3><a name="licenses"></a>Licenses</h3>
<div class="indent">
-
+<!--
<p>OpenOffice.org uses the <a
href="http://www.openoffice.org/licenses/lgpl_license.html";
target="_blank">LGPL</a> (GNU
Lesser General Public License, v.3). For documentation and website content
not intended to be included in the product, OpenOffice.org uses the <a
href="http://www.openoffice.org/licenses/pdl.pdf";>
@@ -149,6 +149,8 @@ on the project's policies regarding the
<a href="http://www.openoffice.org/FAQs/faq-questions.html#licensing";>FAQs</a>
dealing
with licensing.</p>
<br />
+-->
+Openoffice.org is governed by the <a
href="http://incubator.apache.org/openofficeorg/license.html";>Apache License
Version 2.0</a>.
</div>
@@ -160,14 +162,16 @@ with licensing.</p>
<h4>The Three Main Categories</h4>
-<p>"OpenOffice.org," the overall project, comprises <a
href="http://projects.openoffice.org/";>many public projects</a>. There are
three main categories:</p>
+<p>Traditionally, "OpenOffice.org," the overall project, was comprised of many
"projects".
+The term "project" has now been replaced with "area" in most cases.</p>
<ul>
- <li><a href="http://projects.openoffice.org/";>Accepted</a></li>
- <li><a href="http://native-lang.openoffice.org";>Native-Lang</a></li>
- <li><a href="http://incubator.openoffice.org/";>Incubator</a></li>
+ <li><a href="http://www.openoffice.org/projects/accepted.html";>(Core) Focus
Areas</a></li>
+ <li><a
href="http://www.openoffice.org/projects/native-lang.html";>Native-Lang
Confederation</a></li>
+ <li><a href="http://www.openoffice.org/projects/incubator.html";>Incubator
Areas</a></li>
</ul>
+<!--
<p>Each category further houses many projects and sub-projects.</p>
<p><strong>Accepted Projects</strong> includes most of the technical projects
as well as some non-technical projects. Projects leads of those projects in this
@@ -195,42 +199,65 @@ After six months, a project housed here
<p>Finally, each project has its own associated mailing lists. To understand
the structure of the mailing lists, please go to our central
<a href="http://www.openoffice.org/mail_list.html";>Mail List page</a>.</p>
+-->
-<h4>About the Structure</h4>
+<h4>About the Website Openoffice.org</h4>
-<p>The "www" project is OpenOffice.org's
- primary public face. It is what you see when you look at the homepage and all
+<p>This web site, www.openoffice.org, is Apache OpenOffice.org's
+ primary user portal. The primary developer portal for Apache OpenOffice.org
is
+ <a href="http://incubator.apache.org/openofficeorg/";>Apache OpenOffice.org
(Incubating)</a>
+ <!--
+ It is what you see when you look at the homepage and all
those pages that are of the form,
"<code>http://www.openoffice.org/abc/xyz.html</code>".
The thing to look for is what comes
<i>before</i> "<code>.openoffice.org</code>". Particular projects are all of
the form "<code>http://[project].openoffice.org/abc/xyz.html</code>". Instead
of
"www" we have the project name.</p>
+-->
<br />
</div>
<hr style="display: block;"/>
-<h3><a name="participation"></a>Participation</h3>
+<h3><a name="participation"></a>General Participation</h3>
<div class="indent">
<p>There are a variety of ways you can actively <a
href="http://contributing.openoffice.org/index.html";>participate</a> in the
OpenOffice.org Community.
-These range from something as easy as a monetary donation, and participating
in mailing lists, to actually contributing code for the product. In any case,
+These range from something as easy as <a
href="http://www.apache.org/foundation/contributing.html";>donating</a> to the
Apache Software Foundation, or participating
+in mailing lists, to actually contributing code for the product. Please visit
the <a href="http://www.apache.org/foundation/getinvolved.html";>Apache Software
Foundation Get Involved</a>
+ page for an overview on what it means
+to be an Apache contributor/committer. </p>
+
+<p>To contribute code to the Openoffice.org project (user or developer web
sites or
+product), please <a
href="mailto:[email protected]";>subscribe to the Apache
Openoffice.org developer mailing list </a>to get started.
+If you are more interested in contributing to documentation in some way, you
should check out the <a
href="http://wiki.services.openoffice.org/wiki/Main_Page";>OpenOffice.org
wiki.</a>
+Please visit <a
href="http://incubator.apache.org/openofficeorg/get-involved.html";>Apache
OpenOffice.org Get Involved</a> for specific information about getting involved
in the Apache
+OpenOffice.org project.
+</p>
+
+<!--
+In any case,
the entire OpenOffice.org project uses guidelines that define the roles and
responsibilities of members, as well as describe how the source is maintained.
For more information, please review our <a
href="http://openoffice.org/dev_docs/guidelines.html";>Guidelines for
Participation</a>.</p>
+-->
+<!--
<p><strong><a name="todos"></a>To-Dos</strong></p>
<p>Our <a href="http://development.openoffice.org/todo.html";>"To-Dos" page</a>
lists the current tasks that need to be done. They range from the difficult
to the simple, and we urge all members to consult the page prior to embarking
on a new project. Additionally, there may be "To-Dos" listed on individual
project main pages.</p>
+
<p><strong><a name="joining"></a>Joining</strong></p>
-<p>OpenOffice.org is an Open Source project. This means, first, that we offer
not only a product but a process, and second, that we depend upon the
-contributions of developers and endusers to make that process happen. The
easiest way for you to help us out is to join the overall OpenOffice.org project
+<p>Apache OpenOffice.org is an Open Source project. This means, first, that we
offer not only a product but a process,
+and second, that we depend upon the
+contributions of developers and endusers to make that process happen. The
easiest way for you to help us out
+is to join the overall OpenOffice.org project
by <a href="http://www.openoffice.org/servlets/Join";>registering</a>.</p>
<p>Once you join the overall project, you are a contributor! You'll be able to
file issues, bugs, patches, or comment on already filed issues. You'll be
@@ -239,15 +266,20 @@ project's mailing lists (listed on each
join the OpenOffice.org. This is a democratic project and we want the best
possible office suite that depends on community involvement. There is no
requirement that you be a programmer. Just that you respect the other members
of the community and understand that we are very serious about this Project
and what it means.</p>
+-->
+
+<h3><a name="subscribing"></a>Mailing Lists</h3>
-<p><strong><a name="subscribing"></a>Subscribing</strong></p>
-<p>Much of the excitement of an Open Source site takes place in the <a
href="http://www.openoffice.org/mail_list.html";>mailing
- lists.</a> These are <strong>public.</strong> You <i>don't</i>
+<p>Much of the excitement of an Open Source site takes place in the <a
href="http://incubator.apache.org/openofficeorg/mailing-lists.html";>mailing
+ lists.</a> These are <strong>public.</strong>
+<!--
+ You <i>don't</i>
have to be a registered member of OpenOffice.org to subscribe to our mailing
lists, and subscribing obligates you to nothing (except receiving some
interesting
mail). If you are curious, interested, but not quite ready yet to take the
plunge
and join, we suggest you subscribe.</p>
+-->
<p><strong>All our major lists are public. What you post to these is on the
public
Internet.</strong> We suggest you do not post private information and keep
in mind the public and persistent nature of all that you write to the
lists.</p>
@@ -273,6 +305,7 @@ from that page to a digest versions of t
<br />
</div>
+<!--
<hr style="display: block;"/>
@@ -302,6 +335,7 @@ implementation. Constituted by senior de
</div>
<hr style="display: block;"/>
+-->
<h3><a name="logo"></a>Logos, Trademark</h3>
@@ -333,7 +367,7 @@ issues, OpenOffice.org must insist that
"OpenOffice" or "Open Office." </p>
<p><strong>Using the OpenOffice.org logos and banners</strong></p>
-
+<!--
<p>We are happy to provide permissions upon request via our <a
href="http://surveys.services.openoffice.org/forms/tmrequest";>trademark usage
request</a>
form, if you want to use the OpenOffice.org logo in a magazine, on a disk
label or a book or ... Describe your intended use and we will contact you
as soon as possible.<br />
@@ -355,6 +389,9 @@ request</a> form.</p>
<a href="http://marketing.openoffice.org/";>Marketing Project</a>). In addition
to the process to request permission described here follow the guidelines of
the activity in question.</p>
<br />
+-->
+Please review the <a
href="http://incubator.apache.org/openofficeorg/trademarks.html";>Apache
OpenOffice Trademarks page</a> for further information and to
+request to use the logo in any form or fashion.
</div>
@@ -421,6 +458,10 @@ some of the more recent ones.</p>
<p>We very much welcome your participation and your comments on all facets of
OpenOffice.org.</p>
+<p> Please contact us using <a href="mailto: [email protected]">
the developer mailing list.</a>
+</p>
+
+<!--
<p>The "Core Team" includes:</p>
<p><strong>Community Manager and lead.</strong> Responsible for day-to-day
management, long-term growth, and planning, community development.</p>
@@ -445,9 +486,10 @@ smooth release schedule.</p>
<p>We welcome your comments on the OpenOffice.org website. If you notice any
problems, have questions, or would like to offer a suggestion regarding the
layout and operation of the site, please see our "<a
href="http://www.openoffice.org/contact.html";>Contacting Us </a>" page.</p>
+-->
-<p>If, on the other hand, you have questions regarding how to <i>use</i>
OpenOffice.org, the software, please address your questions to our "users" list:
-<a
href="mailto:[email protected]";>[email protected]</a>.</p>
+<p>If, on the other hand, you have questions regarding how to <i>use</i>
OpenOffice.org, the software, please address your questions to our "users" list.
+Subscribe using <a
href="mailto:[email protected]";>[email protected]</a>.</p>
<br />
</div>
@@ -469,16 +511,16 @@ layout and operation of the site, please
<li><a
href="http://distribution.openoffice.org/cdrom/";>CD-ROMs</a> The
CD-ROM project page, with information for consumers and distributors</li>
<li><a
href="http://www.openoffice.org/awards/index.html";>Awards</a> The
awards page</li>
<li><a href="http://marketing.openoffice.org/press_kit.html";>Media
Resources</a> The page for media inquiries, including press FAQ</li>
- <li><a href="http://www.openoffice.org/contact.html";>Contact
Us</a> The key page listing mail addresses for communicating with the
- administrative staff</li>
- <li><a
href="http://projects.openoffice.org/index.html";>Projects</a> The
list of active projects that you may join. Together, these make up
- OpenOffice.org</li>
- <li><a href="http://www.openoffice.org/license.html";>Licenses</a> Texts
of the licenses (PDL and LGPL) and explanations of licensing policy</li>
+ <!-- <li><a href="http://www.openoffice.org/contact.html";>Contact
Us</a> The key page listing mail addresses for communicating with the
+ administrative staff</li> -->
+ <!-- <li><a
href="http://projects.openoffice.org/index.html";>Projects</a> The
list of active projects that you may join. Together, these make up
+ OpenOffice.org</li> -->
+ <li><a
href="http://incubator.apache.org/openofficeorg/license.html";>Licenses</a> Information
about the Apache Software Foundation License</li>
</ul>
<ul>
- <li><a
href="http://www.openoffice.org/dev_docs/guidelines.html";>Participation</a> How
to actively work in the Community</li>
- <li><a
href="http://www.openoffice.org/about_us/protocols_proposing.html";>Project
Proposal</a> What to do about proposing and setting up a project</li>
+ <!-- <li><a
href="http://www.openoffice.org/dev_docs/guidelines.html";>Participation</a> How
to actively work in the Community</li> -->
+ <!-- <li><a
href="http://www.openoffice.org/about_us/protocols_proposing.html";>Project
Proposal</a> What to do about proposing and setting up a project</li> -->
</ul>
<ul>
@@ -491,7 +533,6 @@ layout and operation of the site, please
<hr style="display: block;"/>
-<p>$Date: 2011/02/07 05:32:25 $ $Revision: 1.48 $</p>
</div>
