diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
index 3d1fd85..1635dde 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
@@ -110,11 +110,11 @@ public class PluginXdocGenerator
         {
             if ( request.getPluginDescriptor().getMojos() != null )
             {
-                for ( @SuppressWarnings( "unchecked" ) Iterator<MojoDescriptor> it =
-                          request.getPluginDescriptor().getMojos().iterator(); it.hasNext(); )
-                {
-                    MojoDescriptor descriptor = it.next();
+                @SuppressWarnings( "unchecked" )
+                List<MojoDescriptor> mojos = request.getPluginDescriptor().getMojos();
 
+                for ( MojoDescriptor descriptor : mojos )
+                {
                     processMojoDescriptor( descriptor, destinationDirectory );
                 }
             }
@@ -607,7 +607,18 @@ public class PluginXdocGenerator
                 w.startElement( "ul" );
                 addedUl = true;
             }
-            writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.expression" ), parameter.getExpression(), w );
+            String expression = parameter.getExpression();
+            if ( StringUtils.isNotEmpty( expression ) && expression.startsWith( "${" ) && expression.endsWith( "}" )
+                && !expression.substring( 2 ).contains( "${" ) )
+            {
+                // expression="${xxx}" -> property="xxx"
+                String property = expression.substring( 2, expression.length() - 1 );
+                writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.property" ), property, w );
+            }
+            else
+            {
+                writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.expression" ), parameter.getExpression(), w );
+            }
 
             if ( !addedUl && StringUtils.isNotEmpty( parameter.getDefaultValue() ) )
             {
diff --git a/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties b/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
index c905b67..e496230 100644
--- a/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
+++ b/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
@@ -49,6 +49,7 @@ pluginxdoc.mojodescriptor.parameter.type=Type
 pluginxdoc.mojodescriptor.parameter.since=Since
 pluginxdoc.mojodescriptor.parameter.required=Required
 pluginxdoc.mojodescriptor.parameter.expression=Expression
+pluginxdoc.mojodescriptor.parameter.property=User Property
 pluginxdoc.mojodescriptor.parameter.default=Default
 pluginxdoc.mojodescriptor.parameter.defaultValue=<strong>Default value is</strong>: <code>{0}</code>.
 pluginxdoc.mojodescriptor.requiredParameters=Required Parameters
diff --git a/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties b/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
index bd5725f..d73482d 100644
--- a/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
+++ b/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
@@ -48,6 +48,7 @@ pluginxdoc.mojodescriptor.parameter.type=Type
 pluginxdoc.mojodescriptor.parameter.since=Depuis
 pluginxdoc.mojodescriptor.parameter.required=Exig\u00e9
 pluginxdoc.mojodescriptor.parameter.expression=Expression
+pluginxdoc.mojodescriptor.parameter.property=Propri\u00e9t\u00e9 utilisateur
 pluginxdoc.mojodescriptor.parameter.default=D\u00e9faut
 pluginxdoc.mojodescriptor.parameter.defaultValue=<strong>Valeur par d\u00e9faut est</strong> : <code>{0}</code>.
 pluginxdoc.mojodescriptor.requiredParameters=Param\u00e8tres requis