You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2017/04/05 17:05:34 UTC

svn commit: r1009872 [9/9] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/ast/download/ content/ast/download/common/ content/ast/estils/ content/ast/img/ content/da/ content/da/product/ content/de/Archiv/ content/de/Archive/ content/d...

Added: websites/staging/ooo-site/trunk/content/de/Archive/testdir/why_index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/de/Archive/testdir/why_index.html (added)
+++ websites/staging/ooo-site/trunk/content/de/Archive/testdir/why_index.html Wed Apr  5 17:05:32 2017
@@ -0,0 +1,251 @@
+<!--#include virtual="/doctype.html" -->
+<html>
+<head>
+<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <title>Why OpenOffice.org</title>
+<!-- OOoLayout:nonav -->
+  <link rel="stylesheet" href="../styles/suppress.css" type="text/css" />
+  <link rel="stylesheet" href="../styles/why.css" type="text/css" />
+  
+
+<!--#include virtual="/google-analytics.js" --> 
+<!--#include virtual="/scripts/entourage.js" -->
+</head>
+<body>
+<!--#include virtual="/de/brand.html" -->
+  <div id="topbara">
+    <!--#include virtual="/de/topnav.html" -->
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo;&nbsp;<a href="/de/">de</a>&nbsp;&raquo;&nbsp;<a href="/de/Archive/">Archive</a>&nbsp;&raquo;&nbsp;<a href="/de/Archive/testdir/">testdir</a></div>
+  </div>
+  <div id="clear"></div>
+  
+  
+  <div id="content">
+    
+    
+    
+
+
+
+
+
+<!-- Master Container: Centered and 700px wide -->
+<div id="container">
+
+    <!-- The topmost bar -->
+    <div id="topbar">
+        <a href="/">OpenOffice.org</a> - 
+        home of the world's leading open-source office suite
+    </div>
+    <!-- End of top bar -->
+
+    <!-- This holds the main header -->
+    <div id="headerwrapper">
+
+        <!-- This is the site title -->
+        <h1>Why OpenOffice.org</h1>
+	</div>
+	<!-- End of headerwrapper -->
+
+    <!-- This hold the navigation tabs -->
+    <div id="tabholder">
+        <div id="tabs8">
+            <ul>
+                <!-- CSS Tabs -->
+                <li id="current"><a href="index.html"><span>Why</span></a></li>
+                <li><a href="why_great.html"><span>Great Software</span></a></li>
+                <li><a href="why_easy.html"><span>Easy to use</span></a></li>
+                <li><a href="why_free.html"><span>and it's free</span></a></li>
+            </ul>
+        </div>
+    </div>
+    <!-- End of the tabs holder -->
+
+    <!-- Here's the box for the main article -->
+    <div class="articleboxouter">
+
+        <!-- Here's where you can place ur content -->
+        <div class="articleboxinner">
+
+            <!-- The main image. 300px by 210px -->
+            <img src="/why/images/why_home.gif" width="300" height="210"
+            alt="OOo logo" class="mainpiccontrol" name="pix" />
+            <div id="mytext">
+            <!-- The title for this article -->
+            <span class="articleheader" >OpenOffice.org 2</span>
+
+            <!-- The preview content -->
+            is the leading <b>open-source</b> <b>office software suite</b>
+            for <b>word processing</b>, <b>spreadsheets</b>, <b>presentations</b>,
+            <b>graphics</b>, <b>databases</b> and more. It is available 
+            in <b>many languages</b>
+            and works on all <b>common computers</b>. It stores all your data in an
+            <b>international open standard format</b> and can also read and write
+            files from other common office software packages. It can be
+            downloaded and used completely <b>free of charge</b> for <b>any purpose</b>.
+            <br />
+            </div>
+            <!-- Link to the full article, an arrow and a text link -->
+            <span class="readmore">
+                <a href="#">
+                 <img src="/why/images/arrow.png" alt="read more" class="noborder" />
+                </a>
+                <a href="/download">
+                  Get OpenOffice.org 2 now
+                </a>
+                <br />&nbsp;
+            </span>
+        </div>
+        <!-- End of content holder -->
+    </div>
+    <!-- End of main article -->
+
+    <!-- Here's the box for some pics -->
+    <div class="picboxouter">
+
+        <!-- Here's where you can place ur thumbnails -->
+        <!-- All should be uniformly sized ;-) -->
+
+        <div class="picbox">
+          <a href="why_gov.html"><img src="/why/images/icon_gov.png" class="pickboxcontrol"
+             alt="Public Administration"  
+             title="Why OpenOffice.org for Public Administration" /><br />
+             <span>Governments</span>
+          </a>
+        </div>
+        <div class="picbox">
+          <a href="why_edu.html"><img src="/why/images/icon_edu.png" class="pickboxcontrol"
+             alt="Education"  title="Why OpenOffice.org for Education" /><br />
+             <span>Education</span>
+          </a>
+        </div>
+        <div class="picbox">
+          <a href="why_sme.html"><img src="/why/images/icon_biz.png" class="pickboxcontrol"
+             alt="Businesses"  title="Why OpenOffice.org for Businesses" /><br />
+             <span>Businesses</span>
+          </a>
+        </div>
+        <div class="picbox">
+          <a href="why_nfp.html"><img src="/why/images/icon_nfp.png" class="pickboxcontrol" 
+             alt="Not For Profits"  title="Why OpenOffice.org for Not For Profits" /><br />
+             <span>Not for profits</span>
+          </a>
+        </div>
+        <div class="picbox">
+          <a href="why_oem.html"><img src="/why/images/icon_oem.png" class="pickboxcontrol"
+             alt="IT businesses"  title="Why OpenOffice.org for IT businesses" /><br />
+             <span>IT Businesses</span>
+          </a>
+        </div>
+        <div class="picbox">
+          <a href="why_foss.html"><img src="/why/images/icon_linux.png" class="pickboxcontrol"
+             alt="F/OSS"  
+             title="Why OpenOffice.org for Free/Open-Source Systems advocates" /><br />
+             <span>F/OSS advocates</span>
+          </a>
+        </div>
+    </div>
+    <!-- End of photogallery -->
+
+    <!-- We love three columns, don't we? -->
+    <!-- Holder for three columns -->
+    <div class="articleboxouter">
+        <div id="newsContainer2">
+
+            <!-- Column 1 -->
+    		<div class="c1">
+    			<div class="noteheader">
+    				&nbsp;Great software
+    			</div>
+    			<div class="spacy">
+                    OpenOffice.org 2 is the result of over twenty years' software
+                    engineering. Designed from the start as a single piece of software,
+                    it has a consistency other products cannot match. A completely open
+                    development process means that anyone can report bugs, request
+                    new features, or enhance the software. 
+                    The result: OpenOffice.org 2 does everything you want your
+                    office software to do, the way you want it to.
+    			</div>
+    		</div>
+
+    		<!-- Column 2 -->
+            <div class="c2">
+                <div class="noteheader">
+                    &nbsp;Easy to use
+                </div>
+                <div class="spacy">
+                    OpenOffice.org 2 is easy to learn, and if you're already using another
+                    office software package, you'll take to OpenOffice.org 2 straight away. 
+                    Our world-wide native-language community means that  
+                    OpenOffice.org 2 is probably available and supported in your own language.
+                    And if you already have files from another office package - OpenOffice.org
+                    2 will probably read them with no difficulty.
+                </div>
+            </div>
+
+            <!-- Column 3 -->
+    		<div class="c3">
+                <div class="noteheader">
+                    &nbsp;and it's free
+                </div>
+              <div class="spacy">
+    			<!-- The content for this attention grabbing block -->
+                    Best of all, OpenOffice.org 2 can be downloaded and used entirely
+                    free of any licence fees. OpenOffice.org 2 is released under the LGPL
+                    licence. This means you may use it for any purpose - domestic,
+                    commercial, educational, public administration. You may install it
+                    on as many computers as you like. You may make copies and give them
+                    away to family, friends, students, employees - anyone you like.
+              </div>
+            </div>
+        </div>
+    </div>
+    <!-- End of the three columns holder -->
+
+    <!-- This little whitespace will separate the page from the footer -->
+    &nbsp;
+
+    <!-- Finally, here's the humble footer, holding your copyright -->
+    <div id="myfooter">
+  
+      <a href="http://www.sun.com/software/star/openoffice/index.html">
+        <img 
+         style="float:left; display:inline; border:1px solid #444487; width:81px; height:41px;" 
+         title="Sponsored by Sun Microsystems, Inc." 
+		     alt="Sun Microsystems Logo" src="/branding//why/images/sun_logo.gif" />
+	  	</a>
+      <a href="http://www.collab.net/special/clickpbc0502.html">
+		    <img 
+		     style="float:right; display:inline; width:102px; height:38px"  
+  		   title="Powered by CollabNet" alt="CollabNet Logo" 
+	  	   src="/branding//why/images/poweredby_036.gif" />
+	  	</a>
+<!--  <a title="Give feedback, or ask for assistance" 
+			  href="/project/www/contact.html">Contact Us</a>
+	  	<a title="Sitemap" href="/project/www/sitemap.html">Sitemap</a>
+		  <a title="What should happen on the matter listed on this page..."
+  			href="/project/development/todo.html">To-Dos</a>
+	  	<a href="//nonav/servlets/HelpTOC">Site Help</a>
+		  <a href="/project/www/press/2.0/index.html">Press Room</a>
+  		<br /> -->
+		By any use of this Website, you agree to be bound by these 
+		<a href="http://www.sunsource.net/TUPPCP.html">Policies and Terms of Use</a>
+		<br />
+		CollabNet is a trademark of CollabNet, Inc., Sun, Sun Microsystems, 
+    the Sun logo, Java, Solaris, StarOffice are trademarks or registered
+    trademarks of Sun Microsystems, Inc. in the United States and other countries.
+
+    </div>
+    <!-- End of footer -->
+
+</div>
+<!-- End of master container -->
+
+
+
+  </div>
+<!--#include virtual="/footer.html" -->
+</body>
+</html>

