incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksch...@apache.org
Subject svn commit: r802677 - in /websites/production/ooo-site: ./ content/development/ content/editorial/ content/es/comunidad/ content/es/documentacion/ content/es/documentacion/gs32/ content/trademark/
Date Sun, 15 Jan 2012 22:52:08 GMT
Author: kschenk
Date: Sun Jan 15 22:52:06 2012
New Revision: 802677

Log:
kls -- good to go

Added:
    websites/production/ooo-site/content/es/documentacion/
      - copied from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/
    websites/production/ooo-site/content/es/documentacion/0101GS3-IntroduccionOOo.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/0101GS3-IntroduccionOOo.odt
    websites/production/ooo-site/content/es/documentacion/0101GS3-IntroduccionOOo.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/0101GS3-IntroduccionOOo.pdf
    websites/production/ooo-site/content/es/documentacion/0102GS3-ConfigurarOOo.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/0102GS3-ConfigurarOOo.odt
    websites/production/ooo-site/content/es/documentacion/0102GS3-ConfigurarOOo.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/0102GS3-ConfigurarOOo.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/
      - copied from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/
    websites/production/ooo-site/content/es/documentacion/gs32/0101GS3-IntroduccionOOo.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0101GS3-IntroduccionOOo.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0101GS3-IntroduccionOOo.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0101GS3-IntroduccionOOo.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0102GS3-ConfigurarOOo.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0102GS3-ConfigurarOOo.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0102GS3-ConfigurarOOo.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0102GS3-ConfigurarOOo.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0103GS3-EstilosyPlantillas.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0103GS3-EstilosyPlantillas.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0103GS3-EstilosyPlantillas.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0103GS3-EstilosyPlantillas.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0104GS3-EmpezarConWriter.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0104GS3-EmpezarConWriter.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0104GS3-EmpezarConWriter.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0104GS3-EmpezarConWriter.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0105GS3-ComenzarConCalc.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0105GS3-ComenzarConCalc.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0105GS3-ComenzarConCalc.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0105GS3-ComenzarConCalc.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0106GS3-PrimerosPasosConImpress.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0106GS3-PrimerosPasosConImpress.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0106GS3-PrimerosPasosConImpress.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0106GS3-PrimerosPasosConImpress.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0107GS3-ComenzarConDraw.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0107GS3-ComenzarConDraw.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0107GS3-ComenzarConDraw.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0107GS3-ComenzarConDraw.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0108GS3-ComenzarConBase.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0108GS3-ComenzarConBase.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0108GS3-ComenzarConBase.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0108GS3-ComenzarConBase.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0109GS3-ComenzarConMath.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0109GS3-ComenzarConMath.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0109GS3-ComenzarConMath.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0109GS3-ComenzarConMath.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0110GS3-ImprimirExportarCorreo.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0110GS3-ImprimirExportarCorreo.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0110GS3-ImprimirExportarCorreo.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0110GS3-ImprimirExportarCorreo.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0111GS3-GraficosGaleriayFontwork.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0111GS3-GraficosGaleriayFontwork.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0111GS3-GraficosGaleriayFontwork.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0111GS3-GraficosGaleriayFontwork.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0114GS3-PersonalizarOOo.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0114GS3-PersonalizarOOo.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0114GS3-PersonalizarOOo.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0114GS3-PersonalizarOOo.pdf
    websites/production/ooo-site/content/es/documentacion/gs32/0116GS3-CodigoAbiertoEstandaresDoc.odt
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0116GS3-CodigoAbiertoEstandaresDoc.odt
    websites/production/ooo-site/content/es/documentacion/gs32/0116GS3-CodigoAbiertoEstandaresDoc.pdf
      - copied unchanged from r802676, websites/staging/ooo-site/trunk/content/es/documentacion/gs32/0116GS3-CodigoAbiertoEstandaresDoc.pdf
Modified:
    websites/production/ooo-site/   (props changed)
    websites/production/ooo-site/content/development/index.html
    websites/production/ooo-site/content/editorial/blogs.html
    websites/production/ooo-site/content/es/comunidad/documentacion.html
    websites/production/ooo-site/content/trademark/brandrefresh.html

Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 22:52:06 2012
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-802609
+/websites/staging/ooo-site/trunk:797592-802676

Modified: websites/production/ooo-site/content/development/index.html
==============================================================================
--- websites/production/ooo-site/content/development/index.html (original)
+++ websites/production/ooo-site/content/development/index.html Sun Jan 15 22:52:06 2012
@@ -80,7 +80,7 @@
             </P> </TD> 
           <TD> </TD> 
         </TR> 
--->
+
          <tr>
             <td colspan="4" class="liteblue">OpenOffice.org Bug Bounty Program</td>
           </tr>
