incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r791779 - in /websites/production/openofficeorg: ./ content/openofficeorg/docs/edit-cms.html content/openofficeorg/people.html
Date Tue, 28 Jun 2011 21:38:59 GMT
Author: marcus
Date: Tue Jun 28 21:38:59 2011
New Revision: 791779

Log:
Publishing merge to openofficeorg site by marcus

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
    websites/production/openofficeorg/content/openofficeorg/people.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 28 21:38:59 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-791757
+/websites/staging/openofficeorg/trunk:791146-791777

Modified: websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html Tue Jun 28
21:38:59 2011
@@ -77,7 +77,7 @@ and sub-directories.</p>
 HTML pages directly. The actual edit is split into two steps:</p>
 <ol>
 <li>
-<p>First you edit the content which is provided as <a href="http://en.wikipedia.org/wiki/Markdown">Markdown
text</a> (mdtext).
+<p>First you edit the content which is provided as <a href="http://daringfireball.net/projects/markdown/syntax">Markdown
text</a> (mdtext).
     This will be committed into the staging section (see the SVN commit mail with
     your log message) and automatically build HTML files out of the the mdtext files
     (see the commit mail with "Staging update by buildbot" as log messge).</p>

Modified: websites/production/openofficeorg/content/openofficeorg/people.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/people.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/people.html Tue Jun 28 21:38:59
2011
@@ -73,17 +73,18 @@
 is a partial list of contributors to the project, for a complete list you'd have
 to look at all contributors to our issue tracker, mailing list and version control.</p>
 <table align="center" border="1">
-    <tr><th>Name</th><th>Home</th><th>Skills/Interests</th></tr>\
-    <tr><td><a href="http://es.openoffice.org">Alexandro Colorado</a><td>Cancun,
Mexico</td><td>l10n,ODF,Documentation,Marketing,Community Mgmnt,Python,XML,User</td></tr>
-    <tr><td><a href="http://www.raphaelbircher.ch">Raphael Bircher</a></td><td></td><td></td></tr>
-    <tr><td><a href="http://besbergmann.de/stephan">Stephan Bergmann</a></td><td></td><td></td></tr>
-    <tr><td>Andy Brown</td><td>Dublin, GA, USA</td><td>User,
Documentation, Distribution, Marketing</td></tr>
-    <tr><td>David Fisher</td><td></td><td></td></tr>
-    <tr><td><a href="http://www.homembit.com">Jomar Silva</a></td><td>Sao
Paulo, Brazil</td><td>C/C++, XML, ODF, Architecture, Marketing, Localization,
Documentation, Community Management/td></tr>
-    <tr><td><a href="http://openoffice.exblog.jp/">Kazunari Hirano</a></td><td></td><td></td></tr>
-    <tr><td>Carl Marcum</td><td></td><td></td></tr>
-    <tr><td><a href="http://piensalibre.com.ar">Roman Gelbort</a></td><td>Buenos
Aires, Argentina</td><td>Marketing, Education, User</td></tr>
-    <tr><td><a href="http://www.robweir.com/blog">Rob Weir</a></td><td>Westford,
Massachusetts, USA</td><td>C/C++, Java, Python, XML, ODF, Performance tuning</td></tr>
+    <tr><th>Apache ID</th><th>Name</th><th>Home</th><th>Skills/Interests</th></tr>
+    <tr><td>jza</td><td><a href="http://es.openoffice.org">Alexandro
Colorado</a></td><td>Cancun, Mexico</td><td>l10n,ODF,Documentation,Marketing,Community
Mgmnt,Python,XML,User</td></tr>
+    <tr><td></td><td><a href="http://www.raphaelbircher.ch">Raphael
Bircher</a></td><td></td><td></td></tr>
+    <tr><td></td><td><a href="http://besbergmann.de/stephan">Stephan
Bergmann</a></td><td></td><td></td></tr>
+    <tr><td></td><td>Andy Brown</td><td>Dublin, GA, USA</td><td>User,
Documentation, Distribution, Marketing</td></tr>
+    <tr><td></td><td>David Fisher</td><td></td><td></td></tr>
+    <tr><td></td><td><a href="http://www.homembit.com">Jomar
Silva</a></td><td>Sao Paulo, Brazil</td><td>C/C++, Python, XML,
ODF, Architecture, Marketing, Localization, Documentation, Community Management</td></tr>
+    <tr><td></td><td><a href="http://openoffice.exblog.jp/">Kazunari
Hirano</a></td><td></td><td></td></tr>
+    <tr><td>marcus</td><td>Marcus Lange</a></td><td>Hamburg,
Germany</td><td></td></tr>
+    <tr><td></td><td>Carl Marcum</td><td></td><td></td></tr>
+    <tr><td></td><td><a href="http://piensalibre.com.ar">Roman
Gelbort</a></td><td>Buenos Aires, Argentina</td><td>Marketing,
Education, User</td></tr>
+    <tr><td></td><td><a href="http://www.robweir.com/blog">Rob
Weir</a></td><td>Westford, Massachusetts, USA</td><td>C/C++,
Java, Python, XML, ODF, Performance tuning</td></tr>
 </table>
   </div>
 



Mime
View raw message