incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksch...@apache.org
Subject svn commit: r1230835 - /incubator/ooo/ooo-site/trunk/content/about/index.html
Date Thu, 12 Jan 2012 23:21:00 GMT
Author: kschenk
Date: Thu Jan 12 23:21:00 2012
New Revision: 1230835

URL: http://svn.apache.org/viewvc?rev=1230835&view=rev
Log:
kls -- many changes to about/index.html

Modified:
    incubator/ooo/ooo-site/trunk/content/about/index.html

Modified: incubator/ooo/ooo-site/trunk/content/about/index.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/about/index.html?rev=1230835&r1=1230834&r2=1230835&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/about/index.html (original)
+++ incubator/ooo/ooo-site/trunk/content/about/index.html Thu Jan 12 23:21:00 2012
@@ -66,9 +66,9 @@ and reference implementation. Sun contin
 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>
+its acquisition of  Sun in 2010, Oracle was the principal
+contributor of code to OpenOffice.org. As of 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
@@ -82,11 +82,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>
 
@@ -95,7 +97,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">
@@ -106,6 +108,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>
 
@@ -117,14 +121,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 <a href="http://projects.openoffice.org/">many
 "projects"</a>. 
+The term "project" has now been replaced with "focus 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://projects.openoffice.org/">(Core) Focus Areas</a></li>
+  <li><a href="http://native-lang.openoffice.org">Native-Lang Confederation</a></li>
+  <li><a href="http://incubator.openoffice.org/">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
@@ -152,42 +158,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>The 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 committer. </p>
+
+<p>To contribute code to the Openoffice.org project (user web site or
+product), please <a href="mailto:ooo-dev-subscribe@incubator.apache.org">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
@@ -196,15 +225,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>
+-->
 
-<p><strong><a name="subscribing"></a>Subscribing</strong></p>
+<h3><a name="subscribing"></a>Mailing Lists</h3>
 
-<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>
@@ -230,6 +264,7 @@ from that page to a digest versions of t
 <br />
 
 </div>
+<!-- 
 
 <hr style="display: block;"/>
 
@@ -259,6 +294,7 @@ implementation. Constituted by senior de
 </div>
 
 <hr style="display: block;"/>
+-->
 
 <h3><a name="logo"></a>Logos, Trademark</h3>
 
@@ -290,7 +326,7 @@ issues, OpenOffice.org must insist that 
 "OpenOffice" or "Open Office."&nbsp;</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 ...&nbsp; Describe your intended use and we will contact you
 as soon as possible.<br /> 
@@ -312,6 +348,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>
 



Mime
View raw message