Added: websites/staging/ooo-site/trunk/content/de/Archive/testdir/why_mlm.css
==============================================================================
--- websites/staging/ooo-site/trunk/content/de/Archive/testdir/why_mlm.css (added)
+++ websites/staging/ooo-site/trunk/content/de/Archive/testdir/why_mlm.css Wed Apr  5 17:05:32 2017
@@ -0,0 +1,728 @@
+/* CSS Document - Author: Shaibal Mandal */
+
+/* Design:  Reflections, from OpenWebsiteDesign */
+
+/* Main Styles that apply to body */
+
+body {
+
+	font-size: 11px;
+
+	font-family: DejaVu Sans, Verdana, Arial, Sans-Serif;
+
+	margin: 0px;
+
+	padding-left: 50%;
+
+	background: #f4f4f4 url(http://why.openoffice.org/images/bg.gif) center repeat-y;
+
+	/*position: absolute; removed by Markomlm*/
+
+	width:350px;
+
+}
+
+
+
+/* This is the page container built and centered using -ve margins */
+
+#container {
+
+	width: 700px;
+
+/*	margin-left: -350px; removed by Markomlm*/
+
+}
+
+
+
+/* The topmost faded bar */
+
+#topbar {
+
+    width:auto;
+
+    background: #EEE;
+
+    height: 20px;
+
+    padding: 10px 5px 5px 2px;
+
+    font: 9px verdana;
+
+    font-weight: bold;
+
+    color: #CCCCCC;
+
+    text-align: right;
+
+}
+
+
+
+/* This holds the two heading blocks, the title and the login form */
+
+#headerwrapper {
+
+    width: auto;
+
+    border-spacing: 0px;
+
+}
+
+
+
+/* class that styles the holder div of the forms */
+
+.userform {
+
+    width: auto;
+
+    color: #0634bc;
+
+    padding: 5px 0px 5px 3px;
+
+    background: #fbfbfb;
+
+    border:1px solid #efefef;
+
+    border-top: none;
+
+    text-align: justify;
+
+    margin-bottom: 1px;
+
+}
+
+
+
+/* This will style the login and search */
+
+.userform input {
+
+    border: 1px solid #DDD;
+
+    font-family: verdana;
+
+    font-size: 10px;
+
+    color: #BBB;
+
+    font-weight: bold;
+
+}
+
+/*
+
+ #EEE = light grey
+
+ #DDD = dark grey
+
+ #0634bc = dark purple
+
+ #efefef = light grey
+
+ #DBB7DB = light violet
+
+ #663366 = deep purple
+
+ #F7F4F7 = faint pinky grey
+
+ #f1f1f1 = light grey
+
+ #F7F4F7 = deep deep purple
+
+ #591333 = deep purple
+
+*/
+
+
+
+/*
+
+ #06348c = OOo dark blue
+
+ #b7cad7 = OOo shady light blue
+
+ #c4dae9 = OOo light blue
+
+ #698ed1 = OOo lighter blue
+
+ #ecf1f5 = OOo pale blue
+
+*/
+
+
+
+h1 {
+
+  font: 48px verdana;
+
+	color: #EEE;
+
+	margin: 5px;
+
+}
+
+
+
+h6 {
+
+    font: 10px verdana;
+
+    font-weight: bold;
+
+	color: #DDD;
+
+	margin: 0px;
+
+	padding: 0px;
+
+	margin-left: 8px;
+
+}
+
+
+
+/* This holds the tabs */
+
+#tabholder
+
+{
+
+    width: auto;
+
+}
+
+
+
+/* Container for the article box, and the pic box */
+
+.articleboxouter { Issue 74175
+
+    width: auto;
+
+    padding: 0px 6px 0px 5px;
+
+    clear: both;
+
+} 
+
+
+
+/* Content holder for the articles */
+
+.articleboxinner {
+
+    width: auto;
+
+    font-size: 12px;
+
+    line-height: 20px;
+
+    color: #06348c;
+
+    padding: 15px 6px 0px 6px;
+
+    background: #fbfbfb;
+
+    border:1px solid #efefef;
+
+    text-align: left;
+
+    height: 220px;
+
+}
+
+
+
+/* The title style for the main article */
+
+.articleheader
+
+{
+
+    font-size: 18px;
+
+    font-weight: bold;
+
+}
+
+
+
+/* This will style the read more thing at the bottom */
+
+.readmore {
+
+    text-align: right;
+
+    display: block;
+
+    width: auto;
+
+}
+
+
+
+/* This controls the main pic in the main article box */
+
+.mainpiccontrol
+
+{
+
+    border: 0px #c4dae9 solid;
+
+    float: left;
+
+    margin-right: 10px;
+
+}
+
+
+
+/* Container for the pic thumbnails */
+
+.picboxouter {
+
+    width: auto;
+
+    padding: 0px 6px 0px 5px;
+
+    clear: both;
+
+}
+
+
+
+/* Content holder for the pic box */
+
+.picbox {
+
+    width: auto;
+
+    line-height: 20px;
+
+    color: #06348c;
+
+    padding: 2px 9px 2px 8px;
+
+    border: 1px solid #efefef;
+
+    text-align: center;
+
+    float: left;
+
+}
+
+
+
+.picbox a:hover {
+
+	border: none;
+
+}
+
+.picbox a:hover span {
+
+	border-bottom: dashed 1px red;
+
+}
+
+
+
+/* This controls the thumbnails in the picbox div Issue 74175 */
+
+.pickboxcontrol {
+
+    vertical-align: middle;
+
+    width: 95px; 
+
+    height: 64px;
+
+}
+
+
+
+/* Content holder for the screen box */
+
+.screenbox {
+
+    width: auto;
+
+    line-height: 20px;
+
+    color: #06348c;
+
+    padding: 2px 1px 2px 1px;
+
+    border: 1px solid #efefef;
+
+    text-align: center;
+
+    float: left;
+
+}
+
+.screenbox a:hover {
+
+	border: none;
+
+}
+
+.screenbox a:hover span {
+
+	border-bottom: dashed 1px red;
+
+}
+
+
+
+.screenboxcontrol {
+
+    vertical-align: middle;
+
+    width: 120px; 
+
+    height:86px;
+
+}
+
+
+
+/* Sometimes, I don't want borders around my hyperlink images */
+
+.noborder {
+
+    border: none;
+
+}
+
+
+
+/* For taming those leeeeeeetle arrows */
+
+img {
+
+    vertical-align: text-bottom;
+
+}
+
+
+
+/* Style-up those ugly default hyperlinks */
+
+a {
+
+	text-decoration: none;
+
+	padding: 0;
+
+	margin: 0;
+
+	color: #663366;
+
+}
+
+
+
+/* And their ugly hover states too */
+
+a:hover {
+
+	border-bottom:dashed 1px red;
+
+}
+
+
+
+/* Why should the humble footer be left out? */
+
+#myfooter {
+
+	background-color: #ccc;
+
+	color: #fff;
+
+	text-align: center;
+
+	vertical-align: middle;
+
+/*	height: 150px; */
+
+	padding-top: 5px;
+
+	clear: both;
+
+}
+
+
+
+#myfooter td {
+
+  border: 0px;
+
+  padding: 0px;
+
+  border-spacing: 0px; 
+
+  text-align: center;
+
+}
+
+
+
+/* This will contain the three columns */
+
+#newsContainer2
+
+{
+
+    width:auto;
+
+    background-color: #ecf1f5;
+
+}
+
+
+
+/* First column of the three columns */
+
+.c1
+
+{
+
+	width: 227px;
+
+	background-color: #ecf1f5;
+
+    border: 1px solid #DDD;
+
+    border-top: none;
+
+    line-height: 22px;
+
+    color: #0634bc;
+
+	float: left;
+
+}
+
+
+
+/* Second column of the three columns */
+
+.c2
+
+{
+
+    width: 230px;
+
+    float: left;
+
+    border-bottom: 1px solid #DDD;
+
+    line-height: 22px;
+
+    color: #0634bc;
+
+}
+
+
+
+/* Third column of the three columns */
+
+.c3
+
+{
+
+	width: 228px;
+
+	background-color: #ecf1f5;
+
+    border: 1px solid #DDD;
+
+    border-top: none;
+
+    line-height: 22px;
+
+    color: #0634bc;
+
+	float: right;
+
+}
+
+
+
+/* This controls the titles for each column */
+
+.noteheader
+
+{
+
+    width:auto;
+
+    border-bottom: 1px solid #DDD;
+
+    border-top: none;
+
+    color: #0634bc;
+
+    height: 24px;
+
+    font-family: verdana;
+
+    font-size: 11px;
+
+    font-weight: bold;
+
+	background:url(http://why.openoffice.org/images/headerBG.jpg) repeat-x;
+
+}
+
+
+
+/* And this gives the column text some breathing space */
+
+.spacy
+
+{
+
+    padding: 5px;
+
+}
+
+
+
+/* CSS Tabs */
+
+#tabs8 {
+
+    float:left;
+
+    width:100%;
+
+    background:#F1F1F1;
+
+    font-size:93%;
+
+    line-height:normal;
+
+    border-bottom:1px solid #CCC;
+
+}
+
+
+
+#tabs8 ul {
+
+    margin:0;
+
+    padding:10px 10px 0 5px;
+
+    list-style:none;
+
+}
+
+
+
+#tabs8 li {
+
+    display:inline;
+
+    margin:0;
+
+    padding:0;
+
+}
+
+
+
+#tabs8 a {
+
+    float:left;
+
+    background:url("http://why.openoffice.org/images/tableft8.gif") no-repeat left top;
+
+    margin:0;
+
+    padding:0 0 0 4px;
+
+    text-decoration:none;
+
+}
+
+
+
+#tabs8 a span {
+
+    float:left;
+
+    display:block;
+
+    background:url("http://why.openoffice.org/images/tabright8.gif") no-repeat right top;
+
+    padding:5px 15px 4px 6px;
+
+    color:#eee;
+
+    font-weight: bold;
+
+}
+
+
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+
+#tabs8 a span {float:none;}
+
+    /* End IE5-Mac hack */
+
+    #tabs8 a:hover span {
+
+/*  color:#591333; */
+
+    color:#06348c;
+
+}
+
+
+
+#tabs8 a:hover {
+
+    background-position:0% -42px;
+
+  	border: none;
+
+}
+
+
+
+#tabs8 a:hover span {
+
+    background-position:100% -42px;
+
+    color: #888;
+
+}
+
+
+
+#tabs8 #current a {
+
+    background-position:0% -42px;
+
+}
+
+#tabs8 #current a span {
+
+    background-position:100% -42px;
+
+    color: #888;
+
+}
+
+
+
+/* End of CSS Tabs */
+

