aboutsummaryrefslogtreecommitdiffhomepage
path: root/site/docs
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2015-06-24 19:57:18 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-06-25 06:47:43 +0000
commitbf6dcb707b44459f19fd3989385b66e7ba68df9d (patch)
treed5d66c0e2060f0de6f482cd54c5e4257673d12e7 /site/docs
parentdfde4e5cd86f00c30bdedeed020844c861658b53 (diff)
Fix documentation about master configuration files
-- MOS_MIGRATED_REVID=96802902
Diffstat (limited to 'site/docs')
-rw-r--r--site/docs/bazel-user-manual.html12
1 files changed, 5 insertions, 7 deletions
diff --git a/site/docs/bazel-user-manual.html b/site/docs/bazel-user-manual.html
index 5ae68abdd5..d177832a81 100644
--- a/site/docs/bazel-user-manual.html
+++ b/site/docs/bazel-user-manual.html
@@ -284,15 +284,13 @@ the <code class='flag'>--bazelrc=<var>file</var></code> option, and the
this option when performing release builds, or automated tests that
invoke Bazel.
</p>
+
<p>
Aside from the configuration file described above, Bazel also looks
- for a master configuration file next to the binary. The name of this
- file is the same as the name of the binary with the
- string <code>.bazelrc</code> attached. This file is not intended to
- be user-modifiable; its purpose is for the Bazel team to be able to
- turn experimental features on or off immediately without releasing a
- new Bazel version, should an urgent need arise. Reading of this file
- can be disabled using the <code class='flag'>--nomaster_bazelrc</code> option.
+ for a master configuration 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.
</p>
<p>
Like all UNIX "rc" files, the <code>.bazelrc</code> file is a text