You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/15 17:12:01 UTC

git commit: [MNG-3106] improved documentation: all conditions must be satisfied

Repository: maven
Updated Branches:
  refs/heads/master fadf9be36 -> 8801b0003


[MNG-3106] improved documentation: all conditions must be satisfied

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8801b000
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8801b000
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8801b000

Branch: refs/heads/master
Commit: 8801b00034829401a3f49fe8b0332caa6e81a0b5
Parents: fadf9be
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Jun 15 17:11:58 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Jun 15 17:11:58 2014 +0200

----------------------------------------------------------------------
 maven-model/src/main/mdo/maven.mdo | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/8801b000/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 393d5e1..3504cc7 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -3115,7 +3115,9 @@
       <name>Activation</name>
       <version>4.0.0+</version>
       <description>The conditions within the build runtime environment which will trigger the
-        automatic inclusion of the build profile.</description>
+        automatic inclusion of the build profile. Multiple conditions can be defined, which must
+        be all satisfied to activate the profile.
+      </description>
       <fields>
         <field>
           <name>activeByDefault</name>