From 4c2e7b165912c109cd73fdf70aa6c4e92306a70f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 14 Dec 2013 18:13:11 +0000 Subject: [PATCH] Update docs, comment mxcl/homebrew refs. --- CONTRIBUTING.md | 6 +++--- Library/Contributions/cmd/brew-dirty.rb | 2 +- Library/Contributions/example-formula.rb | 8 ++++---- Library/Contributions/manpages/brew.1.md | 10 +++++----- Library/Homebrew/cmd/create.rb | 2 +- Library/Homebrew/cmd/doctor.rb | 2 +- Library/Homebrew/formula.rb | 2 +- Library/Homebrew/os/mac.rb | 6 +++--- Library/Homebrew/os/mac/xcode.rb | 4 ++-- Library/Homebrew/requirements/python_dependency.rb | 2 +- Library/Homebrew/utils.rb | 2 +- README.md | 6 +++--- share/man/man1/brew.1 | 10 +++++----- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d447ee6c0a..01dec29683 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ Reporting Bugs Please read: * `brew doctor` -* [Troubleshooting Checklist](https://github.com/mxcl/homebrew/wiki/troubleshooting) +* [Troubleshooting Checklist](https://github.com/Homebrew/homebrew/wiki/troubleshooting) **If you don't read these it will take us far longer to help you with your problem.** @@ -14,7 +14,7 @@ Contributing ------------ Please read: -* [Formula Cookbook](https://github.com/mxcl/homebrew/wiki/Formula-Cookbook) -* [Acceptable Formulae](https://github.com/mxcl/homebrew/wiki/Acceptable-Formulae) +* [Formula Cookbook](https://github.com/Homebrew/homebrew/wiki/Formula-Cookbook) +* [Acceptable Formulae](https://github.com/Homebrew/homebrew/wiki/Acceptable-Formulae) Thanks! diff --git a/Library/Contributions/cmd/brew-dirty.rb b/Library/Contributions/cmd/brew-dirty.rb index c0c1167f17..acf9885f82 100755 --- a/Library/Contributions/cmd/brew-dirty.rb +++ b/Library/Contributions/cmd/brew-dirty.rb @@ -1,4 +1,4 @@ -# See: http://github.com/mxcl/homebrew/issues/issue/1359 +# See: http://github.com/Homebrew/homebrew/issues/issue/1359 require 'keg' diff --git a/Library/Contributions/example-formula.rb b/Library/Contributions/example-formula.rb index f3cbf5d2d0..345544f551 100644 --- a/Library/Contributions/example-formula.rb +++ b/Library/Contributions/example-formula.rb @@ -3,7 +3,7 @@ require 'formula' # This is a non-functional example formula to showcase all features and # therefore, its overly complex and dupes stuff just to comment on it. # You may want to use `brew create` to start your own new formula! -# Documentation: https://github.com/mxcl/homebrew/wiki/Formula-Cookbook +# Documentation: https://github.com/Homebrew/homebrew/wiki/Formula-Cookbook ## Naming -- Every Homebrew formula is a class of the type `Formula`. @@ -73,7 +73,7 @@ class ExampleFormula < Formula # Bottles are pre-built and added by the Homebrew maintainers for you. # If you maintain your own repository, you can add your own bottle links. # Read in the wiki about how to provide bottles: - # + # bottle do root_url 'http://mikemcquaid.com' # Optional root to calculate bottle URLs prefix '/opt/homebrew' # Optional HOMEBREW_PREFIX in which the bottles were built. @@ -396,7 +396,7 @@ end class AdditionalStuff < Formula # Often, a second formula is used to download some resource - # NOTE: This is going to change when https://github.com/mxcl/homebrew/pull/21714 happens. + # NOTE: This is going to change when https://github.com/Homebrew/homebrew/pull/21714 happens. url 'https://example.com/additional-stuff.tar.gz' sha1 'deadbeef7890123456789012345678901234567890' end @@ -404,7 +404,7 @@ end __END__ # Room for a patch after the `__END__` # Read in the wiki about how to get a patch in here: -# https://github.com/mxcl/homebrew/wiki/Formula-Cookbook +# https://github.com/Homebrew/homebrew/wiki/Formula-Cookbook # In short, `brew install --interactive --git ` and make your edits. # Then `git diff >> path/to/your/formula.rb` # Note, that HOMEBREW_PREFIX will be replaced in the path before it is diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md index 6b03175693..e64f9b34c2 100644 --- a/Library/Contributions/manpages/brew.1.md +++ b/Library/Contributions/manpages/brew.1.md @@ -415,7 +415,7 @@ by default: Documentation for the included external commands as well as instructions for creating your own can be found on the wiki: - + ## SPECIFYING FORMULAE @@ -426,13 +426,13 @@ can take several different forms: e.g. `git`, `node`, `wget`. * The fully-qualified name of a tapped formula: - Sometimes a formula from a tapped repository may conflict with one in mxcl/master. + Sometimes a formula from a tapped repository may conflict with one in Homebrew/homebrew. You can still access these formulae by using a special syntax, e.g. `homebrew/dupes/vim` or `homebrew/versions/node4`. * An arbitrary URL: Homebrew can install formulae via URL, e.g. - `https://raw.github.com/mxcl/homebrew/master/Library/Formula/git.rb`. + `https://raw.github.com/Homebrew/homebrew/master/Library/Formula/git.rb`. The formula file will be cached for later use. ## ENVIRONMENT @@ -578,7 +578,7 @@ If your proxy requires authentication: ## SEE ALSO -Homebrew Wiki: +Homebrew Wiki: `git`(1), `git-log`(1) @@ -588,5 +588,5 @@ Max Howell, a splendid chap. ## BUGS -See Issues on GitHub: +See Issues on GitHub: diff --git a/Library/Homebrew/cmd/create.rb b/Library/Homebrew/cmd/create.rb index 06d45555d9..daca31e8ea 100644 --- a/Library/Homebrew/cmd/create.rb +++ b/Library/Homebrew/cmd/create.rb @@ -117,7 +117,7 @@ class FormulaCreator def template; <<-EOS.undent require 'formula' - # Documentation: https://github.com/mxcl/homebrew/wiki/Formula-Cookbook + # Documentation: https://github.com/Homebrew/homebrew/wiki/Formula-Cookbook # #{HOMEBREW_CONTRIB}/example-formula.rb # PLEASE REMOVE ALL GENERATED COMMENTS BEFORE SUBMITTING YOUR PULL REQUEST! diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index cd0f23a79d..62c028f67f 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -56,7 +56,7 @@ class Checks ############# END HELPERS # Sorry for the lack of an indent here, the diff would have been unreadable. -# See https://github.com/mxcl/homebrew/pull/9986 +# See https://github.com/Homebrew/homebrew/pull/9986 def check_path_for_trailing_slashes bad_paths = ENV['PATH'].split(File::PATH_SEPARATOR).select { |p| p[-1..-1] == '/' } return if bad_paths.empty? diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 5643064af0..460b4bb47c 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -343,7 +343,7 @@ class Formula # Install python bindings inside of a block given to this method and/or # call python so: `system python, "setup.py", "install", "--prefix=#{prefix}" # Note that there are no quotation marks around python! - # + # def python(options={:allowed_major_versions => [2, 3]}, &block) require 'python_helper' python_helper(options, &block) diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index 316c7f68c8..570bfefeb1 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -180,9 +180,9 @@ module OS end # See these issues for some history: - # http://github.com/mxcl/homebrew/issues/#issue/13 - # http://github.com/mxcl/homebrew/issues/#issue/41 - # http://github.com/mxcl/homebrew/issues/#issue/48 + # http://github.com/Homebrew/homebrew/issues/13 + # http://github.com/Homebrew/homebrew/issues/41 + # http://github.com/Homebrew/homebrew/issues/48 def macports_or_fink paths = [] diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index ae01d88780..80f93ab8f8 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -108,7 +108,7 @@ module OS rescue # For people who's xcode-select is unset, or who have installed # xcode-gcc-installer or whatever other combinations we can try and - # supprt. See https://github.com/mxcl/homebrew/wiki/Xcode + # supprt. See https://github.com/Homebrew/homebrew/wiki/Xcode case MacOS.llvm_build_version.to_i when 1..2063 then "3.1.0" when 2064..2065 then "3.1.4" @@ -121,7 +121,7 @@ module OS when 2327..2333 then "3.2.5" when 2335 # this build number applies to 3.2.6, 4.0 and 4.1 - # https://github.com/mxcl/homebrew/wiki/Xcode + # https://github.com/Homebrew/homebrew/wiki/Xcode "4.0" else case (MacOS.clang_version.to_f * 10).to_i diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_dependency.rb index 4ce9cd96ff..0b9fa8bad3 100644 --- a/Library/Homebrew/requirements/python_dependency.rb +++ b/Library/Homebrew/requirements/python_dependency.rb @@ -295,7 +295,7 @@ class PythonDependency < Requirement <<-EOF.undent # This file is created by Homebrew and is executed on each python startup. # Don't print from here, or else python command line scripts may fail! - # + # import os import sys diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 87b91d6b9f..75ce62e221 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -137,7 +137,7 @@ def curl *args raise "#{curl} is not executable" unless curl.exist? and curl.executable? args = [HOMEBREW_CURL_ARGS, HOMEBREW_USER_AGENT, *args] - # See https://github.com/mxcl/homebrew/issues/6103 + # See https://github.com/Homebrew/homebrew/issues/6103 args << "--insecure" if MacOS.version < "10.6" args << "--verbose" if ENV['HOMEBREW_CURL_VERBOSE'] args << "--silent" unless $stdout.tty? diff --git a/README.md b/README.md index 9eeecf0457..581d5bf457 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ License Code is under the [BSD 2 Clause (NetBSD) license][license]. [home]:http://brew.sh -[wiki]:http://wiki.github.com/mxcl/homebrew +[wiki]:http://wiki.github.com/Homebrew/homebrew [mxcl]:http://twitter.com/mxcl -[formula]:http://github.com/mxcl/homebrew/tree/master/Library/Formula/ +[formula]:http://github.com/Homebrew/homebrew/tree/master/Library/Formula/ [braumeister]:http://braumeister.org -[license]:https://github.com/mxcl/homebrew/tree/master/Library/Homebrew/LICENSE +[license]:https://github.com/Homebrew/homebrew/tree/master/Library/Homebrew/LICENSE diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1 index 5940ea7a51..89a73baace 100644 --- a/share/man/man1/brew.1 +++ b/share/man/man1/brew.1 @@ -453,7 +453,7 @@ $ ls $(brew \-\-repository)/Library/Contributions/cmd .IP "" 0 . .P -Documentation for the included external commands as well as instructions for creating your own can be found on the wiki: \fIhttp://wiki\.github\.com/mxcl/homebrew/External\-Commands\fR +Documentation for the included external commands as well as instructions for creating your own can be found on the wiki: \fIhttp://wiki\.github\.com/Homebrew/homebrew/External\-Commands\fR . .SH "SPECIFYING FORMULAE" Many Homebrew commands accept one or more \fIformula\fR arguments\. These arguments can take several different forms: @@ -464,11 +464,11 @@ e\.g\. \fBgit\fR, \fBnode\fR, \fBwget\fR\. . .TP The fully\-qualified name of a tapped formula -Sometimes a formula from a tapped repository may conflict with one in mxcl/master\. You can still access these formulae by using a special syntax, e\.g\. \fBhomebrew/dupes/vim\fR or \fBhomebrew/versions/node4\fR\. +Sometimes a formula from a tapped repository may conflict with one in Homebrew/homebrew\. You can still access these formulae by using a special syntax, e\.g\. \fBhomebrew/dupes/vim\fR or \fBhomebrew/versions/node4\fR\. . .TP An arbitrary URL -Homebrew can install formulae via URL, e\.g\. \fBhttps://raw\.github\.com/mxcl/homebrew/master/Library/Formula/git\.rb\fR\. The formula file will be cached for later use\. +Homebrew can install formulae via URL, e\.g\. \fBhttps://raw\.github\.com/Homebrew/homebrew/master/Library/Formula/git\.rb\fR\. The formula file will be cached for later use\. . .SH "ENVIRONMENT" . @@ -625,7 +625,7 @@ http_proxy=http://:@: brew install foo .IP "" 0 . .SH "SEE ALSO" -Homebrew Wiki: \fIhttp://wiki\.github\.com/mxcl/homebrew/\fR +Homebrew Wiki: \fIhttp://wiki\.github\.com/Homebrew/homebrew/\fR . .P \fBgit\fR(1), \fBgit\-log\fR(1) @@ -634,4 +634,4 @@ Homebrew Wiki: \fIhttp://wiki\.github\.com/mxcl/homebrew/\fR Max Howell, a splendid chap\. . .SH "BUGS" -See Issues on GitHub: \fIhttp://github\.com/mxcl/homebrew/issues\fR +See Issues on GitHub: \fIhttp://github\.com/Homebrew/homebrew/issues\fR