From cc5030f493a1ba0d6668955e3371d09316c06134 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 13 Oct 2003 13:18:08 +0000
Subject: [PATCH] Mention <import> in the FAQ

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275450 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/faq.html | 22 ++++++++++++++++++++++
 xdocs/faq.xml | 25 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/docs/faq.html b/docs/faq.html
index db66a77ab..f8185e162 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1109,6 +1109,28 @@ while(&lt;STDIN&gt;) {
    &lt;!ENTITY include SYSTEM &quot;file:./header.xml&quot;&gt;
 ]&gt;
 </pre>
+                        <p>Starting with Ant 1.6, there is a new
+        <code>&lt;import&gt;</code> task that can (also) be used to
+        include build file fragments.  Unlike the snippets used with
+        entity includes, the referenced files have to be complete Ant
+        build files, though.</p>
+                        <p>The example above would become:</p>
+                        <pre class="code">
+&lt;?xml version=&quot;1.0&quot;?&gt;
+&lt;project name=&quot;test&quot; default=&quot;test&quot; basedir=&quot;.&quot;&gt;
+
+  &lt;target name=&quot;setup&quot;&gt;
+    ...
+  &lt;/target&gt;
+
+  &lt;import file=&quot;../common.xml&quot;/&gt;
+
+  ...
+
+&lt;/project&gt;
+</pre>
+                        <p>Unlike entity includes, <code>&lt;import&gt;</code> will
+        let you use Ant properties in the file name.</p>
                     <p class="faq">
       <a name="mail-logger"></a>
       How do I send an email with the result of my build
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index a23ea03cd..107447fa9 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -845,6 +845,31 @@ while(<STDIN>) {
    <!ENTITY include SYSTEM "file:./header.xml">
 ]>
 ]]></source>
+
+        <p>Starting with Ant 1.6, there is a new
+        <code>&lt;import&gt;</code> task that can (also) be used to
+        include build file fragments.  Unlike the snippets used with
+        entity includes, the referenced files have to be complete Ant
+        build files, though.</p>
+
+        <p>The example above would become:</p>
+        <source><![CDATA[
+<?xml version="1.0"?>
+<project name="test" default="test" basedir=".">
+
+  <target name="setup">
+    ...
+  </target>
+
+  <import file="../common.xml"/>
+
+  ...
+
+</project>
+]]></source>
+
+        <p>Unlike entity includes, <code>&lt;import&gt;</code> will
+        let you use Ant properties in the file name.</p>
       </answer>
     </faq>