Author: buildbot
Date: Tue Jun 25 14:25:55 2013
New Revision: 867392
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/distribution/oem/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 25 14:25:55 2013
@@ -1 +1 @@
-1496479
+1496485
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 25 14:25:55 2013
@@ -1 +1 @@
-1496479
+1496485
Modified: websites/staging/ooo-site/trunk/content/distribution/oem/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/distribution/oem/index.html
(original)
+++ websites/staging/ooo-site/trunk/content/distribution/oem/index.html Tue Jun
25 14:25:55 2013
@@ -3,16 +3,13 @@
<head>
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
-<meta content="HTML Tidy for Mac OS X (vers 1st December 2002), see www.w3.org"
- name="generator" />
- <title>OEM Project</title>
+ <title>OEM/Bundling of Apache OpenOffice</title>
<meta name="DC.Subject" lang="eng" content="oem" />
<meta name="DC.Subject" lang="eng" content="original equipment
manufacturer" />
<meta name="DC.Description" lang="eng" content="The OEM project concerns
- OEM distribution of OpenOffice.org files. It lists OEMs distributing
- OOo plus lists <b>what</b> they should be distributing." />
+ OEM distribution of OpenOffice files." />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css" media="screen">
@@ -47,42 +44,19 @@
-<h2>OEM Project</h2>
-<p> </p>
-<p>The OEM project concerns the distribution of OpenOffice.org
-files by Original Equipment Manufacturers (OEMs). </p>
+<h2>OEM/Bundling of Apache OpenOffice</h2>
-<p>If you would like to join the project, please send a note to the OEM
-distribution project list,
-<a
href="mailto:[email protected]";>[email protected]</a></p>
-
-<p class="Header"><a name="howto"></a>How to distribute OpenOffice.org with
your hardware</p>
-
-<p>Please refer to the <a href="../../files.html">files page</a> for the
latest information on which files to distribute. Other than that, there are
only three obligations:
-</p>
-
-<ul>
- <li>Let us know by sending mail to <a
href="mailto:[email protected]";>[email protected]</a>.
Be sure to include which languages and versions you are providing and
describe any modificiations or customizations. <br /> </li>
-
- <li>Join <a
href="mailto:[email protected]";>[email protected]</a>
for new releases, updates, and other important information. Not a discussion
list.<br /> </li>
-
- <li>You must place a disclaimer in your documentation that reads:
-
-<blockquote><i>These binaries (installable software) are in development. They
may not be fully stable and should be used with caution. We make no claims
about them.</i></blockquote></li>
-
-
-</ul>
-
-<p class="Header"><a name="mailinglists"></a>Mailing Lists</p>
-
-<p>We have three primary mailing lists. You must be subscribed to these to
post unmoderated messages. We encourage all to join the
[email protected] list, as it is for discussion. But it is
only obligatory to join the "<em>[email protected]</em>"
list.</p>
-<ul>
- <li><a
href="mailto:[email protected]";>[email protected]</a>
: For announcements relating to new releases, updates, and other important
information. Not a discussion list.</li>
- <li><a
href="mailto:[email protected]";>[email protected]</a>
: For discussion on issues relating to CDROM distribution of the software
</li>
- <li> <a
href="mailto:[email protected]:";>[email protected]</a>
: The list to collect site activity statistics. Not a discussion list.</li>
-</ul>
-<p>To subscribe to these, view and search the archives, please go to the
-<a href="http://distribution.openoffice.org/servlets/ProjectMailingListList";>
Project Mailing Lists</a>.</p>
+ <p>Apache OpenOffice is distributed under the Apache License 2.0, a
permissive open source license. Section 4 "Redistribution" of that license
describes the permissions and conditions related to redistribution of
+ OpenOffice.</p>
+
+ <p>In general we encourage redistribution of OpenOffice and offer the
following avenues for answering OEM questions:</p>
+
+ <ul>
+ <li>For technical questions, related to customization of
OpenOffice, pre-installs, extensions, rebranding, etc., we recommend posting to
our public <a
href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public"development
mailing list</a>.</li>
+ <li>For questions related to Apache License and its
permissions, export controls, etc., you can consult the resources on the <a
href=="http://www.apache.org/legal/";>Apache Legal Affairs</a> home page.</li>
+ <li>For permissions to use the OpenOffice trademark or logo,
please refer to <a href="https://openoffice.apache.org/trademarks.html";>this
page</a></li>
+ </ul>
+
</div>
