aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2014-10-26 15:42:41 +0000
committerMike McQuaid2014-10-26 15:42:41 +0000
commit51fd596cd2898e43ea45230b338250cd34f5fca0 (patch)
tree9876619ba7c6cf7cf80ebc2f5efd3db021ea91fa
parentbb590488ce3ee788e1fba0ea44d77b29a75831da (diff)
downloadhomebrew-51fd596cd2898e43ea45230b338250cd34f5fca0.tar.bz2
Improve API documentation output.
And include more files.
-rw-r--r--.yardopts4
-rw-r--r--Library/Homebrew/README.md (renamed from Library/Homebrew/API.md)0
-rw-r--r--Library/Homebrew/os/mac/xquartz.rb4
3 files changed, 5 insertions, 3 deletions
diff --git a/.yardopts b/.yardopts
index aead7677f..821b67c36 100644
--- a/.yardopts
+++ b/.yardopts
@@ -1,8 +1,10 @@
--title "Homebrew"
---main Library/Homebrew/API.md
+--main Library/Homebrew/README.md
--exclude Library/Homebrew/test/vendor/
--exclude Library/Homebrew/vendor/
Library/Homebrew/**/*.rb
-
Library/Homebrew/*.md
+Library/Homebrew/manpages/*.md
+share/doc/homebrew/*.md
*.md
diff --git a/Library/Homebrew/API.md b/Library/Homebrew/README.md
index f154675e2..f154675e2 100644
--- a/Library/Homebrew/API.md
+++ b/Library/Homebrew/README.md
diff --git a/Library/Homebrew/os/mac/xquartz.rb b/Library/Homebrew/os/mac/xquartz.rb
index 439c1b4db..79b50df44 100644
--- a/Library/Homebrew/os/mac/xquartz.rb
+++ b/Library/Homebrew/os/mac/xquartz.rb
@@ -90,8 +90,8 @@ module OS
end
# This should really be private, but for compatibility reasons it must
- # remain public. New code should use MacOS::X11.{bin,lib,include}
- # instead, as that accounts for Xcode-only systems.
+ # remain public. New code should use MacOS::X11.bin, MacOS::X11.lib and
+ # MacOS::X11.include instead, as that accounts for Xcode-only systems.
def prefix
@prefix ||= if Pathname.new('/opt/X11/lib/libpng.dylib').exist?
Pathname.new('/opt/X11')