From c83bf3257f065004fa939698792fb6c61e9768d1 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 11 May 2010 09:49:14 +0000
Subject: deal with read-only dest files in echo and concat.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@943068 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/CoreTasks/concat.html | 19 ++++++++++++++++++-
 docs/manual/CoreTasks/echo.html   |  6 ++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'docs/manual/CoreTasks')

diff --git a/docs/manual/CoreTasks/concat.html b/docs/manual/CoreTasks/concat.html
index a2c5646fd..ddc9549ee 100644
--- a/docs/manual/CoreTasks/concat.html
+++ b/docs/manual/CoreTasks/concat.html
@@ -83,12 +83,29 @@ Resource Collection</a>s are used to
           <td valign="top">
             Specifies whether or not the file specified by 'destfile'
             should be written to even if it is newer than all source files.
-            <em>since Ant 1.6</em>.
+            <strong>deprecated, use the overwrite attribute instead</strong>
+            Defaults to &quot;yes&quot;.
+          </td>
+          <td valign="top" align="center">No</td>
+        </tr>
+        <tr>
+          <td valign="top">overwrite</td>
+          <td valign="top">
+            Specifies whether or not the file specified by 'destfile'
+            should be written to even if it is newer than all source files.
+            <em>since Ant 1.8.2</em>.
             Defaults to &quot;yes&quot;.
           </td>
           <td valign="top" align="center">No</td>
         </tr>
 
+        <tr>
+          <td valign="top">forceReadOnly</td>
+          <td valign="top">Overwrite read-only destination
+            files.  <em>since Ant 1.8.2</em></td>
+          <td valign="top" align="center">No; defaults to false.</td>
+        </tr>
+
         <tr>
           <td valign="top">encoding</td>
           <td valign="top">
diff --git a/docs/manual/CoreTasks/echo.html b/docs/manual/CoreTasks/echo.html
index 833368f56..377ab7578 100644
--- a/docs/manual/CoreTasks/echo.html
+++ b/docs/manual/CoreTasks/echo.html
@@ -79,6 +79,12 @@ ignored</p>
     <td valign="top">encoding to use, default is ""; the local system encoding. <em>since Ant 1.7</em></td>
     <td valign="top" align="center">No</td>
   </tr>
+  <tr>
+    <td valign="top">force</td>
+    <td valign="top">Overwrite read-only destination
+      files.  <em>since Ant 1.8.2</em></td>
+    <td valign="top" align="center">No; defaults to false.</td>
+  </tr>
 </table>
 
 <h3>Examples</h3>
-- 
cgit v1.2.1