Modified: websites/staging/ooo-site/trunk/content/download/common/instructions.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/common/instructions.html (original)
+++ websites/staging/ooo-site/trunk/content/download/common/instructions.html Wed Apr  5 17:05:32 2017
@@ -3,7 +3,7 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <title>Instructions for Downloading and Installing Apache OpenOffice 4</title>
   <style type="text/css">
   /* <![CDATA[ */
@@ -35,15 +35,13 @@
 <h2>Instructions for Downloading and Installing<br />
 Apache OpenOffice 4.0, 4.1 Versions</h2>
 
-<p>Last updated: 2014-06-29</p>
-
 <p><em>As of release 3.4, a JRE (Jave Runtime Environment) is no longer packaged with OpenOffice.
 However, you may still need a JRE for full functionality. (See <a href="java.html">
 Java and Apache OpenOffice</a>). Please ensure that your system has at least Java 1.6 installed for full
 functionality.</em></p>
 
 <p><em>Apache OpenOffice 4.x versions have significant changes to your OpenOffice directory setup which effect your older OpenOffice profile.</em>
-The <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes">Apache OpenOffice 4.0 Release Notes</a> provide an explanation of these changes. However,you should have the opportunity to
+The <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes">Apache OpenOffice 4.0 Release Notes</a> provide an explanation of these changes. However, you should have the opportunity to
 migrate your old profile settings to the new profile area.</p>
 
 <ul>
