Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 020929883 for ; Mon, 11 Jun 2012 00:19:36 +0000 (UTC) Received: (qmail 5283 invoked by uid 500); 11 Jun 2012 00:19:36 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 5253 invoked by uid 500); 11 Jun 2012 00:19:36 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 5246 invoked by uid 99); 11 Jun 2012 00:19:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 00:19:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jun 2012 00:19:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CC7C22388847; Mon, 11 Jun 2012 00:19:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1348691 - /incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext Date: Mon, 11 Jun 2012 00:19:13 -0000 To: ooo-commits@incubator.apache.org From: robweir@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120611001913.CC7C22388847@eris.apache.org> Author: robweir Date: Mon Jun 11 00:19:13 2012 New Revision: 1348691 URL: http://svn.apache.org/viewvc?rev=1348691&view=rev Log: add link to "Get it here!" page Modified: incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext Modified: incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext?rev=1348691&r1=1348690&r2=1348691&view=diff ============================================================================== --- incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext (original) +++ incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext Mon Jun 11 00:19:13 2012 @@ -16,6 +16,7 @@ Notice: Licensed to the Apache Softwa specific language governing permissions and limitations under the License. +##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 the names Apache OpenOffice and OpenOffice.org, as well as the @@ -59,6 +60,12 @@ approval. 1. We will then notify you of the outcome. +##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] +logo may be used according to the requirements listed on that page. + [1]: http://www.apache.org/foundation/marks/ [2]: mailto:ooo-private@incubator.apache.org?subject=Trademark - +[3]: http://incubator.apache.org/openofficeorg/get-it-here.html