From 152f1b17c629b60c263e2c945dd23fb06950fd67 Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Tue, 28 Jan 2014 06:42:51 +0000
Subject: [PATCH] HADOOP-9830. Merging r1561951 from trunk to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561952 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 hadoop-project/src/site/apt/index.apt.vm        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7e5556bf004..03855e78231 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -365,6 +365,9 @@ Release 2.3.0 - UNRELEASED
     HADOOP-10212. Incorrect compile command in Native Library document.
     (Akira Ajisaka via Arpit Agarwal)
 
+    HADOOP-9830. Fix typo at http://hadoop.apache.org/docs/current/
+    (Kousuke Saruta via Arpit Agarwal)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/src/site/apt/index.apt.vm b/hadoop-project/src/site/apt/index.apt.vm
index aacae46da26..4167f4da720 100644
--- a/hadoop-project/src/site/apt/index.apt.vm
+++ b/hadoop-project/src/site/apt/index.apt.vm
@@ -45,7 +45,7 @@ Apache Hadoop ${project.version}
 
   The new ResourceManager manages the global assignment of compute resources to 
   applications and the per-application ApplicationMaster manages the 
-  application’s scheduling and coordination. 
+  application‚ scheduling and coordination. 
 
   An application is either a single job in the sense of classic MapReduce jobs 
   or a DAG of such jobs.