svn commit: r1241582 - in /pig/trunk: CHANGES.txt src/docs/src/documentation/content/xdocs/start.xml

[da...@apache.org]

Author: daijy
Date: Tue Feb  7 19:50:41 2012
New Revision: 1241582

URL: http://svn.apache.org/viewvc?rev=1241582&view=rev
Log:
PIG-2491: Pig docs still mention hadoop-site.xml

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/docs/src/documentation/content/xdocs/start.xml

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1241582&r1=1241581&r2=1241582&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Feb  7 19:50:41 2012
@@ -90,6 +90,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-2491: Pig docs still mention hadoop-site.xml (daijy)
+
 PIG-2504: Incorrect sample provided for REGEX_EXTRACT (prkommireddi via daijy)
 
 PIG-2502: Make "hcat.bin" configurable in e2e test (daijy)

Modified: pig/trunk/src/docs/src/documentation/content/xdocs/start.xml
URL: http://svn.apache.org/viewvc/pig/trunk/src/docs/src/documentation/content/xdocs/start.xml?rev=1241582&r1=1241581&r2=1241582&view=diff
==============================================================================
--- pig/trunk/src/docs/src/documentation/content/xdocs/start.xml (original)
+++ pig/trunk/src/docs/src/documentation/content/xdocs/start.xml Tue Feb  7 19:50:41 2012
@@ -413,13 +413,13 @@ However, in a production environment you
 
 <p id="hadoop-properties">To specify Hadoop properties you can use the same mechanisms:</p>
 <ul>
-	<li>The hadoop-site.xml file (add the directory that contains the hadoop-site.xml file to the classpath)</li>
+	<li>Hadoop configuration files (include pig-cluster-hadoop-site.xml)</li>
 	<li>The -D command line option and a Hadoop property (pig –Dmapreduce.task.profile=true) </li>
 	<li>The -P command line option and a property file (pig -P property_file)</li>
 	<li>The <a href="cmds.html#set">set</a> command (set mapred.map.tasks.speculative.execution false)</li>
 </ul>
 <p></p>
-<p>The same precedence holds: hadoop-site.xml &gt; -D Hadoop property &gt; -P properties_file &gt; set command.</p>
+<p>The same precedence holds: Hadoop configuration files &gt; -D Hadoop property &gt; -P properties_file &gt; set command.</p>
 <p>Hadoop properties are not interpreted by Pig but are passed directly to Hadoop. Any Hadoop property can be passed this way. </p>
 <p>All properties that Pig collects, including Hadoop properties, are available to any UDF via the UDFContext object. To get access to the properties, you can call the getJobConf method.</p>
 </section>