PIG-4945: Update document for conflicting macro params
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1752998 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 838b3ce..a8a12ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -46,7 +46,21 @@
PIG-4916: Pig on Tez fail to remove temporary HDFS files in some cases (daijy)
-Release 0.16.0 - Unreleased
+Release 0.16.1 - Unreleased
+
+INCOMPATIBLE CHANGES
+
+IMPROVEMENTS
+
+PIG-4945: Update document for conflicting macro params (knoguchi via daijy)
+
+OPTIMIZATIONS
+
+BUG FIXES
+
+PIG-4949: Fix registering jar in S3 which was broken by PIG-4417 in Pig 0.16 (yangyishan0901m via daijy)
+
+Release 0.16.0
INCOMPATIBLE CHANGES
@@ -161,8 +175,6 @@
BUG FIXES
-PIG-4949: Fix registering jar in S3 which was broken by PIG-4417 in Pig 0.16 (yangyishan0901m via daijy)
-
PIG-4821: Pig chararray field with special UTF-8 chars as part of tuple join key produces wrong results in Tez (rohini)
PIG-4734: TOMAP schema inferring breaks some scripts in type checking for bincond (daijy)
diff --git a/src/docs/src/documentation/content/xdocs/cont.xml b/src/docs/src/documentation/content/xdocs/cont.xml
index 029c4b2..62627fe 100644
--- a/src/docs/src/documentation/content/xdocs/cont.xml
+++ b/src/docs/src/documentation/content/xdocs/cont.xml
@@ -1388,7 +1388,7 @@
</li>
</ul>
<p></p>
- <p>Parameter substitution may be used inside of macros, but it is the responsibility of the user to ensure that there are no conflicts between names of parameters defined at the top level and names of arguments or return values for a macro. A simple way to ensure this is to use ALL_CAPS for top-level parameters and lower_case for macro-level parameters. See <a href="#define-macros">DEFINE (macros)</a>.</p>
+ <p>Parameter substitution may be used inside of macros. When there are conflicts between names of parameters defined at the top level and names of arguments or return values for a given macro, then ones inside the macro are used. See <a href="#define-macros">DEFINE (macros)</a>.</p>
</section>
<section>
