summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-06-04 17:16:39 (GMT)
committerEvan Martin <martine@danga.com>2012-06-04 17:16:39 (GMT)
commit54553d3f44dd187dca65677532f99a5458b8c802 (patch)
tree417565a869a95a9f561dcc7b4a018e6498a737d2
parent19209305c228ce8543f1771cea60c49cef354ed3 (diff)
parent0ad33b919862c7f01f0971b8fc54958a2024e0db (diff)
downloadNinja-54553d3f44dd187dca65677532f99a5458b8c802.zip
Ninja-54553d3f44dd187dca65677532f99a5458b8c802.tar.gz
Ninja-54553d3f44dd187dca65677532f99a5458b8c802.tar.bz2
Merge pull request #311 from nico/cleanups
Cleanups
-rw-r--r--doc/manual.asciidoc6
-rw-r--r--src/parsers.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index d9a6188..5de9638 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -123,7 +123,7 @@ but they are not part of make itself.)
you can print e.g. `CC foo.o` instead of a long command line while
building.
-* Builds are always run in parallel, based by defaulton the number of
+* Builds are always run in parallel, based by default on the number of
CPUs your system has. Underspecified build dependencies will result
in incorrect builds.
@@ -143,7 +143,7 @@ full details of the implementation -- like how to get C header
interdependencies correct and fast when using MSVC's compiler -- is
not yet complete.
-If your project is small, Ninja's speed impact is likely unnoticable.
+If your project is small, Ninja's speed impact is likely unnoticeable.
Some build timing numbers are included below. (However, even for
small projects it sometimes turns out that Ninja's limited syntax
forces simpler build rules that result in faster builds.) Another way
@@ -151,7 +151,7 @@ to say this is that if you're happy with the edit-compile cycle time
of your project already then Ninja won't help.
There are many other build systems that are more user-friendly or
-featureful than Ninja itself. For some recomendations: the Ninja
+featureful than Ninja itself. For some recommendations: the Ninja
author found http://gittup.org/tup/[the tup build system] influential
in Ninja's design, and thinks https://github.com/apenwarr/redo[redo]'s
design is quite clever.
diff --git a/src/parsers.cc b/src/parsers.cc
index c3844fb..bc76ba1 100644
--- a/src/parsers.cc
+++ b/src/parsers.cc
@@ -218,7 +218,7 @@ bool ManifestParser::ParseEdge(string* err) {
ins.push_back(in);
}
- // Add all order-only deps, counting how many as we go.
+ // Add all implicit deps, counting how many as we go.
int implicit = 0;
if (lexer_.PeekToken(Lexer::PIPE)) {
for (;;) {