svn commit: r1025351 - in /websites/staging/lucene/trunk/content: ./ pylucene/jcc/install.html

[bu...@apache.org]

Author: buildbot
Date: Tue Feb 13 20:07:43 2018
New Revision: 1025351

Log:
Staging update by buildbot for lucene

Modified:
    websites/staging/lucene/trunk/content/   (props changed)
    websites/staging/lucene/trunk/content/pylucene/jcc/install.html

Propchange: websites/staging/lucene/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 13 20:07:43 2018
@@ -1 +1 @@
-1824172
+1824173

Modified: websites/staging/lucene/trunk/content/pylucene/jcc/install.html
==============================================================================
--- websites/staging/lucene/trunk/content/pylucene/jcc/install.html (original)
+++ websites/staging/lucene/trunk/content/pylucene/jcc/install.html Tue Feb 13 20:07:43 2018
@@ -162,10 +162,10 @@ via <i>distutils</i>
 or <a href="http://pypi.python.org/pypi/setuptools">setuptools</a>.</p>
 <ul>
 <li>
-<p>On Mac OS X and Windows, <i>setup.py</i> will attempt to find a JDK on your
+<p>On MacOS and Windows, <i>setup.py</i> will attempt to find a JDK on your
 system and report what it found by showing the values for <i>JAVAHOME</i> and
 <i>JAVAFRAMEWORKS</i> it was able to derive. If the JDK installation that was
-found is not the one you wish to use or if you are not on Mac OS X or Windows,
+found is not the one you wish to use or if you are not on MacOS or Windows,
 you can either edit <i>setup.py</i> and review that the values in the
 <i>INCLUDES</i>, <i>CFLAGS</i>, <i>DEBUG_CFLAGS</i>, <i>LFLAGS</i>,
 <i>JAVAC</i>, and <i>JAVADOC</i> dicts are correct for your system or set
@@ -201,7 +201,7 @@ extension is going to be imported into a
 building plain shared libraries (as opposed to shared libraries for
 Python extensions).</p>
 <p>Currently, shared mode is supported with <i>setuptools 0.6c7</i> and above out
-of the box on MacOSX and Windows. On Linux, a patch to <i>setuptools</i> needs
+of the box on MacOS and Windows. On Linux, a patch to <i>setuptools</i> needs
 to be applied first. This patch is included in the JCC source distribution in
 the <i>jcc2/patches</i> directory, <i>patch.43</i>. This patch was submitted
 to the <i>setuptools</i> project via <a
@@ -231,7 +231,7 @@ the <i>NO_SHARED</i> environment variabl
 <p>Is JCC built with shared mode support or not ?</p>
 <ul>
 <li>
-<p>By default, on MacOSX, Linux or Windows, this is the case when using a
+<p>By default, on MacOS, Linux or Windows, this is the case when using a
   modern version of <i>setuptools</i></p>
 </li>
 <li>
@@ -248,13 +248,13 @@ the <i>NO_SHARED</i> environment variabl
     the <i>--shared</i> command line argument.</p>
 </li>
 </ul>
-<h2 id="notes-for-macosx">Notes for MacOSX<a class="headerlink" href="#notes-for-macosx" title="Permanent link">&para;</a></h2>
-<p>On MacOSX, Java is installed by Apple's setup as a framework. The
+<h2 id="notes-for-macos">Notes for MacOS<a class="headerlink" href="#notes-for-macos" title="Permanent link">&para;</a></h2>
+<p>On MacOS, Java is installed by Apple's setup as a framework. The
 values in <i>setup.py</i> for <i>INCLUDES</i>
 and <i>LFLAGS</i> for <i>darwin</i> should be correct
 and ready to use.</p>
 <p>However, if you intend to use the 'system' Python from a Java VM
-  on MacOSX -- Python embedded in Java --
+  on MacOS -- Python embedded in Java --
   you will need to add the flags <i>"-framework", "Python"</i>
   to the <i>LFLAGS</i> value.</p>
 <h2 id="notes-for-linux">Notes for Linux<a class="headerlink" href="#notes-for-linux" title="Permanent link">&para;</a></h2>