--config -> config

Library/Contributions/brew_bash_completion.sh

@@ -450,7 +450,7 @@ _brew ()
                 2>/dev/null | sed -e "s/\.rb//g" -e "s/brew-//g" \
                 -e "s/.*\///g")
         __brewcomp "
-            --cache --cellar --config
+            --cache --cellar config
             --env --prefix --repository
             audit
             cat

Library/Contributions/brew_zsh_completion.zsh

@@ -77,7 +77,7 @@ local -a formulae installed_formulae installed_taps outdated_formulae running_se
 _arguments \
   '(-v)-v[verbose]' \
   '(--cellar)--cellar[brew cellar]' \
-  '(--config)--config[brew configuration]' \
+  '(config)--config[brew configuration]' \
   '(--env)--env[brew environment]' \
   '(--repository)--repository[brew repository]' \
   '(--version)--version[version information]' \

Library/Contributions/cmd/brew-gist-logs.rb

@@ -37,7 +37,7 @@ def load_logs name
 end
 
 def append_config files
-  files['config.out'] = {:content => `brew --config 2>&1`}
+  files['config.out'] = {:content => `brew config 2>&1`}
 end
 
 def append_doctor files

Library/Contributions/cmd/brew-test-bot.rb

@@ -276,7 +276,7 @@ class Test
     return if ARGV.include? "--skip-setup"
     test "brew doctor"
     test "brew --env"
-    test "brew --config"
+    test "brew config"
   end
 
   def formula formula

Library/Contributions/manpages/brew.1.md

@@ -67,6 +67,11 @@ Note that these flags should only appear after a command.
   * `commands`:
     Show a list of built-in and external commands.
 
+  * `config`:
+    Show Homebrew and system configuration useful for debugging. If you file
+    a bug report, you will likely be asked for this information if you do not
+    provide it.
+
   * `create <URL> [--autotools|--cmake] [--no-fetch] [--set-name <name>] [--set-version <version>]`:
     Generate a formula for the downloadable file at <URL> and open it in the editor.
     Homebrew will attempt to automatically derive the formula name
@@ -391,11 +396,6 @@ Note that these flags should only appear after a command.
     Display the location in the cellar where <formula> would be installed,
     without any sort of versioned directory as the last path.
 
-  * `--config`:
-    Show Homebrew and system configuration useful for debugging. If you file
-    a bug report, you will likely be asked for this information if you do not
-    provide it.
-
   * `--env`:
     Show a summary of the Homebrew build environment.
 

Library/Homebrew/cmd/config.rb

@@ -1,7 +1,7 @@
 require 'hardware'
 
 module Homebrew extend self
-  def __config
+  def config
     dump_verbose_config
   end
 

Library/Homebrew/cmd/help.rb

@@ -12,7 +12,7 @@ Example usage:
 Troubleshooting:
   brew doctor
   brew install -vd FORMULA
-  brew [--env | --config]
+  brew [--env | config]
 
 Brewing:
   brew create [URL [--no-fetch]]

Library/Homebrew/exceptions.rb

@@ -190,7 +190,7 @@ class BuildError < Homebrew::InstallationError
         puts "  #{tap_issues_url}"
       end
     else
-      require 'cmd/--config'
+      require 'cmd/config'
       require 'cmd/--env'
 
       unless formula.core_formula?

Library/Homebrew/formula.rb

@@ -570,7 +570,7 @@ class Formula
         f.flush
         Kernel.system "/usr/bin/tail", "-n", "5", logfn unless ARGV.verbose?
         f.puts
-        require 'cmd/--config'
+        require 'cmd/config'
         Homebrew.write_build_config(f)
         raise BuildError.new(self, cmd, args, $?)
       end

Library/Homebrew/os/mac/hardware.rb

@@ -58,7 +58,7 @@ module MacCPUs
         :g4e # PowerPC 7450
       when 100
         # This is the only 64-bit PPC CPU type, so it's useful
-        # to distinguish in `brew --config` output and in bottle tags
+        # to distinguish in `brew config` output and in bottle tags
         MacOS.prefer_64_bit? ? :g5_64 : :g5  # PowerPC 970
       else
         :dunno

Library/brew.rb

@@ -85,7 +85,7 @@ begin
              'dr' => 'doctor',
              '--repo' => '--repository',
              'environment' => '--env',
-             '-c1' => '--config',
+             '--config' => 'config',
              }
 
   cmd = ARGV.shift

share/man/man1/brew.1

@@ -75,6 +75,10 @@ If \fB\-s\fR is passed, scrubs the cache, removing downloads for even the latest
 Show a list of built\-in and external commands\.
 .
 .TP
+\fBconfig\fR
+Show Homebrew and system configuration useful for debugging\. If you file a bug report, you will likely be asked for this information if you do not provide it\.
+.
+.TP
 \fBcreate <URL> [\-\-autotools|\-\-cmake] [\-\-no\-fetch] [\-\-set\-name <name>] [\-\-set\-version <version>]\fR
 Generate a formula for the downloadable file at \fIURL\fR and open it in the editor\. Homebrew will attempt to automatically derive the formula name and version, but if it fails, you\'ll have to make your own template\. The wget formula serves as a simple example\. For a complete cheat\-sheet, have a look at
 .
@@ -417,10 +421,6 @@ Display Homebrew\'s Cellar path\. \fIDefault:\fR \fB/usr/local/Cellar\fR
 Display the location in the cellar where \fIformula\fR would be installed, without any sort of versioned directory as the last path\.
 .
 .TP
-\fB\-\-config\fR
-Show Homebrew and system configuration useful for debugging\. If you file a bug report, you will likely be asked for this information if you do not provide it\.
-.
-.TP
 \fB\-\-env\fR
 Show a summary of the Homebrew build environment\.
 .