aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvars Berzinsh2017-12-19 10:59:04 +0200
committerIvars Berzinsh2017-12-19 10:59:04 +0200
commit28a0e445f0fb6aa02fc1be41bdd3cae11065e4fe (patch)
treeeab889853987b207cb70ec138caf3d733606ef37
parent25f65c1a136728ece1f4b4b88d7e9121e23879d1 (diff)
downloadbrew-28a0e445f0fb6aa02fc1be41bdd3cae11065e4fe.tar.bz2
Added info about no_proxy to docs
-rw-r--r--Library/Homebrew/manpages/brew.1.md.erb8
-rw-r--r--docs/Manpage.md8
-rw-r--r--manpages/brew.19
3 files changed, 22 insertions, 3 deletions
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index 321318b16..24f1b78b8 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -251,8 +251,14 @@ can take several different forms:
Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
+ * `no_proxy`:
+ Sets the comma-separated list of hostnames and domain names that should be excluded from proxying
+ by `curl`, `git` and `svn` when downloading through Homebrew.
+
## USING HOMEBREW BEHIND A PROXY
-Use the `http_proxy`, `https_proxy` and/or `ftp_proxy` documented above. For example for an unauthenticated HTTP proxy:
+Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above.
+
+For example for an unauthenticated HTTP proxy:
export http_proxy=http://<host>:<port>
diff --git a/docs/Manpage.md b/docs/Manpage.md
index a3015c864..f42009ab5 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -1096,8 +1096,14 @@ can take several different forms:
Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading
through Homebrew.
+ * `no_proxy`:
+ Sets the comma-separated list of hostnames and domain names that should be excluded from proxying
+ by `curl`, `git` and `svn` when downloading through Homebrew.
+
## USING HOMEBREW BEHIND A PROXY
-Use the `http_proxy`, `https_proxy` and/or `ftp_proxy` documented above. For example for an unauthenticated HTTP proxy:
+Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above.
+
+For example for an unauthenticated HTTP proxy:
export http_proxy=http://`host`:`port`
diff --git a/manpages/brew.1 b/manpages/brew.1
index 55c526f67..d8cea8975 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1120,8 +1120,15 @@ Sets the HTTPS proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when down
\fBftp_proxy\fR
Sets the FTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\.
.
+.TP
+\fBno_proxy\fR
+Sets the comma\-separated list of hostnames and domain names that should be excluded from proxying by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\.
+.
.SH "USING HOMEBREW BEHIND A PROXY"
-Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR and/or \fBftp_proxy\fR documented above\. For example for an unauthenticated HTTP proxy:
+Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR, \fBno_proxy\fR and/or \fBftp_proxy\fR documented above\.
+.
+.P
+For example for an unauthenticated HTTP proxy:
.
.IP "" 4
.