diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.0.xml
index 7b63a07b309..b931a48c83a 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.0.xml
@@ -11247,7 +11247,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11260,7 +11260,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11274,7 +11274,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.2.xml
index 7ddea60d5f7..eff745788c3 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.10.2.xml
@@ -11308,7 +11308,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11321,7 +11321,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11335,7 +11335,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.6.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.6.0.xml
index a015d8a686b..fa00b474206 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.6.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.6.0.xml
@@ -11496,7 +11496,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11509,7 +11509,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11523,7 +11523,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.7.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.7.2.xml
index 47e64d8cc6a..df2611117df 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.7.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.7.2.xml
@@ -9277,7 +9277,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -9290,7 +9290,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -9304,7 +9304,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.0.xml
index 807a1622103..7d0f83f49bc 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.0.xml
@@ -10366,7 +10366,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -10379,7 +10379,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -10393,7 +10393,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.2.xml
index 23bdb8973fe..911d3207d34 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.2.xml
@@ -10408,7 +10408,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -10421,7 +10421,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -10435,7 +10435,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.3.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.3.xml
index bd7e69c0265..a5c339be9cf 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.3.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.8.3.xml
@@ -10623,7 +10623,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -10636,7 +10636,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -10650,7 +10650,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.1.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.1.2.xml
index 05ea96a6392..1c034afb819 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.1.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.1.2.xml
@@ -11468,7 +11468,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11481,7 +11481,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11494,7 +11494,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell
+      <![CDATA[Convert an os-native filename to a path that works for the shell
  and avoids script injection attacks.
  @param file The filename to convert
  @return The unix pathname
@@ -11509,7 +11509,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.2.xml
index 40bea21f378..0989aeb36a7 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.2.xml
@@ -11779,7 +11779,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11792,7 +11792,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11805,7 +11805,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell
+      <![CDATA[Convert an os-native filename to a path that works for the shell
  and avoids script injection attacks.
  @param file The filename to convert
  @return The unix pathname
@@ -11820,7 +11820,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.4.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.4.xml
index 10a4f0d5f16..8e0a32e607a 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.4.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.2.4.xml
@@ -11789,7 +11789,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11802,7 +11802,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -11815,7 +11815,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell
+      <![CDATA[Convert an os-native filename to a path that works for the shell
  and avoids script injection attacks.
  @param file The filename to convert
  @return The unix pathname
@@ -11830,7 +11830,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.3.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.3.xml
index 448df9ddd68..9e3d1e96ec1 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.3.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.3.xml
@@ -12406,7 +12406,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -12419,7 +12419,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -12432,7 +12432,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell
+      <![CDATA[Convert an os-native filename to a path that works for the shell
  and avoids script injection attacks.
  @param file The filename to convert
  @return The unix pathname
@@ -12447,7 +12447,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.4.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.4.xml
index 62a0e09f121..44e9632fd00 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.4.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_3.3.4.xml
@@ -12406,7 +12406,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -12419,7 +12419,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -12432,7 +12432,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell
+      <![CDATA[Convert an os-native filename to a path that works for the shell
  and avoids script injection attacks.
  @param file The filename to convert
  @return The unix pathname
@@ -12447,7 +12447,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.20.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.20.0.xml
index 82bba339d6f..e1676039e65 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.20.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.20.0.xml
@@ -3972,7 +3972,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3985,7 +3985,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3999,7 +3999,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.21.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.21.0.xml
index b88dfabf1ee..26626b7e182 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.21.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.21.0.xml
@@ -5900,7 +5900,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -5913,7 +5913,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -5927,7 +5927,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.22.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.22.0.xml
index b3130dc1aae..3e6dfcf0a20 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.22.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop-core_0.22.0.xml
@@ -6907,7 +6907,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -6920,7 +6920,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -6934,7 +6934,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.17.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.17.0.xml
index 69dded31403..3fa70666d59 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.17.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.17.0.xml
@@ -9018,7 +9018,7 @@ order written.</p>]]>
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -9031,7 +9031,7 @@ order written.</p>]]>
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.1.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.1.xml
index fd844cbed0f..4ee2b3ca96f 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.1.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.1.xml
@@ -9563,7 +9563,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -9576,7 +9576,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.2.xml
index 08173ab82dc..ee711e830c5 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.2.xml
@@ -3573,7 +3573,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3586,7 +3586,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.3.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.3.xml
index 564916fef77..b2bee065157 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.3.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.18.3.xml
@@ -3573,7 +3573,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3586,7 +3586,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.0.xml
index 557ac3cc598..0229d6f3e70 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.0.xml
@@ -3805,7 +3805,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3818,7 +3818,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3832,7 +3832,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.1.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.1.xml
index 92bdd2c7996..23ddd2492b5 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.1.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.1.xml
@@ -3805,7 +3805,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3818,7 +3818,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3832,7 +3832,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.2.xml
index bbce1088373..dd7067416da 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.19.2.xml
@@ -3805,7 +3805,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3818,7 +3818,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3832,7 +3832,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.0.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.0.xml
index ce6f91bfe60..d8af989ddc0 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.0.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.0.xml
@@ -3969,7 +3969,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3982,7 +3982,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3996,7 +3996,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.1.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.1.xml
index fc056397c8e..7d64c5d5e90 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.1.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.1.xml
@@ -3969,7 +3969,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3982,7 +3982,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3996,7 +3996,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.2.xml b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.2.xml
index 36a2a4b158f..755820bf67b 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.2.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/hadoop_0.20.2.xml
@@ -3969,7 +3969,7 @@
       <param name="filename" type="java.lang.String"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param filename The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3982,7 +3982,7 @@
       <param name="file" type="java.io.File"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @return The unix pathname
  @throws IOException on windows, there can be problems with the subprocess]]>
@@ -3996,7 +3996,7 @@
       <param name="makeCanonicalPath" type="boolean"/>
       <exception name="IOException" type="java.io.IOException"/>
       <doc>
-      <![CDATA[Convert a os-native filename to a path that works for the shell.
+      <![CDATA[Convert an os-native filename to a path that works for the shell.
  @param file The filename to convert
  @param makeCanonicalPath 
           Whether to make canonical path for the file passed
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
index 2af0a7b9e74..2eb0e02cbde 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
@@ -649,7 +649,7 @@ public class FileUtil {
   }
 
   /**
-   * Convert a os-native filename to a path that works for the shell.
+   * Convert an os-native filename to a path that works for the shell.
    * @param filename The filename to convert
    * @return The unix pathname
    * @throws IOException on windows, there can be problems with the subprocess
@@ -659,7 +659,7 @@ public class FileUtil {
   }
 
   /**
-   * Convert a os-native filename to a path that works for the shell.
+   * Convert an os-native filename to a path that works for the shell.
    * @param file The filename to convert
    * @return The unix pathname
    * @throws IOException on windows, there can be problems with the subprocess
@@ -669,7 +669,7 @@ public class FileUtil {
   }
 
   /**
-   * Convert a os-native filename to a path that works for the shell
+   * Convert an os-native filename to a path that works for the shell
    * and avoids script injection attacks.
    * @param file The filename to convert
    * @return The unix pathname
@@ -685,7 +685,7 @@ public class FileUtil {
   }
 
   /**
-   * Convert a os-native filename to a path that works for the shell.
+   * Convert an os-native filename to a path that works for the shell.
    * @param file The filename to convert
    * @param makeCanonicalPath
    *          Whether to make canonical path for the file passed
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java
index 7209f926474..db275a0183b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ResourceCalculatorProcessTree.java
@@ -182,7 +182,7 @@ public abstract class ResourceCalculatorProcessTree extends Configured {
       }
     }
 
-    // No class given, try a os specific class
+    // No class given, try an os specific class
     if (ProcfsBasedProcessTree.isAvailable()) {
       return new ProcfsBasedProcessTree(pid);
     }