Mac OS X is now macOS

Signed-off-by: Marius Blüm <marius@lineone.io>

doc/autoupdate.rst

@@ -5,7 +5,7 @@ The Automatic Updater
 The Automatic Updater ensures that you always have the
 latest features and bug fixes for your Nextcloud synchronization client.
 
-The Automatic Updater updates only on Mac OS X and Windows computers; Linux 
+The Automatic Updater updates only on macOS and Windows computers; Linux
 users only need to use their normal package managers. However, on Linux systems
 the Updater will check for updates and notify you when a new version is
 available.
@@ -29,13 +29,13 @@ itself. Should the silent update fail, the client offers a manual download.
 
 .. note:: Administrative privileges are required to perform the update.
 
-Mac OS X
+macOS
-^^^^^^^^
+^^^^^
 
 If a new update is available, the Nextcloud client initializes a pop-up dialog
 to alert you of the update and requesting that you update to the latest
 version. Due to their use of the Sparkle frameworks, this is the default
-process for Mac OS X applications.
+process for macOS applications.
 
 Linux
 ^^^^^
@@ -96,10 +96,10 @@ To prevent automatic updates and disallow manual overrides:
 .. note:: branded clients have different key names
 
 
-Preventing Automatic Updates in Mac OS X Environments
+Preventing Automatic Updates in macOS Environments
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-You can disable the automatic update mechanism, in the Mac OS X operating system,
+You can disable the automatic update mechanism, in the macOS operating system,
 by copying the file
 ``nextcloud.app/Contents/Resources/deny_autoupdate_com.nextcloud.desktopclient.plist``
 to ``/Library/Preferences/com.nextcloud.desktopclient.plist``.

doc/building.rst

@@ -17,13 +17,13 @@ Getting Source Code
 -------------------
 
 The :ref:`generic-build-instructions` pull the latest code directly from
-GitHub, and work on Linux, Mac OS X, and Windows.
+GitHub, and work on Linux, macOS, and Windows.
 
-Mac OS X
+macOS
---------
+-----
 
 In addition to needing XCode (along with the command line tools), developing in
-the Mac OS X environment requires extra dependencies.  You can install these
+the macOS environment requires extra dependencies.  You can install these
 dependencies through MacPorts_ or Homebrew_.  These dependencies are required
 only on the build machine, because non-standard libs are deployed in the app
 bundle.
@@ -213,7 +213,7 @@ To build the most up-to-date version of the client:
    .. note:: You must use absolute paths for the ``include`` and ``library``
             directories.
 
-   .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
+   .. note:: On macOS, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
             where ``target`` is a private location, i.e. in parallel to your build
             dir by specifying ``../install``.
 

doc/conffile.rst

@@ -6,7 +6,7 @@ On Linux distributions:
 On Microsoft Windows systems:
         ``%APPDATA%\Nextcloud\nextcloud.cfg``
 
-On MAC OS X systems:
+On macOS systems:
         ``$HOME/Library/Preferences/Nextcloud/nextcloud.cfg``
 
 

doc/glossary.rst

@@ -7,7 +7,7 @@ Glossary
    Nextcloud Sync Client
    Nextcloud Client
      Name of the official Nextcloud syncing client for desktop, which runs on
-     Windows, Mac OS X and Linux. It uses the CSync sync engine for 
+     Windows, macOS and Linux. It uses the CSync sync engine for
      synchronization with the Nextcloud server.
 
    Nextcloud Server

doc/installing.rst

@@ -4,9 +4,9 @@ Installing the Desktop Synchronization Client
 
 You can download the  latest version of the Nextcloud Desktop Synchronization
 Client from the `Nextcloud download page`_.
-There are clients for Linux, Mac OS X, and Microsoft Windows.
+There are clients for Linux, macOS, and Microsoft Windows.
 
