aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2016-09-05 20:29:20 +0100
committerGitHub2016-09-05 20:29:20 +0100
commit2eb2176eaef6c2a7534773bcb03b4d58f47045a4 (patch)
tree5cd09d3ea652574ed7b6f222b620899f29b371af
parentefd29ebacaf6352e79c3e3a4c45b9e85c02c8a77 (diff)
parentcc0919c7d09458a37818df801186c9f38882ac80 (diff)
downloadbrew-2eb2176eaef6c2a7534773bcb03b4d58f47045a4.tar.bz2
Merge pull request #874 from zmwangx/doc-interesting-forks
doc/Interesting-Taps-&-Branches: rename to Interesting-Taps-&-Forks
-rw-r--r--share/doc/homebrew/Acceptable-Formulae.md2
-rw-r--r--share/doc/homebrew/Formula-Cookbook.md2
-rw-r--r--share/doc/homebrew/Installation.md2
-rw-r--r--share/doc/homebrew/Interesting-Taps-&-Forks.md (renamed from share/doc/homebrew/Interesting-Taps-&-Branches.md)2
4 files changed, 4 insertions, 4 deletions
diff --git a/share/doc/homebrew/Acceptable-Formulae.md b/share/doc/homebrew/Acceptable-Formulae.md
index e8ee2f0d6..366615ed8 100644
--- a/share/doc/homebrew/Acceptable-Formulae.md
+++ b/share/doc/homebrew/Acceptable-Formulae.md
@@ -1,7 +1,7 @@
# Acceptable Formulae
Some formulae should not go in
[homebrew/core](https://github.com/Homebrew/homebrew-core). But there are
-additional [Interesting Taps & Branches](Interesting-Taps-&-Branches.md) and anyone can start their
+additional [Interesting Taps & Forks](Interesting-Taps-&-Forks.md) and anyone can start their
own!
### We try hard to avoid dupes in Homebrew/homebrew
diff --git a/share/doc/homebrew/Formula-Cookbook.md b/share/doc/homebrew/Formula-Cookbook.md
index e9bf682a1..4498c1e23 100644
--- a/share/doc/homebrew/Formula-Cookbook.md
+++ b/share/doc/homebrew/Formula-Cookbook.md
@@ -31,7 +31,7 @@ Before submitting a new formula make sure your package:
* isn't in another official [Homebrew tap](https://github.com/Homebrew)
* isn't already waiting to be merged (check the [issue tracker](https://github.com/Homebrew/homebrew-core/pulls))
* is still supported by upstream (i.e. doesn't require extensive patching)
-* has a stable, tagged version (i.e. not just a GitHub repository with no versions). See [Interesting-Taps-&-Branches](Interesting-Taps-&-Branches.md) for where pre-release versions belong.
+* has a stable, tagged version (i.e. not just a GitHub repository with no versions). See [Interesting-Taps-&-Forks](Interesting-Taps-&-Forks.md) for where pre-release versions belong.
* passes all `brew audit --strict --online $FORMULA` tests.
Before submitting a new formula make sure you read over our [contribution guidelines](https://github.com/Homebrew/brew/blob/master/.github/CONTRIBUTING.md).
diff --git a/share/doc/homebrew/Installation.md b/share/doc/homebrew/Installation.md
index 51d86dc20..8c7892846 100644
--- a/share/doc/homebrew/Installation.md
+++ b/share/doc/homebrew/Installation.md
@@ -40,7 +40,7 @@ Uninstallation is documented in the [FAQ](FAQ.md).
<a name="1"><sup>1</sup></a> Not all formulae have CPU or OS requirements, but
you can assume you will have trouble if you don’t conform. Also, you can find
PowerPC and Tiger branches from other users in the fork network. See
-[Interesting Taps & Branches](Interesting-Taps-&-Branches.md).
+[Interesting Taps & Forks](Interesting-Taps-&-Forks.md).
<a name="2"><sup>2</sup></a> 10.9 or higher is recommended. 10.5 - 10.8 are
supported on a best-effort basis. For 10.4 and 10.5, see
diff --git a/share/doc/homebrew/Interesting-Taps-&-Branches.md b/share/doc/homebrew/Interesting-Taps-&-Forks.md
index 6c0776aab..5a9c0d7ea 100644
--- a/share/doc/homebrew/Interesting-Taps-&-Branches.md
+++ b/share/doc/homebrew/Interesting-Taps-&-Forks.md
@@ -1,4 +1,4 @@
-# Interesting Taps & Branches
+# Interesting Taps & Forks
A Tap is homebrew-speak for a git repository containing extra formulae.
Homebrew has the capability to add (and remove) multiple taps to your local installation with the `brew tap` and `brew untap` command. Type `man brew` in your Terminal. The main repository https://github.com/Homebrew/homebrew-core, often called `homebrew/core`, is always built-in.