@@ -89,7 +87,7 @@ migrate your old profile settings to the
 
 <hr />
 
-<h2 id="win">Windows XP/2003/Vista/ 7 / 8 Quick-Start Guide for Apache OpenOffice 4.x Versions</h2>
+<h2 id="win">Windows XP/2003/Vista/7/8/10 Quick-Start Guide for Apache OpenOffice 4.x Versions</h2>
 
 <p>Welcome to Apache OpenOffice Quick-Start Guide for Windows environments. Below you will find step-by-step instructions
 to download and install Apache OpenOffice 4.x versions on your system. You may want to print this instruction sheet for
@@ -115,10 +113,10 @@ to return to this page.</p>
 -->
 
 <ol>
-  <li>Review the <a href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html">System Requirements</a> for
+  <li>Review the <a href="https://www.openoffice.org/dev_docs/source/sys_reqs_aoo41.html">System Requirements</a> for
   Apache OpenOffice use.</li>
-  <li>Download and install <a href="http://www.java.com/">Java JRE</a> if you need the features that are Java dependent.</li>
-  <li><a href="http://www.openoffice.org/download/">Download Apache OpenOffice 4.x.x</a>.</li>
+  <li>Download and install <a href="https://www.java.com/">Java JRE</a> if you need the features that are Java dependent.</li>
+  <li><a href="https://www.openoffice.org/download/">Download Apache OpenOffice 4.x.x</a>.</li>
   <li>Login as administrator (if required).</li>
   <li>Unpack and install the downloaded Apache OpenOffice 4.x.x files.</li>
   <li>Upgrading OpenOffice for Windows
