v1.7.1v1.7.1

4 files changed, 6 insertions, 6 deletions

diff --git a/RELEASING b/RELEASING
index 20da5d9..880a55d 100644
--- a/RELEASING
+++ b/RELEASING
@@ -25,7 +25,7 @@ Make announcement on mailing list:
 Update website:
 1. Make sure your ninja checkout is on the v1.5.0 tag
 2. Clone https://github.com/ninja-build/ninja-build.github.io
-3. In that repo, `cd ninja && ./update-docs.sh`
+3. In that repo, `./update-docs.sh`
 4. Update index.html with newest version and link to release notes
 5. git commit -m 'run update-docs.sh, 1.5.0 release'
 6. git push origin master
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 86a58d5..2e31e30 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -1,6 +1,6 @@
 The Ninja build system
 ======================
-v1.7.0, Apr 2016
+v1.7.1, Apr 2016
 
 
 Introduction
@@ -209,7 +209,7 @@ specified by `-j` or its default)
 `%e`:: Elapsed time in seconds.  _(Available since Ninja 1.2.)_
 `%%`:: A plain `%` character.
 
-The default progress status is `"[%s/%t] "` (note the trailing space
+The default progress status is `"[%f/%t] "` (note the trailing space
 to separate from the build rule). Another example of possible progress status
 could be `"[%u/%r/%f] "`.
 
diff --git a/src/build.cc b/src/build.cc
index 3a17bdb..8c0fbf8 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -84,7 +84,7 @@ BuildStatus::BuildStatus(const BuildConfig& config)
 
   progress_status_format_ = getenv("NINJA_STATUS");
   if (!progress_status_format_)
-    progress_status_format_ = "[%s/%t] ";
+    progress_status_format_ = "[%f/%t] ";
 }
 
 void BuildStatus::PlanHasTotalEdges(int total) {
@@ -222,7 +222,7 @@ string BuildStatus::FormatProgressStatus(
 
         // Percentage
       case 'p':
-        percent = (100 * started_edges_) / total_edges_;
+        percent = (100 * finished_edges_) / total_edges_;
         snprintf(buf, sizeof(buf), "%3i%%", percent);
         out += buf;
         break;
diff --git a/src/version.cc b/src/version.cc
index 0a01238..a048a18 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -18,7 +18,7 @@
 
 #include "util.h"
 
-const char* kNinjaVersion = "1.7.0";
+const char* kNinjaVersion = "1.7.1";
 
 void ParseVersion(const string& version, int* major, int* minor) {
   size_t end = version.find('.');