Skip to content

Commit f56a346

Browse files
duncdrumjoewiz
authored andcommitted
macOS name fix (#95)
* since 2016 "Mac OS X" is now "macOS" note that monex still reports “Mac OS X” * added requested changes
1 parent 98001aa commit f56a346

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

data/advanced-installation.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ Setting admin user password...
113113
</section>
114114
<section id="linux">
115115
<title>Unix</title>
116-
<para>For Unix based systems (Linux, Mac OS X) the start/shutdown scripts can be found in
116+
<para>For Unix based systems (Linux, macOS) the start/shutdown scripts can be found in
117117
<filename>tools/yajsw/bin/</filename>.</para>
118118
<para>The easiest way to get eXist-db started during
119119
initialization of the system is to run the following command:
120120
<synopsis>tools/yajsw/bin/installDaemon.sh</synopsis>
121-
This works for Mac OS X and many Linux distributions.</para>
121+
This works for macOS and many Linux distributions.</para>
122122
<para>
123123
Please note it might be required to set some variables for the specific system, e.g. "wrapper.app.account" (to have eXist-db started as a specific user) and "wrapper.plist.template" for launchd.
124124
Details can be found on the YAJSW website: <ulink url="http://yajsw.sourceforge.net/YAJSW%20Configuration%20Parameters.html">YAJSW Configuration Options</ulink>.</para>
@@ -144,7 +144,7 @@ Setting admin user password...
144144
<para>Linux x86 (32bit/64bit) &amp; IA (64bit) </para>
145145
</listitem>
146146
<listitem>
147-
<para>Mac OS X x86 (32bit/64bit) </para>
147+
<para>macOS x86 (32bit/64bit) </para>
148148
</listitem>
149149
<listitem>
150150
<para>Solaris x86 (32bit/64bit) &amp; SPARC (32bit/64bit)</para>

data/quickstart.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</section>
1717
<section id="system-requirements">
1818
<title>System Requirements</title>
19-
<para>eXist-db is compatible with all recent versions of Linux, Mac OS X, and Windows.
19+
<para>eXist-db is compatible with all recent versions of Linux, macOS, and Windows.
2020
Out of the box, eXist-db requires at least 512 MB of RAM and about 200 MB of disk
2121
space. Administrative privileges are not required to install or run eXist-db, but
2222
certain installation procedures are not possible without administrative privileges.

data/troubleshooting.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
you launched eXist-db via one of the shell scripts, the output should directly
2424
appear in those.</para>
2525
<para>If eXist-db launched properly, you will find output similar to the following (this
26-
example output is taken from Mac OS X):</para>
26+
example output is taken from macOS):</para>
2727
<example>
2828
<title>Console Output</title>
2929
<screen>
@@ -96,7 +96,7 @@ Logging already initialized. Skipping...
9696
<para>
9797
<envar>JAVA_HOME</envar> should point to the directory where Java—the JRE or JDK—is
9898
installed. For instructions about how to set JAVA_HOME on
99-
Windows, follow the instructions in this <ulink url="http://confluence.atlassian.com/display/DOC/Setting+the+JAVA_HOME+Variable+in+Windows">guide</ulink>; on Linux, follow this <ulink url="http://www.cyberciti.biz/faq/linux-unix-set-java_home-path-variable/">guide</ulink>, and on Mac OS X, follow this <ulink url="http://www.mehtanirav.com/2008/09/02/setting-java_home-on-mac-os-x-105">guide</ulink>. </para>
99+
Windows, follow the instructions in this <ulink url="http://confluence.atlassian.com/display/DOC/Setting+the+JAVA_HOME+Variable+in+Windows">guide</ulink>; on Linux, follow this <ulink url="http://www.cyberciti.biz/faq/linux-unix-set-java_home-path-variable/">guide</ulink>, and on macOS, follow this <ulink url="http://www.mehtanirav.com/2008/09/02/setting-java_home-on-mac-os-x-105">guide</ulink>. </para>
100100
</listitem>
101101
<listitem>
102102
<para>
@@ -106,7 +106,7 @@ Logging already initialized. Skipping...
106106
example, if the <envar>EXIST_HOME</envar> path is <filename>C:\Program
107107
Files\eXist</filename>, the server will look for <filename>C:\Program
108108
Files\eXist\conf.xml</filename>. You can set EXIST_HOME in the same way
109-
that you set JAVA_HOME; thus, on Mac OS X, you would enter "export
109+
that you set JAVA_HOME; thus, on macOS, you would enter "export
110110
EXIST_HOME=/Applications/eXist" in the Terminal. </para>
111111
</listitem>
112112
</itemizedlist>

