aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMike McQuaid2016-09-24 20:48:03 +0100
committerMike McQuaid2016-09-24 20:48:03 +0100
commite767fd3df9d179fca0445cc0bc0fdc061ad857d6 (patch)
tree93e9db33313b36eebe7d7fb3aedf0f92cc2c3918 /docs
parent7fc241765e3654718235791c32e5638bf7f8e15a (diff)
parent232078df57418004bb9bf7abef877e734fcf7005 (diff)
downloadbrew-e767fd3df9d179fca0445cc0bc0fdc061ad857d6.tar.bz2
Merge branch 'master' into mkdir_with_intermediates
Diffstat (limited to 'docs')
-rw-r--r--docs/README.md5
-rw-r--r--docs/Xcode.md2
-rw-r--r--docs/brew.1.html8
3 files changed, 8 insertions, 7 deletions
diff --git a/docs/README.md b/docs/README.md
index 740f73ea3..ac9dbcd79 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -7,8 +7,9 @@ Homebrew installs the stuff you need that Apple didn’t.
- [Gems, Eggs and Perl Modules](Gems,-Eggs-and-Perl-Modules.md)
- [Homebrew and Python](Homebrew-and-Python.md)
-Please note: Homebrew is not 1.0 yet. Generally it works well, but when
-it doesn’t we’d hope you report the bug.
+Please note: Homebrew generally works well, but when it doesn’t we’d hope you
+report the bug.
+
## Troubleshooting
First, please run `brew update` (twice) and `brew doctor`.
diff --git a/docs/Xcode.md b/docs/Xcode.md
index 98c5c6347..7697a9c55 100644
--- a/docs/Xcode.md
+++ b/docs/Xcode.md
@@ -10,7 +10,7 @@ Tools available for your platform:
10.8 | 5.1.1 | April 2014
10.9 | 6.2 | 6.2
10.10 | 7.2.1 | 7.2
- 10.11 | 7.3.1 | 7.3
+ 10.11 | 8.0 | 7.3
10.12 | 8.0 | 8.0
diff --git a/docs/brew.1.html b/docs/brew.1.html
index b6c4be718..1aee073c1 100644
--- a/docs/brew.1.html
+++ b/docs/brew.1.html
@@ -552,7 +552,7 @@ Each <patch-source> may be one of:
<dl>
<dt><code>tap_readme</code> [<code>-v</code>] <var>name</var></dt><dd><p>Generate the README.md file for a new tap.</p></dd>
-<dt><code>test</code> [<code>--devel</code>|<code>--HEAD</code>] [<code>--debug</code>] [<code>--keep-tmp</code>] <var>formula</var></dt><dd><p>A few formulae provide a test method. <code>brew test</code> <var>formula</var> runs this
+<dt><code>test</code> [<code>--devel</code>|<code>--HEAD</code>] [<code>--debug</code>] [<code>--keep-tmp</code>] <var>formula</var></dt><dd><p>Most formulae provide a test method. <code>brew test</code> <var>formula</var> runs this
test method. There is no standard output or return code, but it should
generally indicate to the user if something is wrong with the installed
formula.</p>
@@ -568,11 +568,11 @@ not deleted.</p>
<p>Example: <code>brew install jruby &amp;&amp; brew test jruby</code></p></dd>
<dt><code>tests</code> [<code>-v</code>] [<code>--coverage</code>] [<code>--generic</code>] [<code>--no-compat</code>] [<code>--only=</code><test_script/test_method>] [<code>--seed</code> <var>seed</var>] [<code>--trace</code>] [<code>--online</code>] [<code>--official-cmd-taps</code>]</dt><dd><p>Run Homebrew's unit and integration tests.</p></dd>
-<dt><code>update-test</code> [<code>--commit=&lt;sha1></code>] [<code>--before=&lt;date></code>] [<code>--keep-tmp</code>]</dt><dd><p>Runs a test of <code>brew update</code> with a new repository clone.</p>
+<dt><code>update-test</code> [<code>--commit=&lt;commit></code>] [<code>--before=&lt;date></code>] [<code>--keep-tmp</code>]</dt><dd><p>Runs a test of <code>brew update</code> with a new repository clone.</p>
<p>If no arguments are passed, use <code>origin/master</code> as the start commit.</p>
-<p>If <code>--commit=&lt;sha1></code> is passed, use <code>&lt;sha1></code> as the start commit.</p>
+<p>If <code>--commit=&lt;commit></code> is passed, use <code>&lt;commit></code> as the start commit.</p>
<p>If <code>--before=&lt;date></code> is passed, use the commit at <code>&lt;date></code> as the
start commit.</p>
@@ -731,7 +731,7 @@ your shell profile, or you can use it before a brew command:</p>
<p>Homebrew's current maintainers are Misty De Meo, Andrew Janke, Xu Cheng, Tomasz Pajor, Baptiste Fontaine, Zhiming Wang, Brett Koonce, ilovezfs, Martin Afanasjew, Uladzislau Shablinski, Dominyk Tiller, Tim Smith and Alex Dunn.</p>
-<p>Former maintainers with significant contributions include Jack Nagel, Adam Vandenberg, Max Howell and Homebrew's creator: Max Howell.</p>
+<p>Former maintainers with significant contributions include Jack Nagel, Adam Vandenberg and Homebrew's creator: Max Howell.</p>
<h2 id="BUGS">BUGS</h2>