public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #7674 from lex111/doc-macos 

Replace OSX with macOS
pull/7677/head
Jordi Boggiano 2018-09-27 15:01:57 +02:00 committed by GitHub
parent af677553cc ed3aa1870c
commit 041028920f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/00-intro.md
View File

@ -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. 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, 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 ### 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 > **Note:** If the above fails due to permissions, you may need to run it again
> with sudo. > 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 > default. If you receive the error "/usr/local/bin/composer: No such file or
> directory" then you must create the directory manually before proceeding: > directory" then you must create the directory manually before proceeding:
> `mkdir -p /usr/local/bin`. > `mkdir -p /usr/local/bin`.

4
doc/03-cli.md
View File

@ -856,7 +856,7 @@ is a hidden, global (per-user on the machine) directory that is shared between
all projects. all projects.
By default it points to `C:\Users\<user>\AppData\Roaming\Composer` on Windows By default it points to `C:\Users\<user>\AppData\Roaming\Composer` on Windows
and `/Users/<user>/.composer` on OSX. On *nix systems that follow the [XDG Base and `/Users/<user>/.composer` on macOS. On *nix systems that follow the [XDG Base
Directory Specifications](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html), 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 it points to `$XDG_CONFIG_HOME/composer`. On other *nix systems, it points to
`/home/<user>/.composer`. `/home/<user>/.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, 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. 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\<user>\AppData\Local\Composer` (or `%LOCALAPPDATA%/Composer`) on Windows. `C:\Users\<user>\AppData\Local\Composer` (or `%LOCALAPPDATA%/Composer`) on Windows.
### COMPOSER_PROCESS_TIMEOUT ### COMPOSER_PROCESS_TIMEOUT