@@ -92,11 +92,13 @@
          <tr>
             <td colspan="4" class="liteblue">OpenOffice.org Community Innovation Program</td>
           </tr>
+          
           <tr>
             <td colspan="4" class="tableF0">The goal of the OpenOffice.org Community
Innovation Program is to foster innovation and community development. The Program begins 30
January 2008 and ends 23 June 2008. Enter now! <br>
             <a href="community_innovation_program.html">http://development.openoffice.org/community_innovation_program.html</a><br>
             </td>
           </tr>
+-->          
      
      <tr>
             <td colspan="4" class="liteblue">New Developer and Education Flyers!</td>
@@ -172,6 +174,7 @@ The wrapper API can be found at<br>
             <td colspan="4" class="darkblueleft"><a name="GENERAL"></a><b>General</b>
             </td>
           </tr>
+<!--          
           <tr>
             <td colspan="4" class="liteblue">Developer Survey</td>
           </tr>
@@ -189,6 +192,7 @@ developer members.<br>
             </ul>
             </td>
           </tr>
+-->          
           <tr>
             <td colspan="4" class="liteblue">Have you integrated
 OpenOffice.org into your solution?</td>
@@ -204,7 +208,7 @@ In order to create a list of all the coo
 OpenOffice.org please send your "OpenOffice.org sightings" to <a
  href="mailto:kay.koll@sun.com">kay.koll@sun.com</a> <br>
             <br>
