svn commit: r1150409 - /maven/plugins/branches/maven-site-plugin-2.x/src/site/fml/faq.fml

[de...@apache.org]

Author: dennisl
Date: Sun Jul 24 15:27:36 2011
New Revision: 1150409

URL: http://svn.apache.org/viewvc?rev=1150409&view=rev
Log:
Merge over changes from trunk.

Modified:
    maven/plugins/branches/maven-site-plugin-2.x/src/site/fml/faq.fml

Modified: maven/plugins/branches/maven-site-plugin-2.x/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/site/fml/faq.fml?rev=1150409&r1=1150408&r2=1150409&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-2.x/src/site/fml/faq.fml (original)
+++ maven/plugins/branches/maven-site-plugin-2.x/src/site/fml/faq.fml Sun Jul 24 15:27:36 2011
@@ -84,7 +84,7 @@ under the License.
       <question>How can I validate my xdoc/fml source files?</question>
       <answer>
         <p>
-          Since version 2.1.1 of the site plugin, there is a <code>validate</code>
+          Since version 2.1.1 of the Site Plugin, there is a <code>validate</code>
           configuration parameter that switches on xml validation (default is off).
           Note that in the current implementation of the parser used by Doxia,
           validation requires an independent parsing run, so that every source
@@ -171,10 +171,10 @@ under the License.
       <answer>
         <p>
           Yes. Entity resolution has been added in Doxia version 1.1, available
-          in site plugin 2.1 and later.
+          in Site Plugin 2.1 and later.
         </p>
         <p>
-          There is a catch however. In the current implementation (as of site-plugin-2.1.1),
+          There is a catch however. In the current implementation (as of maven-site-plugin-2.1.1),
           entities are only resolved by an independent
           <a href="#Can_I_validate_xml">validation</a> run.
           Therefore, if you want to use entities, you <strong>have</strong> to switch on