-Installation on Mac OS X and Windows is the same as for any software 
+Installation on macOS and Windows is the same as for any software
 application: download the program and then double-click it to launch the
 installation, and then follow the installation wizard. After it is installed and
 configured the sync client will automatically keep itself updated; see
@@ -28,7 +28,7 @@ System Requirements
 ----------------------------------
 
 - Windows 7+
-- Mac OS X 10.7+ (**64-bit only**)
+- macOS 10.7+ (**64-bit only**)
 
 Installation Wizard
 -------------------

doc/introduction.rst

@@ -2,7 +2,7 @@
 Introduction
 ============
 
-Available for Windows, Mac OS X, and various Linux distributions, the Nextcloud 
+Available for Windows, macOS, and various Linux distributions, the Nextcloud
 Desktop Sync client enables you to:
 
 - Specify one or more directories on your computer that you want to synchronize
@@ -25,4 +25,3 @@ improvements.
   * Add warnings for old server versions
   * Update of QtKeyChain to support Windows credential store
   * Packaging of dolphin overlay icon module for bleeding edge distributions
-  

doc/navigating.rst

@@ -5,7 +5,7 @@ Using the Synchronization Client
 .. index:: navigating, usage
 
 The Nextcloud Desktop Client remains in the background and is visible as an icon
-in the system tray (Windows, KDE), status bar (Mac OS X), or notification area 
+in the system tray (Windows, KDE), status bar (macOS), or notification area
 (Linux).
 
 .. figure:: images/icon.png
@@ -159,7 +159,7 @@ Sharing From Your Desktop
 -------------------------
 
 The Nextcloud desktop sync client integrates with your file manager: Finder on
-Mac OS X, Explorer on Windows, and Nautilus on Linux. (Linux users must install 
+macOS, Explorer on Windows, and Nautilus on Linux. (Linux users must install 
 the ``Nextcloud-client-nautilus`` plugin.) You can create share links, and share
 with internal Nextcloud users the same way as in your Nextcloud Web interface.
 

doc/troubleshooting.rst

@@ -145,7 +145,7 @@ mentioned above to save the log to a file.
      restarting the client using the following command:
 
      * Windows: ``C:\Program Files (x86)\Nextcloud\nextcloud.exe --logwindow``
-     * Mac OS X: ``/Applications/nextcloud.app/Contents/MacOS/nextcloud --logwindow``
+     * macOS: ``/Applications/nextcloud.app/Contents/MacOS/nextcloud --logwindow``
      * Linux: ``nextcloud --logwindow``
 
 Saving Files Directly
@@ -213,7 +213,7 @@ You can find more information about Apache logging at
 Core Dumps
 ----------
 
-On Mac OS X and Linux systems, and in the unlikely event the client software
+On macOS and Linux systems, and in the unlikely event the client software
 crashes, the client is able to write a core dump file.  Obtaining a core dump
 file can assist Nextcloud Customer Support tremendously in the debugging
 process.

doc/visualtour.rst

@@ -8,7 +8,7 @@ Icon
 
 The Nextcloud Client remains in the background and is visible
 as an icon in the system tray (Windows, KDE), status bar
-(MAC OS X), or notification area (Ubuntu).
+(macOS), or notification area (Ubuntu).
 
 .. image:: images/icon.png
 
@@ -17,7 +17,7 @@ Menu
 
 .. image:: images/menu.png
 
-A right click on the icon (left click on Ubuntu and Mac OS X)
+A right click on the icon (left click on Ubuntu and macOS)
 provides the following menu:
 
 * ``Open Nextcloud in browser``: Opens the Nextcloud web interface
@@ -124,7 +124,7 @@ The tab provides several useful options:
 * ``Show Desktop Nofications``: When checked, bubble notifications when
   a set of sync operations has been performed are provided.
 * ``Use Monochrome Icons``:  Use less obtrusive icons. Especially useful
-  on Mac OS X.
+  on macOS.
 * ``About``: provides information about authors as well as build conditions.
   This information is valuable when submitting a support request.