-Here is a short preliminary list of know integrations (all links point
+Here is a short preliminary list of known integrations (all links point
 to external web sites):
             <ul>
               <li><a

Modified: websites/production/ooo-site/content/editorial/blogs.html
==============================================================================
--- websites/production/ooo-site/content/editorial/blogs.html (original)
+++ websites/production/ooo-site/content/editorial/blogs.html Sun Jan 15 22:52:06 2012
@@ -53,10 +53,16 @@
     
   <h1>OpenOffice.org Bloggers</h1>
 
-  <p><em>Please send updates for this page to the Editor, <a href=
-  "mailto:louis@openoffice.org">Louis Suárez-Potts</a>.</em></p>
+  <p><em>Please send updates for this page to the <a href="mailto: ooo-dev@incubator.apache.org">Apache
OpenOffice.org development list</a>.</em></p>
 
-  <h2>Planets</h2>
+ 
+
+  <h2>OpenOffice.org blogs</h2>
+
+	<ul><li><a href="https://blogs.apache.org/OOo/">Apache OpenOffice.org
blog</a></li>
+	</ul>
+
+   <h2>Planets</h2>
 
   <p>A <em>Planet</em> is a web page which consolidates posts by a number
of
   bloggers. There are a number of OpenOffice.org Planets: <a href=
@@ -78,19 +84,9 @@
     Experience Project Planet</a></li>
   </ul>
 
-  <h2>OpenOffice.org blogs</h2>
+  <h2>Individual bloggers </h2>
+  <h6>Some of these blogs may no longer pertain specifically to OpenOffice.org.</h6>
 
-  <p>Some groups of OpenOffice project members share blogs:</p>
-
-  <ul>
-    <li><a href="http://blogs.sun.com/GullFOSS">GullFOSS: OOo Engineering at
-    Sun</a></li>
-  </ul>
-
-  <h2>Individual bloggers</h2>
-
-  <p>There are many individuals who also blog regularly on OpenOffice.org
-  topics.</p>
 
   <table border="0" cellpadding="3" cellspacing="0" width="100%" summary=
   "List of individual bloggers">
@@ -102,11 +98,6 @@
       </tr>
 
       <tr>
-        <td><a href="http://netapps.muohio.edu/blogs/darcusb/darcusb/">Bruce
-        D'Arcus</a>, Co-lead, Bibliographic Project</td>
-      </tr>
-
-      <tr>
         <td><a href="http://eric.bachard.free.fr/news/">Éric Bachard</a>,
         Developer, Co-Lead Education Project</td>
       </tr>
@@ -131,11 +122,6 @@
       </tr>
 
       <tr>
-        <td><a href="http://paradigma.pt/%7Evd/wlog/">Vitor Domingos</a>,
-        Lead, Portuguese Language Project and Co-Lead Art Project</td>
-      </tr>
-
-      <tr>
         <td><a href="http://www.xslf.com">Shoshannah Forbes</a>, QA Team,
         focus on OOo tutorials in Hebrew</td>
       </tr>
@@ -197,11 +183,7 @@
         Developer, Novell</td>
       </tr>
 
-      <tr>
-        <td><a href="http://neosergio.net/blog">Sergio Infante Montero</a>,
-        Contributor</td>
-      </tr>
-
+      
       <tr>
         <td><a href="http://things.dk">Søren Thing Pedersen</a>, Lead,
Dansk
         (DK) Native Language Project</td>
@@ -236,15 +218,6 @@
         Microsystems</td>
       </tr>
 
-      <tr>
-        <td><a href="http://oooblog.fardad.com/">Fardad Soleimanloo</a>,
-        Professor of OpenOffice.org, Seneca College, Toronto</td>
-      </tr>
-
-      <tr>
-        <td><a href="http://blogs.sun.com/roller/page/stx12">Stefan
-        Taxhet</a>, Sun Microsystems</td>
-      </tr>
 
       <tr>
         <td><a href="http://blogs.sun.com/Malte/">Malte Timmermann</a>,
Sun
@@ -276,7 +249,6 @@
   </table>
   <hr>
 
-  <p>$Date: 2010/05/03 20:09:15 $</p>
 
   </div>
 

Modified: websites/production/ooo-site/content/es/comunidad/documentacion.html
==============================================================================
--- websites/production/ooo-site/content/es/comunidad/documentacion.html (original)
+++ websites/production/ooo-site/content/es/comunidad/documentacion.html Sun Jan 15 22:52:06
2012
@@ -96,7 +96,6 @@
   </ul>
   <h2>Gu&iacute;a de inicio V3.x <a name="guiainicio" id="guiainicio"></a></h2>
   <ul>
-<<<<<<< .mine
     <li>Cap&iacute;tulo 1. Introducci&oacute;n a OpenOffice.org [<a href="../documentacion/GS32/0101GS3-IntroduccionOOo.odt">Formato
ODT</a>] [<a href="../documentacion/GS32/0101GS3-IntroduccionOOo.pdf">Formato
PDF</a>] </li>
       <li>Cap&iacute;tulo 2. Configurar OpenOffice.org [<a href="../documentacion/GS32/0102GS3-ConfigurarOOo.odt">Formato
ODT</a>] [<a href="../documentacion/GS32/0102GS3-ConfigurarOOo.pdf">Formato PDF</a>]</li>
       <li>Cap&iacute;tulo 3. Usar estilos y plantillas [<a href="../documentacion/GS32/0103GS3-EstilosyPlantillas.odt">Formato
ODF</a>] [<a href="../documentacion/GS32/0103GS3-EstilosyPlantillas.pdf">Formato
PDF</a>]</li>
@@ -108,19 +107,6 @@
       <li>Cap&iacute;tulo 9. Comenzar con Math [<a href="../documentacion/GS32/0109GS3-ComenzarConMath.odt">Formato
ODT</a>] [<a href="../documentacion/GS32/0109GS3-ComenzarConMath.pdf">Formato
PDF</a>]</li>
       <li>Cap&iacute;tulo 10. Imprimir, exportar y enviar por correo electr&oacute;nico
[<a href="../documentacion/GS32/0110GS3-ImprimirExportarCorreo.odt">Formato ODT</a>]
[<a href="../documentacion/GS32/0110GS3-ImprimirExportarCorreo.pdf">Formato PDF</a>]</li>
       <li>Cap&iacute;tulo 11. Gr&aacute;ficos, la galer&iacute;a y Fontwork
 [<a href="../documentacion/GS32/0111GS3-GraficosGaleriayFontwork.odt">Formato ODT</a>]
[<a href="../documentacion/GS32/0111GS3-GraficosGaleriayFontwork.pdf">Formato PDF</a>]</li>
-=======
-    <li>Cap&iacute;tulo 1. Introducci&oacute;n a OpenOffice.org [<a href="../descargas/0101GS3-IntroduccionOOo.odt">Formato
ODT</a>] [<a href="../descargas/0101GS3-IntroduccionOOo.pdf">Formato PDF</a>]
</li>
-      <li>Cap&iacute;tulo 2. Configurar OpenOffice.org [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0102GS3-ConfigurarOOo.odt">Formato ODT</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0102GS3-ConfigurarOOo.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 3. Usar estilos y plantillas [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0103GS3-EstilosyPlantillas.odt">Formato ODF</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0103GS3-EstilosyPlantillas.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 4. Comenzar con Writer [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0104GS3-EmpezarConWriter.odt">Formato ODT</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0104GS3-EmpezarConWriter.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 5. Comenzar con Calc [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0105GS3-ComenzarConCalc.odt">Formato ODT</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0105GS3-ComenzarConCalc.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 6. Comenzar con Impress [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0106GS3-PrimerosPasosConImpress.odt">Formato ODT</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0106GS3-PrimerosPasosConImpress.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 7. Comenzar con Draw [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0107GS3-ComenzarConDraw.odt">Formato ODT</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0107GS3-ComenzarConDraw.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 8. Comenzar con Base [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0108GS3-ComenzarConBase.odt">Formato ODT</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0108GS3-ComenzarConBase.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 9. Comenzar con Math [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0109GS3-ComenzarConMath.odt">Formato ODT</a>]
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0109GS3-ComenzarConMath.pdf">Formato PDF</a>]</li>
-      <li>Cap&iacute;tulo 10. Imprimir, exportar y enviar por correo electr&oacute;nico
[<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0110GS3-ImprimirExportarCorreo.odt">Formato ODT</a>] [<a href="http://openoffice.org/projects/es/downloads/directory/OOoAuthors/Guia%20de%20inicio/Gu%C3%ADa%20de%20inicio%203.x/0110GS3-ImprimirExportarCorreo.pdf">Formato
PDF</a>]</li>
-      <li>Cap&iacute;tulo 11. Gr&aacute;ficos, la galer&iacute;a y Fontwork
 [<a href="http://openoffice.org/projects/es/downloads/directory/OOoAuthors/Guia de inicio/Gu&iacute;a
de inicio 3.x/0111GS3-GraficosGaleriayFontwork.odt">Formato ODT</a>] [<a href="http://openoffice.org/projects/es/downloads/download/OOoAuthors/Guia
de inicio/Gu&iacute;a de inicio 3.x/0106GS3-PrimerosPasosConImpress.odt">Formato PDF</a>]</li>
->>>>>>> .r1231417
       <li>Cap&iacute;tulo 12.         Creaci&oacute;n de p&aacute;ginas
web [Formato ODT] [Formato PDF]</li>
       <li>Cap&iacute;tulo 13. Comenzar con macros  [Formato ODT] [Formato PDF]</li>
       <li>Cap&iacute;tulo  14. Personalizar  OpenOffice.org [<a href="../documentacion/GS32/0114GS3-PersonalizarOOo.odt">Formato
ODT</a>] [<a href="../documentacion/GS32/0114GS3-PersonalizarOOo.pdf">Formato
PDF</a>]</li>

Modified: websites/production/ooo-site/content/trademark/brandrefresh.html
==============================================================================
--- websites/production/ooo-site/content/trademark/brandrefresh.html (original)
+++ websites/production/ooo-site/content/trademark/brandrefresh.html Sun Jan 15 22:52:06 2012
@@ -79,7 +79,7 @@ and openness. The lighter blue emphasize
 seasonal fashion trends.</p>
 
 <p><img style="width: 135px; height: 132px;" alt="3d symbol" src="symbol_3d_smp.png"
hspace="10"></p>
-
+<!--  
 <h2>Status (February 2010)</h2>
 
 <p>With these branding elements the groundwork is established to strengthen the brand
of OpenOffice.org. The elements are going to be introduced in the next
@@ -93,10 +93,11 @@ guidelines, how-tos by the Branding Init
 shown above the elements are available in svg format. You will want to wait with your utilization
until the guide can help with the proper application of
 the material. You can even join the creation effort by subscribing to the list
 <a href="http://marketing.openoffice.org/servlets/SummarizeList?listName=branding">branding@marketing.openoffice.org</a></p>
+-->
 
 <h2>Status (May 2010)</h2>
 
-<p>After the introduction of the refreshed logo new brand elements based on the refreshed
logo were integrated in the OpenOffice.org graphical user
+<p>After the introduction of the refreshed logo, new brand elements based on the refreshed
logo were integrated in the OpenOffice.org graphical user
 interface. For more detailed information please visit <a href="http://ui.openoffice.org/VisualDesign/OOo3_refresh.html">Visual
Design Refresh</a></p>
 
 <p>The efforts for a consistent OpenOffice.org branding led to the creation of the
@@ -105,12 +106,6 @@ consistent branding that expresses the s
 projects collaborate in I-Teams. For more information on the I-Teams visit the
 <a href="http://wiki.services.openoffice.org/wiki/Application_Rebranding_-_Project_Home_Page">Application
Rebranding Project homepage</a> </p>
 
-<p>For summary articles see:</p>
-<ul>
-  <li><a href="http://www.patentpending.co.nz/soapbox/index.php/openoffice-org-new-logo">OpenOffice.org
new Logo</a> 
-  <li><a href="http://www.patentpending.co.nz/soapbox/index.php/openoffice-org-new-setup-file-and-application-icons">
-      OpenOffice.org new application icons</a></li>
-</ul>
 
 <h2>Use in our Product</h2>
 
@@ -133,7 +128,11 @@ projects collaborate in I-Teams. For mor
 <h3>Application icons</h3>
 
 <img src="OOo_Application_256x256.png" width="256" height="256" border="0" alt="">
+<p>&nbsp;</p>
 
+<h2>Third Party Use of OpenOffice.org Logos </h2>
+<p> Please see the <a href="http://incubator.apache.org/openofficeorg/trademarks.html">Apache
OpenOffice Trademarks</a> page for information on the use of,
+and how to request the use of the OpenOffice.org logos and other trademarked items.
 
   </div>
 



Mime
View raw message