@@ -153,7 +151,7 @@ to return to this page.</p>
 <p>This section describes in detail how to install Apache OpenOffice on your computer system.</p>
 
 <p>The first thing you'll want to do is read through these instructions completely, and use the
-<a href="http://www.openoffice.org/support/">Apache OpenOffice</a> site to answer any questions you might have. The site
+<a href="https://www.openoffice.org/support/">Apache OpenOffice</a> site to answer any questions you might have. The site
 contains documentation for users of all levels, beginner to advanced; a good place to get started for all new users of
 Apache OpenOffice would be browsing the FAQ.</p>
 
@@ -165,7 +163,7 @@ Log in as an administrator if your compu
 <p>Your computer needs these resources as a minimum to run Apache OpenOffice 4.x versions:</p>
 
 <ul>
-  <li>Windows XP, Windows 2003, Windows Vista, Windows 7, Windows 8</li>
+  <li>Windows XP, Windows 2003, Windows Vista, Windows 7, Windows 8, Windows 10</li>
   <li>256 Mbytes RAM (512 MB RAM recommended)</li>
   <li>At least 650 Mbytes available disk space for a default install (including a JRE) via download. After installation and
   deletion of temporary installation files, Apache OpenOffice will use approximately 440 Mbytes disk space.</li>
@@ -184,7 +182,7 @@ enables you to pause/resume the download
 <p>To download the most current version of Apache OpenOffice:</p>
 
 <ul>
