From ed3aa1870cbcaf6ca223eca47c06770f37426143 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Thu, 27 Sep 2018 14:00:10 +0300 Subject: [PATCH] Replace OSX with macOS --- doc/00-intro.md | 6 +++--- doc/03-cli.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/00-intro.md b/doc/00-intro.md index 046fea8fe..e4af54c2c 100644 --- a/doc/00-intro.md +++ b/doc/00-intro.md @@ -40,9 +40,9 @@ To install packages from sources instead of simple zip archives, you will need git, svn, fossil or hg depending on how the package is version-controlled. Composer is multi-platform and we strive to make it run equally well on Windows, -Linux and OSX. +Linux and macOS. -## Installation - Linux / Unix / OSX +## Installation - Linux / Unix / macOS ### Downloading the Composer Executable @@ -100,7 +100,7 @@ Linux distributions. > **Note:** If the above fails due to permissions, you may need to run it again > with sudo. -> **Note:** On some versions of OSX the `/usr` directory does not exist by +> **Note:** On some versions of macOS the `/usr` directory does not exist by > default. If you receive the error "/usr/local/bin/composer: No such file or > directory" then you must create the directory manually before proceeding: > `mkdir -p /usr/local/bin`. diff --git a/doc/03-cli.md b/doc/03-cli.md index 0b46e04f5..372bea85a 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -856,7 +856,7 @@ is a hidden, global (per-user on the machine) directory that is shared between all projects. By default it points to `C:\Users\\AppData\Roaming\Composer` on Windows -and `/Users//.composer` on OSX. On *nix systems that follow the [XDG Base +and `/Users//.composer` on macOS. On *nix systems that follow the [XDG Base Directory Specifications](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html), it points to `$XDG_CONFIG_HOME/composer`. On other *nix systems, it points to `/home//.composer`. @@ -878,7 +878,7 @@ configuration in the project's `composer.json` always wins. The `COMPOSER_CACHE_DIR` var allows you to change the Composer cache directory, which is also configurable via the [`cache-dir`](06-config.md#cache-dir) option. -By default it points to `$COMPOSER_HOME/cache` on \*nix and OSX, and +By default it points to `$COMPOSER_HOME/cache` on \*nix and macOS, and `C:\Users\\AppData\Local\Composer` (or `%LOCALAPPDATA%/Composer`) on Windows. ### COMPOSER_PROCESS_TIMEOUT