From 87b9690a66331a2de7b92b8ba73a8c2e44fa562f Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 13 Jun 2006 04:20:25 +0000
Subject: [PATCH] WiX task is no longer untested

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@413804 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/antlibs/dotnet/index.html | 11 ++++++++---
 docs/manual/CoreTasks/ant.html |  2 +-
 xdocs/antlibs/dotnet/index.xml | 16 +++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/docs/antlibs/dotnet/index.html b/docs/antlibs/dotnet/index.html
index 820550dc7..1ead62d24 100755
--- a/docs/antlibs/dotnet/index.html
+++ b/docs/antlibs/dotnet/index.html
@@ -124,9 +124,8 @@
       other platform.  Of course you can override these
       assumptions.</p>
                                 <p>Based on this a few tasks to run well known .NET utilities
-      from within Ant are provided, namely tasks to run <a href="http://www.nunit.org/">NUnit</a>, <a href="http://nant.sf.net/">NAnt</a> and <a href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&amp;SiteID=1">MSBuild</a>.</p>
-                                <p>There also is some experimental <a href="http://wix.sf.net/">Wix</a> task, but it probably doesn't
-      do anything useful at all.</p>
+      from within Ant are provided, namely tasks to run <a href="http://www.nunit.org/">NUnit</a>, <a href="http://nant.sf.net/">NAnt</a>, <a href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&amp;SiteID=1">MSBuild</a>
+      and the <a href="http://wix.sf.net/">Wix</a> toolkit.</p>
                         <h3 class="section">
       <a name="Tasks"></a>
       Tasks
@@ -153,6 +152,12 @@
       </h4>
                         <p>Invokes MSBuild, either on an external file or a build file
         snippet contained inside your Ant build file.</p>
+                                                          <h4 class="subsection">
+        <a name="wix"></a>
+        wix
+      </h4>
+                        <p>Invokes the candle and light executables of the WiX toolkit
+          in order to create MSI installers from within Ant.</p>
                                             <h3 class="section">
       <a name="Examples"></a>
       Examples
diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html
index 1edcd4949..7dd1bf950 100644
--- a/docs/manual/CoreTasks/ant.html
+++ b/docs/manual/CoreTasks/ant.html
@@ -280,4 +280,4 @@ new project using the id <code>path2</code>.</p>
 Reserved.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/xdocs/antlibs/dotnet/index.xml b/xdocs/antlibs/dotnet/index.xml
index 1eb9b5ef1..544420d21 100755
--- a/xdocs/antlibs/dotnet/index.xml
+++ b/xdocs/antlibs/dotnet/index.xml
@@ -41,12 +41,9 @@
       <p>Based on this a few tasks to run well known .NET utilities
       from within Ant are provided, namely tasks to run <a
       href="http://www.nunit.org/">NUnit</a>, <a
-      href="http://nant.sf.net/">NAnt</a> and <a
-      href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&amp;SiteID=1">MSBuild</a>.</p>
-
-      <p>There also is some experimental <a
-      href="http://wix.sf.net/">Wix</a> task, but it probably doesn't
-      do anything useful at all.</p>
+      href="http://nant.sf.net/">NAnt</a>, <a
+      href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&amp;SiteID=1">MSBuild</a>
+      and the <a href="http://wix.sf.net/">Wix</a> toolkit.</p>
     </section>
 
     <section name="Tasks">
@@ -67,6 +64,11 @@
         <p>Invokes MSBuild, either on an external file or a build file
         snippet contained inside your Ant build file.</p>
       </subsection>
+
+      <subsection name="wix">
+        <p>Invokes the candle and light executables of the WiX toolkit
+          in order to create MSI installers from within Ant.</p>
+      </subsection>
     </section>
 
     <section name="Examples">
@@ -143,4 +145,4 @@ Total time: 0 seconds
       </subsection>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>