-  <li><p>Display <a href="http://www.openoffice.org/download/">Download Apache OpenOffice</a>, and click on the large green
+  <li><p>Display <a href="https://www.openoffice.org/download/">Download Apache OpenOffice</a>, and click on the large green
   download button displayed on the top of the web page.</p></li>
 
 <!--
@@ -303,12 +301,12 @@ from any web page.</p>
 <h2 id="apple">Installation Instructions for Apple Macintosh</h2>
 
 <h3 id="gatekeeper">OS X and Gatekeeper</h3>
-<p>Apache OpenOffice 4.x versions will be flagged by the new Gatekeeper facility in OS X Mountain Lion. This is a new feature to help guard against malware on Mac systems. There is a procedure laid out at the following link to allow applications not installed from the Mac App store to run. See the article at Mac support at <a href="http://support.apple.com/kb/HT5290">http://support.apple.com/kb/HT5290</a>.</p>
+<p>Apache OpenOffice 4.x versions will be flagged by the new Gatekeeper facility in OS X Mountain Lion. This is a new feature to help guard against malware on Mac systems. There is a procedure laid out at the following link to allow applications not installed from the Mac App store to run. See the article at Mac support at <a href="https://support.apple.com/de-de/HT202491">https://support.apple.com/de-de/HT202491</a>.</p>
 
 <h3 id="mac-general">Macintosh Installation Resources</h3>
