Author: buildbot
Date: Mon Jan 6 19:51:44 2014
New Revision: 893041
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/porting/mac/faq/installing/X11.html
websites/staging/ooo-site/trunk/content/porting/mac/faq/installing/ooo_x11.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 6 19:51:44 2014
@@ -1 +1 @@
-1555954
+1555997
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 6 19:51:44 2014
@@ -1 +1 @@
-1555954
+1555997
Modified:
websites/staging/ooo-site/trunk/content/porting/mac/faq/installing/X11.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/porting/mac/faq/installing/X11.html
(original)
+++ websites/staging/ooo-site/trunk/content/porting/mac/faq/installing/X11.html
Mon Jan 6 19:51:44 2014
@@ -71,121 +71,7 @@ now</a></li>
<div id="text1">
<h3>Installing X11 for Mac OSX</h4>
-<p class="warning">X11 is NOT needed for <a
href="/mac/download/aqua.html">OpenOffice.org Aqua</a></p>
-
-<p>Installing X11 on Mac OSX depends <b>on the Mac OS X version</b> you are
using:
-
-<ul>
-<li><a href="#leopard">Mac OSX 10.5 (Leopard)</a></li>
-<li><a href="#tiger">Mac OSX 10.4 (Tiger)</a></li>
-<li><a href="#panther">Mac OSX 10.3 (Panther)</a></li>
-</ul>
-
-<p>To find out please go to the Apple
-menu and choose 'About This Mac'. The Mac OS X version is shown above
-the "Software Update..." button. Please ignore the last digit of the
-version, as it is irrelevant.</p>
-
-<p>If you encounter problems during the X11 installation please check the
-<a href="#below">answers</a> to the list of common problems below first.</p>
-
-<hr />
-<a name="leopard"></a><h4>Installing X11 for Mac OSX 10.5 (Leopard)</h4>
-X11 comes pre-installed on Mac OSX 10.5, so you can <a href="ooo.html">install
OpenOffice.org</a> directly.</p>
-
-<hr />
-<a name="tiger"></a><h4>Installing X11 for Mac OS X 10.4.x (Tiger)</h4>
-
- <li>Useful instructions are provided also on <a
href="http://docs.info.apple.com/article.html?artnum=301229";>Apple's
-web site</a>.</li>
-
- <li>You are required to use the Mac OS X Install or Restore
-discs that came with your computer.<br />
-
- <img style="width: 450px; height: 468px;" alt="An image of a Mac OS X
install disk" title="You need to find this disk" src="img/disk.JPG" /></li>
-
- <li>Look for the "Optional Installs" Installer on your install
-discs. You will need to scroll down to find it.<br />
-
- <img style="width: 500px; height: 522px;" alt="Select the optional
installs installer" src="img/Picture%201.png" /><br />
-
- </li>
-
- <li>Click continue in the installer<br />
-
- <img style="width: 620px; height: 440px;" alt="Click "Continue"
in the installer window" src="img/Picture%202.png" /></li>
-
- <li>Select your startup disk as the destination, then click
-"Continue"<br />
-
- <img style="width: 620px; height: 440px;" alt="Click "continue"
to progress with the install" src="img/Picture%203.png" /></li>
-
- <li>In the installer, choose "X11", as your "custom install".
-(You may need to click the triangle to the left of "Applications"
-and/or scroll down to see it.)<br />
-
- <img style="width: 620px; height: 440px;" alt="Choose X11 to install"
src="img/Picture%204.png" /></li>
-
- <li>Complete the instructions given by the installer.</li>
-
- <li>You should now have the correct X11 installed in the folder
-"/Applications/Utilities/"<br />
-
- <img style="width: 380px; height: 160px;" alt="X11 in the Utilities
folder" src="img/Picture%205.png" /></li>
-
-</ul>
-
-<hr />
-<a name="panther"></a><h4>X11 for Mac OS X 10.3.x (Panther)</h4>
-
-<ul>
-
- <li> Go to Apple's <a
href="http://www.apple.com/support/downloads/x11formacosx.html";>X11
-download page</a></li>
-
- <li>Download the file mentioned there and run through the
-installer.</li>
-
- <li>X11 should now be able to be found in the System
-"Applications" folder.</li>
-
-</ul>
-
-<hr />
-<a name="below"></a>
-<h4>I get the following message when I try to Install X11:</h4>
-
-<img style="width: 620px; height: 440px;" alt="Screenshot showing the error:
You cannot install X11 on this volume. Newer Software already exists on your
computer" src="img/error1.png" />
-<p>If you get an error message similar
-to the one above, then you are trying to install the version of X11
-that is available for download from Apple's website for Mac OS X 10.3.x
-only. You <span style="font-weight: bold;">need</span>
-to use the optional installer that is on your install disks that came
-with your computer or in the retail box for the upgrade version of Mac
-OS X.</p>
-
-<p>Please look above for the instruction on installing X11 under
-Mac OS X 10.4.x (Tiger).</p>
-
-<h4>The Installer is claiming that X11 is already installed</h4>
-
-<p>Sometimes you can get a problem, that will mean that you
-cannot install X11. This often occurs if you have removed X11. By
-removing the Install Receipt, you will make Installer think that it has
-not been installed before. To remove the Install Receipt you look for
-the file <code>X11User.pkg</code> in the folder
<code>/Library/Receipts/</code>,
-and remove it.</p>
-
-<h4>I installed X11, but can't find it in my Applications folder,
-or Utilities folder</h4>
-
-<p>Are you sure you installed the correct installation package?
-You may have installed <code>X11SDK.pkg</code> instead of
<code>X11User.pkg</code>.
-If you installed X11 on Mac OS X 10.3, and then upgraded to Mac OS X
-10.4, you will need to watch, because the old version of X11, is not
-compatible with the new version of the Operating System. The installer
-also does not automatically update X11 if you had it installed before.
-</p>
+<p class="warning">X11 is NOT needed for OpenOffice since version 3.0
(2008).</p>
<div id="bcorner1"></div>
@@ -194,12 +80,6 @@ also does not automatically update X11 i
<div id="news1">
<p><span style="color: rgb(0, 0, 255);"></span></p>
-<h3>Steps to Install OpenOffice.org X11 on a Mac</h3>
-<ul>
- <li><a href="../../download/x11.html">Download
OpenOffice.org X11</a></li>
- <li><a href="X11.html">Install X11</a></li>
- <li><a href="ooo_x11.html">Install OpenOffice.org X11</a></li>
-</ul>
</div>
Modified:
websites/staging/ooo-site/trunk/content/porting/mac/faq/installing/ooo_x11.html
==============================================================================
---
websites/staging/ooo-site/trunk/content/porting/mac/faq/installing/ooo_x11.html
(original)
+++
websites/staging/ooo-site/trunk/content/porting/mac/faq/installing/ooo_x11.html
Mon Jan 6 19:51:44 2014
@@ -50,31 +50,13 @@ now</a></li>
<div id="text1">
<h3>FAQ for OpenOffice.org X11 on Mac OSX</h3>
-<li><b>I got an error message "OpenOffice.org cannot be started,
-because X11 is not installed. Please install Apple X11 first."</b>
- <ul>
- <li>either <a href="X11.html">install X11</a></li>
- <li>or get <a href=../../download/aqua.html>OpenOffice.org Aqua</a></li>
- </ul>
-
-<li><b>I'm asked if I want to use Mac OSX fonts too?</b>
-<p>
-Yes, of course you want them in addition to the X11 fonts that are
-normally available for X11 applications. That is unless you know
-that you won't need them. Don't worry, your MacOSX fonts will be left
untouched.
-</li>
+<p class="warning">X11 is NOT needed for OpenOffice since version 3.0
(2008).</p>
<div id="bcorner1"></div>
</div>
<div id="news1">
-<h3>Steps to Install OpenOffice.org X11 on a Mac</h3>
-<ul>
- <li><a href="X11.html">Install X11</a></li>
- <li><a href="/download/">Download OpenOffice.org</a></li>
- <li><a href="../../faq/installing/ooo.html">Install OpenOffice.org</li>
-</ul>
</div>
<div id="foot1">