data/uploading-files.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<para>A WebDAV client lets you manage eXist-db database collections and documents very
7474
much like directories and files in a file system—often with the full drag-and-drop
7575
convenience of a desktop or file transfer client. WebDAV clients, or applications
76-
with built-in WebDAV support, include Windows Explorer, Mac OS X Finder, <ulink url="http://www.webdav.org/cadaver">cadaver</ulink>, <ulink url="http://www.konqueror.org/">KDE Konqueror</ulink>, <ulink url="http://www.oxygenxml.com/">oXygen XML Editor</ulink>, <ulink url="http://www.altova.com/">XML Spy</ulink>, <ulink url="http://www.libreoffice.org/">LibreOffice</ulink>, <ulink url="http://panic.com/transmit/">Transmit</ulink> (for Mac OS X only), and many
76+
with built-in WebDAV support, include Windows Explorer, macOS Finder, <ulink url="http://www.webdav.org/cadaver">cadaver</ulink>, <ulink url="http://www.konqueror.org/">KDE Konqueror</ulink>, <ulink url="http://www.oxygenxml.com/">oXygen XML Editor</ulink>, <ulink url="http://www.altova.com/">XML Spy</ulink>, <ulink url="http://www.libreoffice.org/">LibreOffice</ulink>, <ulink url="http://panic.com/transmit/">Transmit</ulink> (for macOS only), and many
7777
others.</para>
7878
<para>To connect a WebDAV client to eXist-db, you typically need to provide the URL to
7979
eXist's WebDAV interface and an eXist-db username and password. eXist-db's default

data/webdav.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<para>eXist-db ships with a <ulink url="http://en.wikipedia.org/wiki/WebDAV">WebDAV</ulink> interface. WebDAV makes it possible to manage database
2323
collections and documents just like directories and files in a file system. You can copy,
2424
move, delete, view or edit files with any application supporting the WebDAV protocol, including Windows
25-
Explorer, Mac OS X Finder, <ulink url="http://www.webdav.org/cadaver">cadaver</ulink>, <ulink url="http://www.konqueror.org/">KDE Konqueror</ulink>, <ulink url="http://www.oxygenxml.com/">oXygen XML Editor</ulink>, <ulink url="http://www.altova.com/">XML Spy</ulink>, <ulink url="http://www.libreoffice.org/">LibreOffice</ulink> and many others (see "Compatibility" below).</para>
25+
Explorer, macOS Finder, <ulink url="http://www.webdav.org/cadaver">cadaver</ulink>, <ulink url="http://www.konqueror.org/">KDE Konqueror</ulink>, <ulink url="http://www.oxygenxml.com/">oXygen XML Editor</ulink>, <ulink url="http://www.altova.com/">XML Spy</ulink>, <ulink url="http://www.libreoffice.org/">LibreOffice</ulink> and many others (see "Compatibility" below).</para>
2626
<para>While eXist-db has had WebDAV support since version 1.0b2, the new WebDAV implementation since
2727
version 1.4.1 brings improved WebDAV compatibility, thanks to its use of the excellent open-source <ulink url="http://milton.io/">Milton</ulink> WebDAV API for Java. </para>
2828
<para>In the default configuration
@@ -50,8 +50,8 @@
5050
serialization parameters.</para>
5151
</listitem>
5252
</itemizedlist>
53-
<para>The Milton-based WebDAV interface has been successfully tested with: Windows Web Folders (Windows XP/7), <ulink url="http://www.jscape.com/products/file-transfer-clients/anyclient/">AnyClient</ulink> (cross-platform), Mac OS X
54-
Finder, <ulink url="http://www.panic.com/transmit/">Transmit</ulink> (Mac OS X),
53+
<para>The Milton-based WebDAV interface has been successfully tested with: Windows Web Folders (Windows XP/7), <ulink url="http://www.jscape.com/products/file-transfer-clients/anyclient/">AnyClient</ulink> (cross-platform), macOS
54+
Finder, <ulink url="http://www.panic.com/transmit/">Transmit</ulink> (macOS),
5555
<ulink url="http://cyberduck.ch/">Cyberduck</ulink>, davfs2 version 1.4.5 (Linux),
5656
OxygenXML and LibreOffice.</para>
5757
<para>The following clients are reported to have issues: <ulink url="http://en.wikipedia.org/wiki/GVFS">GVFS</ulink> (Nautilus) and <ulink url="http://www.netdrive.net/">NetDrive</ulink>. (Compatibility can change over time)</para>
@@ -94,9 +94,9 @@
9494
</itemizedlist>
9595
</para>
9696
</section>
97-
<section id="macosx">
98-
<title>Mac OS X Finder</title>
99-
<para>The eXist-db database can be accessed easily with the Mac OS X Finder. First select in the Finder "Go"
97+
<section id="macos">
98+
<title>macOS Finder</title>
99+
<para>The eXist-db database can be accessed easily with the macOS Finder. First select in the Finder "Go"
100100
and "Connect to Server..." <screenshot>
101101
<graphic fileref="resources/webdav_macosx_1.png"/>
102102
</screenshot>
@@ -124,7 +124,7 @@
124124
time consuming operation for large documents and for collections with many documents.</para>
125125
<para>Instead it is recommended to use <ulink url="http://www.panic.com/transmit/">Transmit</ulink> or
126126
<ulink url="http://cyberduck.ch/">Cyberduck</ulink> instead.</para>
127-
<para>Note that for Mac OS X 10.8 the WebDAV client has become functional (again) in 10.8.2, but still
127+
<para>Note that for macOS 10.8 the WebDAV client has become functional (again) in 10.8.2, but still
128128
the client does not work perfect, e.g. at bulk operations.</para>
129129
</note>
130130
</section>

0 commit comments

Comments
 (0)