From ed078ecda91382f48d6fb54411de95601e90a234 Mon Sep 17 00:00:00 2001
From: snicoll <snicoll@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 17 Apr 2006 15:32:57 +0000
Subject: [PATCH] MPWAR-29: Fixed confusing documentation regarding
 maven.war.classes.includes and maven.war.classes.excludes properties

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@394708 13f79535-47bb-0310-9956-ffa450edef68
---
 war/plugin.properties    | 2 +-
 war/xdocs/changes.xml    | 1 +
 war/xdocs/properties.xml | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/war/plugin.properties b/war/plugin.properties
index 09e65447..f76cdffb 100644
--- a/war/plugin.properties
+++ b/war/plugin.properties
@@ -35,7 +35,7 @@ maven.war.src.excludes=
 maven.war.webxml=${maven.war.src}/WEB-INF/web.xml
 
 # Classes to include and exclude from WEB-INF/classes
-# Note: Classes are relative to build.dir
+# Note: Classes are relative to maven.build.dest
 maven.war.classes.includes=**
 maven.war.classes.excludes=**/package.html
 
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 7b425621..6fc2863f 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.6.2-SNAPSHOT" date="in SVN">
+      <action dev="snicoll" type="fix" issue="MPWAR-29">Fixed confusing documentation regarding maven.war.classes.includes and excludes properties</action>
       <action dev="snicoll" type="fix" issue="MPWAR-32">License file is now added properly to the generated war</action>
       <action dev="brett" type="fix">Remove reference to unused caller tag library to suppress warning</action>
       <action dev="aheritier" type="update" issue="MPWAR-50">Add support for EJB client code.</action>
diff --git a/war/xdocs/properties.xml b/war/xdocs/properties.xml
index a9a6d06b..0cea9d3c 100644
--- a/war/xdocs/properties.xml
+++ b/war/xdocs/properties.xml
@@ -73,7 +73,7 @@
           <td>
             Classes to include from WEB-INF/classes
             Note: Classes are relative to 
-            <code>${maven.build.dir}</code>.
+            <code>${maven.build.dest}</code>.
           </td>
         </tr>
         <tr>
@@ -82,7 +82,7 @@
           <td>
             Classes to exclude from WEB-INF/classes
             Note: Classes are relative to 
-            <code>${maven.build.dir}</code>.
+            <code>${maven.build.dest}</code>.
           </td>
         </tr>
         <tr>