aboutsummaryrefslogtreecommitdiffhomepage
path: root/site/docs/user-manual.html
diff options
context:
space:
mode:
authorGravatar Sergio Campama <sergiocampama@gmail.com>2018-02-15 01:06:00 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-15 01:07:52 -0800
commitae0db2bf5fc15960224bb42b92a92e4cc3f1bb30 (patch)
treeb8ab632f300cf08f37d42863505c65797f30f56a /site/docs/user-manual.html
parente11483663c29de9511043dc2cf384e2c5b386317 (diff)
Provide a bit more information on the expected location of bazelrc files.
The docs failed to mention the expected name of the file next to the binary. Also missing was the information that these files do not override each other; they are always loaded if present. Closes #4451. PiperOrigin-RevId: 185805289
Diffstat (limited to 'site/docs/user-manual.html')
-rw-r--r--site/docs/user-manual.html10
1 files changed, 6 insertions, 4 deletions
diff --git a/site/docs/user-manual.html b/site/docs/user-manual.html
index 46a9fce911..31da6cf3f7 100644
--- a/site/docs/user-manual.html
+++ b/site/docs/user-manual.html
@@ -165,10 +165,12 @@ title: User Manual
<p>
Aside from the optional configuration file described above, Bazel also looks
- for a master rc file next to the binary, in the workspace at
- <code>tools/bazel.rc</code> or system-wide at <code>/etc/bazel.bazelrc</code>.
- These files are here to support installation-wide options or options shared
- between users. Reading of this file can be disabled using the
+ for a master rc file named <code>bazel.bazelrc</code> next to the binary, in
+ the workspace at <code>tools/bazel.rc</code> or system-wide at
+ <code>/etc/bazel.bazelrc</code>. These files are here to support
+ installation-wide options or options shared between users. These files do not
+ override one another; if all of these files exist, all of them will be loaded.
+ Reading of these files can be disabled using the
<code class='flag'>--nomaster_bazelrc</code> option.
</p>
<h4><code>.bazelrc</code> syntax and semantics</h4>