diff --git a/docs/manual/CoreTasks/macrodef.html b/docs/manual/CoreTasks/macrodef.html
index 545ba3600..17b826a88 100644
--- a/docs/manual/CoreTasks/macrodef.html
+++ b/docs/manual/CoreTasks/macrodef.html
@@ -3,6 +3,7 @@
   <head>
     <meta http-equiv="Content-Language" content="en-us"></meta>
     <title>MacroDef Task</title>
+    <link rel="stylesheet" type="text/css" href="../stylesheets/antmanual.css">
     <style type="text/css">
       <!--
            .code { background: #EFEFEF; margin-top: }
@@ -188,6 +189,54 @@
         <td valign="top" align="center">No</td>
       </tr>
     </table>
+    <h4>text</h4>
+    <p>
+      This is used to specify the treatment of text contents of the macrodef.
+      If this element is not present, then any nested text in the macro
+      will be an error. If the text element is present, then the name
+      becomes an attribute that gets set to the nested text of the macro.
+      <em>Since ant 1.6.1.</em>
+    </p>
+    <p>
+      The case of the text name is ignored.
+    </p>
+    <h3>Parameters</h3>
+    <table border="1" cellpadding="2" cellspacing="0">
+      <tr>
+        <td valign="top"><b>Attribute</b></td>
+        <td valign="top"><b>Description</b></td>
+        <td align="center" valign="top"><b>Required</b></td>
+      </tr>
+      <tr>
+        <td valign="top">name</td>
+        <td valign="top">The name of the text attribute</td>
+        <td valign="top" align="center">Yes</td>
+      </tr>
+      <tr>
+        <td valign="top">optional</td>
+        <td valign="top">
+          If true nested text in the macro is optional, default is "false".
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+      <tr>
+        <td valign="top">trim</td>
+        <td valign="top">
+          If true, the nested text is trimmed of white space,
+          default is "false".
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+      <tr>
+        <td valign="top">description</td>
+        <td valign="top">
+          This contains a description
+          informing the user what the nested text of the macro is expected
+          to be.
+        </td>
+        <td valign="top" align="center">No</td>
+      </tr>
+    </table>
 
     <h3>Examples</h3>
     <p>
@@ -290,9 +339,10 @@
 &lt;/macrodef/&gt;
 &lt;test one="test"/&gt;
 </pre>
+>>>>>>> 1.14
     </blockquote>
 <hr>
-<p align="center">Copyright &copy; 2003-2004 Apache Software
+<p align="center">Copyright &copy; 2003-2004 The Apache Software
 Foundation. All rights Reserved.</p>
 
 </body>
