Return-Path: 
 <common-commits-return-19101-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6F972D146
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Wed, 19 Sep 2012 17:32:59 +0000 (UTC)
Received: (qmail 29396 invoked by uid 500); 19 Sep 2012 17:32:59 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 29153 invoked by uid 500); 19 Sep 2012 17:32:57 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 29140 invoked by uid 99); 19 Sep 2012 17:32:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Sep 2012 17:32:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Sep 2012 17:32:56 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 7A7D823888E3
	for <common-commits@hadoop.apache.org>; Wed, 19 Sep 2012 17:32:13 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1387687 - in /hadoop/common/branches/branch-0.23:
 BUILDING.txt
 hadoop-project/src/site/site.xml
Date: Wed, 19 Sep 2012 17:32:13 -0000
To: common-commits@hadoop.apache.org
From: bobby@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120919173213.7A7D823888E3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bobby
Date: Wed Sep 19 17:32:12 2012
New Revision: 1387687

URL: http://svn.apache.org/viewvc?rev=1387687&view=rev
Log:
svn merge -c 1330427 FIXES: MAPREDUCE-4193. broken doc link for yarn-default.xml in site.xml. Contributed by Patrick Hunt.

Modified:
    hadoop/common/branches/branch-0.23/BUILDING.txt
    hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml

Modified: hadoop/common/branches/branch-0.23/BUILDING.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/BUILDING.txt?rev=1387687&r1=1387686&r2=1387687&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/BUILDING.txt (original)
+++ hadoop/common/branches/branch-0.23/BUILDING.txt Wed Sep 19 17:32:12 2012
@@ -87,4 +87,8 @@ Create source and binary distributions w
 
   $ mvn package -Pdist,native,docs,src -DskipTests -Dtar
 
+Create a local staging version of the website (in /tmp/hadoop-site)
+
+  $ mvn clean site; mvn site:stage -DstagingDirectory=/tmp/hadoop-site
+
 ----------------------------------------------------------------------------------

Modified: hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml?rev=1387687&r1=1387686&r2=1387687&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml Wed Sep 19 17:32:12 2012
@@ -94,7 +94,7 @@
     <menu name="Configuration" inherit="top">
       <item name="core-default.xml" href="hadoop-project-dist/hadoop-common/core-default.xml"/>
       <item name="hdfs-default.xml" href="hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>
-      <item name="yarn-default.xml" href="hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml"/>
+      <item name="yarn-default.xml" href="hadoop-yarn/hadoop-yarn-common/yarn-default.xml"/>
       <item name="mapred-default.xml" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/>
       <item name="Deprecated Properties" href="hadoop-project-dist/hadoop-common/DeprecatedProperties.html"/>
     </menu>