From f3b19ee6295214703cb559f8bbb626d39f3d8cce Mon Sep 17 00:00:00 2001 From: peterdamian Date: Thu, 30 Nov 2017 18:44:25 -0500 Subject: [PATCH] Use macOS where applicable, other minor changes --- admin_manual/index.rst | 2 +- admin_manual/installation/source_installation.rst | 2 +- admin_manual/issues/general_troubleshooting.rst | 2 +- developer_manual/app/settings.rst | 2 +- developer_manual/general/debugging.rst | 2 +- user_manual/files/access_webdav.rst | 10 +++++----- user_manual/files/desktop_mobile_sync.rst | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/admin_manual/index.rst b/admin_manual/index.rst index 7bf48ad27..431fd5764 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -5,7 +5,7 @@ Introduction Welcome to the Nextcloud Server Administration Guide. This guide describes administration tasks for Nextcloud, the flexible open source file synchronization and sharing solution. Nextcloud includes the Nextcloud server, which runs on -Linux, client applications for Microsoft Windows, Mac OS X and Linux, and mobile +Linux, client applications for Microsoft Windows, macOS and Linux, and mobile clients for the Android and Apple iOS operating systems. Current editions of Nextcloud manuals are always available online at diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index 5ff1bac4a..e713826bf 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -37,7 +37,7 @@ Installing via Snap Packages A snap is a zip file containing an application together with its dependencies, and a description of how it should safely be run on your system, especially the different ways it should talk to other software. Most importantly snaps are -designed to be secure, sandboxed, containerised applications isolated from the +designed to be secure, sandboxed, containerized applications isolated from the underlying system and from other applications. To install the Nextcloud Snap Package, run the following command in a terminal:: diff --git a/admin_manual/issues/general_troubleshooting.rst b/admin_manual/issues/general_troubleshooting.rst index 98afae97e..8f608e97b 100644 --- a/admin_manual/issues/general_troubleshooting.rst +++ b/admin_manual/issues/general_troubleshooting.rst @@ -240,7 +240,7 @@ Troubleshooting Contacts & Calendar Service discovery ^^^^^^^^^^^^^^^^^ -Some clients - especially on iOS/Mac OS X - have problems finding the proper +Some clients - especially on iOS/macOS - have problems finding the proper sync URL, even when explicitly configured to use it. If you want to use CalDAV or CardDAV clients together with Nextcloud it is diff --git a/developer_manual/app/settings.rst b/developer_manual/app/settings.rst index d91f65e9d..a3c438827 100644 --- a/developer_manual/app/settings.rst +++ b/developer_manual/app/settings.rst @@ -145,7 +145,7 @@ would be the final relative path. /** @var $l \OCP\IL10N */ /** @var $_ array */ - script('myappid', 'admin'); // adds a Javascript file + script('myappid', 'admin'); // adds a JavaScript file style('survey_client', 'admin'); // adds a CSS file ?> diff --git a/developer_manual/general/debugging.rst b/developer_manual/general/debugging.rst index 83f376b4f..d51f19746 100644 --- a/developer_manual/general/debugging.rst +++ b/developer_manual/general/debugging.rst @@ -73,7 +73,7 @@ For debugging scripts on the command line, like ``occ`` or unit tests, set the ` Debugging Javascript -------------------- -By default all Javascript files in Nextcloud are minified (compressed) into a single file without whitespace. To prevent this, see Debug mode. +By default all JavaScript files in Nextcloud are minified (compressed) into a single file without whitespace. To prevent this, see Debug mode. Debugging HTML and templates diff --git a/user_manual/files/access_webdav.rst b/user_manual/files/access_webdav.rst index e35da1a27..80b256947 100644 --- a/user_manual/files/access_webdav.rst +++ b/user_manual/files/access_webdav.rst @@ -4,7 +4,7 @@ Accessing Nextcloud Files Using WebDAV Nextcloud fully supports the WebDAV protocol, and you can connect and synchronize with your Nextcloud files over WebDAV. In this chapter you will learn how to -connect Linux, Mac OS X, Windows, and mobile devices to your Nextcloud server via +connect Linux, macOS, Windows, and mobile devices to your Nextcloud server via WebDAV. Before we get into configuring WebDAV, let's take a quick look at the recommended way of connecting client devices to your Nextcloud servers. @@ -41,7 +41,7 @@ If you prefer, you may also connect your desktop PC to your Nextcloud server by using the WebDAV protocol rather than using a special client application. Web Distributed Authoring and Versioning (WebDAV) is a Hypertext Transfer Protocol (HTTP) extension that makes it easy to create, read, and edit files on Web -servers. With WebDAV you can access your Nextcloud shares on Linux, Mac OS X and +servers. With WebDAV you can access your Nextcloud shares on Linux, macOS and Windows in the same way as any remote network share, and stay synchronized. .. note:: In the following examples, You must adjust **example.com/** to the @@ -203,7 +203,7 @@ To access files through the macOS Finder: 2. Specify the address of the server in the **Server Address** field. .. image:: ../images/osx_webdav1.png - :alt: Screenshot of entering your Nextcloud server address on Mac OS X + :alt: Screenshot of entering your Nextcloud server address on macOS For example, the URL used to connect to the Nextcloud server from the macOS Finder is:: @@ -216,7 +216,7 @@ To access files through the macOS Finder: The device connects to the server. -For added details about how to connect to an external server using Mac OS X, +For added details about how to connect to an external server using macOS, check the `vendor documentation `_ . @@ -307,7 +307,7 @@ Accessing Files Using Cyberduck `Cyberduck `_ is an open source FTP and SFTP, WebDAV, OpenStack Swift, and Amazon S3 browser designed for file transfers on -Mac OS X and Windows. +macOS and Windows. .. note:: This example uses Cyberduck version 4.2.1. diff --git a/user_manual/files/desktop_mobile_sync.rst b/user_manual/files/desktop_mobile_sync.rst index 53539d26a..258979c78 100644 --- a/user_manual/files/desktop_mobile_sync.rst +++ b/user_manual/files/desktop_mobile_sync.rst @@ -3,7 +3,7 @@ Desktop and Mobile Synchronization ================================== For synchronizing files with your desktop computer, we recommend using the -`Nextcloud Sync Client`_ for Windows, Mac OS X and Linux. +`Nextcloud Sync Client`_ for Windows, macOS and Linux. The Nextcloud Desktop Sync Client enables you to connect to your Nextcloud Server.