Author: buildbot
Date: Sun Aug 4 12:31:21 2013
New Revision: 872729
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/el/about-legal.html
websites/staging/ooo-site/trunk/content/nl/begrippenlijst.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Aug 4 12:31:21 2013
@@ -1 +1 @@
-1510157
+1510160
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Aug 4 12:31:21 2013
@@ -1 +1 @@
-1510157
+1510160
Modified: websites/staging/ooo-site/trunk/content/el/about-legal.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/el/about-legal.html (original)
+++ websites/staging/ooo-site/trunk/content/el/about-legal.html Sun Aug 4
12:31:21 2013
@@ -3,9 +3,55 @@
<head>
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+<link href="/css/ooo.css" rel="stylesheet" type="text/css">
-
-
+ <meta name="description" content="The official home page of the Apache
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw
and Base." />
+ <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice,
Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open
Document Format, free office editors" />
+ <meta name="google-site-verification"
content="x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4" />
+ <meta name="p:domain_verify" content="bd1ba1fb9d25b0eb3d64891f89e9195e" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link href="https://plus.google.com/+openoffice" rel="publisher" />
+ <link rel="STYLESHEET" type="text/css" href="/product/product.css"
media="screen" />
+ <title>Apache OpenOffice - The Free and Open Productivity Suite</title>
+ <style type="text/css">
+ /* <![CDATA[ */
+ /*-------------------- Exceptions on standard css -----------------------*/
+ @import "home.css";
+ @import "styles.css";
+ @import "exceptions.css";
+ /* ]]> */
+ </style>
+
+ <script>
+ function follow(platform) {
+ _gaq.push(['_trackEvent','social', 'followUs', platform]);
+ if (platform == 'Facebook') {
+ window.open("https://www.facebook.com/ApacheOO","_blank");
+ } else if (platform == 'Twitter') {
+ window.open("https://twitter.com/ApacheOO","_blank");
+ } else if (platform == 'GooglePlus') {
+ window.open("https://plus.google.com/+openoffice","_blank");
+ } else if (platform == 'ApacheBlog') {
+ window.open("https://blogs.apache.org/OOo/","_blank");
+ }
+ }
+ </script>
+
+<script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-30193653-1']);
+ _gaq.push(['_setDomainName', 'openoffice.org']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' :
'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
+ })();
+</script>
+
+
+
<!--#include virtual="/google-analytics.js" -->
Modified: websites/staging/ooo-site/trunk/content/nl/begrippenlijst.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/nl/begrippenlijst.html (original)
+++ websites/staging/ooo-site/trunk/content/nl/begrippenlijst.html Sun Aug 4
12:31:21 2013
@@ -231,8 +231,9 @@ zoveel mogelijk nieuwe functies of verbe
Het computerbedrijf <a href="http://www.sun.com">Sun
Microsystems</a>, dat de stap heeft genomen om de broncode van
het kantoorpakket StarOffice openbaar te maken en voor de verdere
-ontwikkeling het project OpenOffice.org heeft opgezet en blijft
-ondersteunen. </p>
+ontwikkeling het project OpenOffice.org heeft opgezet.
+In 2011 werd SUN overgenomen door <a href="http://www.oracle.com/">Oracle</a>
+dat in 2012 stopte met het project en de broncode doneerde aan de <a
href="http://www.apache.org/">Apache Software Foundation</a>.</p>
<p><a name="xml"></a>
<b>XML</b><br>
een “internetstandaard” voor de flexibele en logische opbouw van