Fix help and error messages.

tools/gn/filesystem_utils.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/filesystem_utils.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 269 matching lines @@
                                const Value& originating,
                                Err* err) {
   // The last char of the dir will be a slash. We don't care if the input ends
   // in a slash or not, so just compare up until there.
   //
   // This check will be wrong for all proper prefixes "e.g. "/output" will
   // match "/out" but we don't really care since this is just a sanity check.
   const std::string& dir_str = dir.value();
   if (str.compare(0, dir_str.length() - 1, dir_str, 0, dir_str.length() - 1)
       != 0) {
-    *err = Err(originating, "File not inside output directory.",
+    *err = Err(originating, "File is not inside output directory.",
         "The given file should be in the output directory. Normally you would "
-        "specify\n\"$target_output_dir/foo\" or "
+        "specify\n\"$target_out_dir/foo\" or "
         "\"$target_gen_dir/foo\". I interpreted this as\n\""
         + str + "\".");
     return false;
   }
   return true;
 }
 
 bool IsPathAbsolute(const base::StringPiece& path) {
   if (path.empty())
     return false;
@@ skipping 321 matching lines @@
   return GetGenDirForSourceDir(target->settings(), target->label().dir());
 }
 
 SourceDir GetCurrentOutputDir(const Scope* scope) {
   return GetOutputDirForSourceDir(scope->settings(), scope->GetSourceDir());
 }
 
 SourceDir GetCurrentGenDir(const Scope* scope) {
   return GetGenDirForSourceDir(scope->settings(), scope->GetSourceDir());
 }