summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2013-04-10 17:02:27 (GMT)
committerEvan Martin <martine@danga.com>2013-04-10 17:02:27 (GMT)
commit8c0d41c7e1b4ebb8b183a9e5eae52c90d99bd196 (patch)
tree10b5bf09c71c09433d87435cfcdde6091a46e2cc /doc
parentb8e7500180efe3dfa86f76b02def94eafd3e490d (diff)
downloadNinja-8c0d41c7e1b4ebb8b183a9e5eae52c90d99bd196.zip
Ninja-8c0d41c7e1b4ebb8b183a9e5eae52c90d99bd196.tar.gz
Ninja-8c0d41c7e1b4ebb8b183a9e5eae52c90d99bd196.tar.bz2
more minor manual touchups
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.asciidoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 9523bfd..40c4d7e 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -15,8 +15,8 @@ to be fast. It is born from
http://neugierig.org/software/chromium/notes/2011/02/ninja.html[my
work on the Chromium browser project], which has over 30,000 source
files and whose other build systems (including one built from custom
-non-recursive Makefiles) can take ten seconds to start building after
-changing one file. Ninja is under a second.
+non-recursive Makefiles) would take ten seconds to start building
+after changing one file. Ninja is under a second.
Philosophical overview
~~~~~~~~~~~~~~~~~~~~~~
@@ -89,7 +89,7 @@ create your project's `.ninja` files.
Comparison to Make
~~~~~~~~~~~~~~~~~~
-Ninja is closest in spirit and functionality to make, relying on
+Ninja is closest in spirit and functionality to Make, relying on
simple dependencies between file timestamps.
But fundamentally, make has a lot of _features_: suffix rules,
@@ -102,7 +102,7 @@ builds correct while punting most complexity to generation of the
ninja input files. Ninja by itself is unlikely to be useful for most
projects.
-Here are some of the features Ninja adds to make. (These sorts of
+Here are some of the features Ninja adds to Make. (These sorts of
features can often be implemented using more complicated Makefiles,
but they are not part of make itself.)
@@ -878,7 +878,7 @@ example, the `demo` rule prints "this is a demo of bar".
----
rule demo
- command = echo "this is a demo of $foo'
+ command = echo "this is a demo of $foo"
build out: demo
foo = bar