From 54e9ae32e6cee6cb619c07adc4c25d949e1439ac Mon Sep 17 00:00:00 2001
From: Homa Wong <homawong@gmail.com>
Date: Fri, 6 Jan 2017 23:44:17 -0800
Subject: [PATCH 1/2] Fix --project help

---
 src/compiler/commandLineParser.ts    | 6 +++---
 src/compiler/diagnosticMessages.json | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 2e2c5c0bdb6..9111a72eb2d 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -212,8 +212,8 @@ namespace ts {
             shortName: "p",
             type: "string",
             isFilePath: true,
-            description: Diagnostics.Compile_the_project_in_the_given_directory,
-            paramType: Diagnostics.DIRECTORY
+            description: Diagnostics.Compile_the_project_in_the_given_directory_using_tsconfig_json_or_the_specified_config_file,
+            paramType: Diagnostics.DIRECTORY_OR_FILE
         },
         {
             name: "removeComments",
@@ -517,7 +517,7 @@ namespace ts {
                 include: typeAcquisition.include || [],
                 exclude: typeAcquisition.exclude || []
             };
-           return result;
+            return result;
         }
         return typeAcquisition;
     }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index ec5ca292b99..2230ffdbac0 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2513,7 +2513,7 @@
         "category": "Message",
         "code": 6019
     },
-    "Compile the project in the given directory.": {
+    "Compile the project in the given directory, using 'tsconfig.json' or the specified config file.": {
         "category": "Message",
         "code": 6020
     },
@@ -2573,6 +2573,10 @@
         "category": "Message",
         "code": 6039
     },
+    "DIRECTORY_OR_FILE": {
+        "category": "Message",
+        "code": 6040
+    },
     "Compilation complete. Watching for file changes.": {
         "category": "Message",
         "code": 6042

From 41af749196c32bdac1a61be462c348a0f014c326 Mon Sep 17 00:00:00 2001
From: Homa Wong <homawong@gmail.com>
Date: Mon, 9 Jan 2017 21:29:34 -0800
Subject: [PATCH 2/2] Update based on feedback

---
 src/compiler/commandLineParser.ts    | 4 ++--
 src/compiler/diagnosticMessages.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 9111a72eb2d..3a4d5c6b1f7 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -212,8 +212,8 @@ namespace ts {
             shortName: "p",
             type: "string",
             isFilePath: true,
-            description: Diagnostics.Compile_the_project_in_the_given_directory_using_tsconfig_json_or_the_specified_config_file,
-            paramType: Diagnostics.DIRECTORY_OR_FILE
+            description: Diagnostics.Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json,
+            paramType: Diagnostics.FILE_OR_DIRECTORY
         },
         {
             name: "removeComments",
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 2230ffdbac0..6bdf9932fca 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -2513,7 +2513,7 @@
         "category": "Message",
         "code": 6019
     },
-    "Compile the project in the given directory, using 'tsconfig.json' or the specified config file.": {
+    "Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'": {
         "category": "Message",
         "code": 6020
     },
@@ -2573,7 +2573,7 @@
         "category": "Message",
         "code": 6039
     },
-    "DIRECTORY_OR_FILE": {
+    "FILE OR DIRECTORY": {
         "category": "Message",
         "code": 6040
     },