summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.asciidoc8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 4ceec26..6b2296f 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -1,7 +1,7 @@
Ninja
=====
Evan Martin <martine@danga.com>
-v1.3.0, May 2013
+v1.4.0, September 2013
Introduction
@@ -55,7 +55,7 @@ Here are the design goals of Ninja:
higher-level build systems have different opinions about how code
should be built; for example, should built objects live alongside
the sources or should all build output go into a separate directory?
- Is there an "package" rule that builds a distributable package of
+ Is there a "package" rule that builds a distributable package of
the project? Sidestep these decisions by trying to allow either to
be implemented, rather than choosing, even if that results in
more verbosity.
@@ -589,6 +589,7 @@ rule cc
command = cl /showIncludes -c $in /Fo$out
----
+[[ref_pool]]
Pools
~~~~~
@@ -669,6 +670,9 @@ A file is a series of declarations. A declaration can be one of:
+include _path_+. The difference between these is explained below
<<ref_scope,in the discussion about scoping>>.
+6. A pool declaration, which looks like +pool _poolname_+. Pools are explained
+ <<ref_pool, in the section on pools>>.
+
Lexical syntax
~~~~~~~~~~~~~~