diff options
| author | Gautham Goli | 2017-10-21 13:26:25 +0530 |
|---|---|---|
| committer | Gautham Goli | 2017-10-21 13:53:44 +0530 |
| commit | 7b2fab8ec5d8e93878d56d31879e8a05e4ab59bc (patch) | |
| tree | 43b6425f24829fadc8d1ea4bf938d6228cc6ef3b /docs | |
| parent | ee35d6586791be65b9cfbb976394c9191625aaee (diff) | |
| parent | a08f1c674803824e291c326adc2aca80068020e6 (diff) | |
| download | brew-7b2fab8ec5d8e93878d56d31879e8a05e4ab59bc.tar.bz2 | |
Merge branch 'master' into audit_line_rubocop_part_4_rebase_attempt_1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Manpage.md | 8 | ||||
| -rw-r--r-- | docs/Xcode.md | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/docs/Manpage.md b/docs/Manpage.md index f92991147..59969a3e8 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -770,7 +770,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note Additionally, the date used in new manpages will match those in the existing manpages (to allow comparison without factoring in the date). - * `pull` [`--bottle`] [`--bump`] [`--clean`] [`--ignore-whitespace`] [`--resolve`] [`--branch-okay`] [`--no-pbcopy`] [`--no-publish`] [`--warn-on-publish-failure`] `patch-source` [`patch-source`]: + * `pull` [`--bottle`] [`--bump`] [`--clean`] [`--ignore-whitespace`] [`--resolve`] [`--branch-okay`] [`--no-pbcopy`] [`--no-publish`] [`--warn-on-publish-failure`] [`--bintray-org=``bintray-org`] [`--test-bot-user=``test-bot-user`] `patch-source` [`patch-source`]: Gets a patch from a GitHub commit or pull request and applies it to Homebrew. Optionally, installs the formulae changed by the patch. @@ -814,6 +814,12 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note If `--warn-on-publish-failure` was passed, do not exit if there's a failure publishing bottles on Bintray. + If `--bintray-org=``bintray-org` is passed, publish at the given Bintray + organisation. + + If `--test-bot-user=``test-bot-user` is passed, pull the bottle block + commit from the specified user on GitHub. + * `release-notes` [`--markdown`] [`previous_tag`] [`end_ref`]: Output the merged pull requests on Homebrew/brew between two Git refs. If no `previous_tag` is provided it defaults to the newest tag. diff --git a/docs/Xcode.md b/docs/Xcode.md index 21ad66f95..18ced07ed 100644 --- a/docs/Xcode.md +++ b/docs/Xcode.md @@ -12,7 +12,8 @@ Tools available for your platform: | 10.9 | 6.2 | 6.2 | | 10.10 | 7.2.1 | 7.2 | | 10.11 | 8.2.1 | 8.2 | -| 10.12 | 8.3.3 | 8.3 | +| 10.12 | 9.0.1 | 9.0.1 | +| 10.13 | 9.0.1 | 9.0.1 | ## Compiler version database @@ -73,6 +74,8 @@ Tools available for your platform: | 8.3.1 | — | — | — | — | 8.1 (802.0.41) | — | | 8.3.2 | — | — | — | — | 8.1 (802.0.42) | — | | 8.3.3 | — | — | — | — | 8.1 (802.0.42) | — | +| 9.0.0 | — | — | — | — | 9.0 (900.0.37) | — | +| 9.0.1 | — | — | — | — | 9.0 (900.0.38) | — | ## References to Xcode and compiler versions in code When a new Xcode release is made, the following things need to be |