-<p><a href="http://www.openoffice.org/porting/mac/faq/installing/ooo.html">Installing Apache OpenOffice on MacOS X</a></p>
+<p><a href="https://www.openoffice.org/porting/mac/faq/installing/ooo.html">Installing Apache OpenOffice on MacOS X</a></p>
 
-<p>See also: <a href="http://www.openoffice.org/porting/mac/">the Mac porting project page</a></p>
+<p>See also: <a href="https://www.openoffice.org/porting/mac/">the Mac porting project page</a></p>
 
 <hr />
 
@@ -339,8 +337,8 @@ exists, on your system.</p>
 <h3 id="linux-general">Installation Steps -- RPM or DEB: Download to Installation Directory, Unpack</h3>
 
 <ol>
-<li>Review the <a href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html">System Requirements</a></li>
-  <li><a href="http://www.openoffice.org/download/">Download your favorite Linux version of Apache OpenOffice</a></li>
+<li>Review the <a href="https://www.openoffice.org/dev_docs/source/sys_reqs_aoo41.html">System Requirements</a></li>
+  <li><a href="https://www.openoffice.org/download/">Download your favorite Linux version of Apache OpenOffice</a></li>
   <!--  <li>Review helpful information and installation options in the
   <a href="http://documentation.openoffice.org/setup_guide2/index.html#12">Setup Guide.</a></li>-->
   <li>Unpack the downloaded package to prepare for installation.<br />
@@ -410,7 +408,7 @@ Please check carefully before using a th
 <p>The following links are additional resources for installing Apache OpenOffice on Linux by other parties. We hope you
     find them useful. 
     <ul>
-        <li><a href="http://sourceforge.net/projects/apacheoo-deb/files/debian/">Unofficial debian repository</a></li>
+        <li><a href="https://sourceforge.net/projects/apacheoo-deb/files/debian/">Unofficial debian repository</a></li>
         <li><a href="http://www.if-not-true-then-false.com/2010/install-openoffice-org-on-fedora-centos-red-hat-rhel/">Installing Apache OpenOffice on Fedora</a></li>
         <li><a href="http://www.liberiangeek.net/2013/08/apache-openoffice-4-0-releasedheres-how-to-install-it-in-ubuntu/">How to Install on Ubuntu</a></li>
         <li><a href="http://www.itzgeek.com/how-tos/linux/linux-mint-how-tos/install-apache-openoffice-4-on-linux-mint-15.html#axzz2xCWJdVcA">Install Apache OpenOffice on Linux Mint 15</a></li>
@@ -431,7 +429,7 @@ Please check carefully before using a th
 <p>The best resources to help you with installation problems are:</p>
 
 <ul>
-  <li><a href="http://openoffice.apache.org/mailing-lists.html">the Users mailing list</a></li>
+  <li><a href="https://openoffice.apache.org/mailing-lists.html">the Users mailing list</a></li>
   <li><a href="https://forum.openoffice.org/">the Apache OpenOffice User Support Forums</a></li>
 </ul>
 
@@ -440,11 +438,11 @@ Please check carefully before using a th
 <h2 id="more">Additional Installation Information</h2>
 
 <p>A more extensive, though older, <b>Installation Guide</b> is available in
