summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2015-06-18 17:22:48 -0700
committerNico Weber <thakis@chromium.org>2015-06-18 17:28:20 -0700
commitade82bd0b04a3282a538d99b3deaaf790e5bc42d (patch)
tree6bf623c85c983cda7257288cd0339357a656caa8
parentc6117169aa1e4d3fd419c34379bc7d2927e99a58 (diff)
downloadninja-ade82bd0b04a3282a538d99b3deaaf790e5bc42d.tar.gz
Document the change from #921 in the manual.
-rw-r--r--doc/manual.asciidoc5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 217ff28..003c71e 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -920,9 +920,12 @@ Evaluation and scoping
Top-level variable declarations are scoped to the file they occur in.
+Rule declarations are also scoped to the file they occur in.
+_(Available since Ninja 1.6)_
+
The `subninja` keyword, used to include another `.ninja` file,
introduces a new scope. The included `subninja` file may use the
-variables from the parent file, and shadow their values for the file's
+variables and rules from the parent file, and shadow their values for the file's
scope, but it won't affect values of the variables in the parent.
To include another `.ninja` file in the current scope, much like a C