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

[da...@apache.org]

Author: daijy
Date: Thu Mar 29 19:06:23 2012
New Revision: 1307060

URL: http://svn.apache.org/viewvc?rev=1307060&view=rev
Log:
PIG-2621: Documentation inaccurate regarding Pig Properties in trunk

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=1307060&r1=1307059&r2=1307060&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Mar 29 19:06:23 2012
@@ -463,6 +463,8 @@ Release 0.9.3 - Unreleased
 
 BUG FIXES
 
+PIG-2621: Documentation inaccurate regarding Pig Properties in trunk (prkommireddi via daijy)
+
 PIG-2550: Custom tuple results in "Unexpected datatype 110 while reading tuplefrom binary file" while spilling (daijy)
 
 PIG-2442: Multiple Stores in pig streaming causes infinite waiting (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=1307060&r1=1307059&r2=1307060&view=diff
==============================================================================
--- pig/trunk/src/docs/src/documentation/content/xdocs/start.xml (original)
+++ pig/trunk/src/docs/src/documentation/content/xdocs/start.xml Thu Mar 29 19:06:23 2012
@@ -409,7 +409,7 @@ However, in a production environment you
 	<li>The <a href="cmds.html#set">set</a> command (set pig.exec.nocombiner true)</li>
 </ul>
 <p><strong>Note:</strong> The properties file uses standard Java property file format.</p>
-<p>The following precedence order is supported: pig.properties &gt; -D Pig property &gt; -P properties file &gt; set command. This means that if the same property is provided using the –D command line option as well as the –P command line option and a properties file, the value of the property in the properties file will take precedence.</p>
+<p>The following precedence order is supported: pig.properties &lt; -D Pig property &lt; -P properties file &lt; set command. This means that if the same property is provided using the –D command line option as well as the –P command line option (properties file), the value of the property in the properties file will take precedence.</p>
 
 <p id="hadoop-properties">To specify Hadoop properties you can use the same mechanisms:</p>
 <ul>
@@ -419,7 +419,7 @@ However, in a production environment you
 	<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 configuration files &gt; -D Hadoop property &gt; -P properties_file &gt; set command.</p>
+<p>The same precedence holds: Hadoop configuration files &lt; -D Hadoop property &lt; -P properties_file &lt; 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>