-<a href="http://wiki.services.openoffice.org/w/images/7/7e/Installation_Guide_OOo3.pdf">PDF</a> and
-<a href="http://wiki.services.openoffice.org/w/images/6/63/Installation_Guide_OOo3.odt">ODT</a> formats from the
-<a href="http://wiki.services.openoffice.org/wiki/Documentation">Apache OpenOffice Documentation Project</a>.</p>
+<a href="https://wiki.openoffice.org/w/images/7/7e/Installation_Guide_OOo3.pdf">PDF</a> and
+<a href="https://wiki.openoffice.org/w/images/6/63/Installation_Guide_OOo3.odt">ODT</a> formats from the
+<a href="https://wiki.openoffice.org/wiki/Documentation">Apache OpenOffice Documentation Project</a>.</p>
 
-<p>You may also find the <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ/Installation">
+<p>You may also find the <a href="https://wiki.openoffice.org/wiki/Documentation/FAQ/Installation">
 Installation FAQs</a> useful as well.</p>
 
 

Modified: websites/staging/ooo-site/trunk/content/ko/product/leftnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/ko/product/leftnav.html (original)
+++ websites/staging/ooo-site/trunk/content/ko/product/leftnav.html Wed Apr  5 17:05:32 2017
@@ -11,15 +11,15 @@
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
 <h1 id="products">Products<a class="headerlink" href="#products" title="Permanent link">&para;</a></h1>
 <ul>
-<li><a href="/ko/writer.html">Writer</a></li>
-<li><a href="/ko/calc.html">Calc</a></li>
-<li><a href="/ko/impress.html">Impress</a></li>
-<li><a href="/ko/draw.html">Draw</a></li>
-<li><a href="/ko/base.html">Base</a></li>
-<li><a href="/ko/math.html">Math</a></li>
+<li><a href="/ko/product/writer.html">Writer</a></li>
+<li><a href="/ko/product/calc.html">Calc</a></li>
+<li><a href="/ko/product/impress.html">Impress</a></li>
+<li><a href="/ko/product/draw.html">Draw</a></li>
+<li><a href="/ko/product/base.html">Base</a></li>
+<li><a href="/ko/product/math.html">Math</a></li>
 </ul>
 <h1 id="more">More<a class="headerlink" href="#more" title="Permanent link">&para;</a></h1>
 <ul>
-<li><a href="/ko/suite.html">Suite</a></li>
-<li><a href="/ko/reviews.html">Reviews</a></li>
+<li><a href="/ko/product/suite.html">Suite</a></li>
+<li><a href="/ko/product/reviews.html">Reviews</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/nl/product/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/nl/product/index.html (original)
+++ websites/staging/ooo-site/trunk/content/nl/product/index.html Wed Apr  5 17:05:32 2017
@@ -83,7 +83,7 @@ die graag hulp verlenen aan zowel nieuwk
 </ul>
 <p>Apache OpenOffice <strong>voldoet aan de standaarden</strong>:</p>
 <ul>
-<li>Het eerste softwarepakket ter wereld dat gebruik maakt van het <a href="http://www.oasis-open.org/">OASIS</a> <a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">OpenDocument Format</a> (ISO/IEC 26300)
+<li>Het eerste softwarepakket ter wereld dat gebruik maakt van het <a href="https://www.oasis-open.org/">OASIS</a> <a href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">OpenDocument Format</a> (ISO/IEC 26300)
   als eigen bestandsformaat.</li>
 </ul>
 <h3 id="kom-meer-te-weten-of-probeer-het-vandaag"><a href="/nl/why/">Kom meer te weten</a> of <a href="/nl/download" title="Download Apache OpenOffice">probeer het vandaag</a>!<a class="headerlink" href="#kom-meer-te-weten-of-probeer-het-vandaag" title="Permanent link">&para;</a></h3>

Modified: websites/staging/ooo-site/trunk/content/robots.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/robots.txt (original)
+++ websites/staging/ooo-site/trunk/content/robots.txt Wed Apr  5 17:05:32 2017
@@ -24,7 +24,7 @@ Disallow: /servlets/
 Disallow: /support/test/
 Disallow: /test/
 Disallow: /download-NEXT2/
-Disallow: /de/Archiv/
+Disallow: /de/Archive/
 Disallow: /da/Archive/
 Disallow: /no-test/
 Disallow: /nl-template/