You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2010/08/12 22:48:33 UTC

svn commit: r984960 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt

Author: dennisl
Date: Thu Aug 12 20:48:33 2010
New Revision: 984960

URL: http://svn.apache.org/viewvc?rev=984960&view=rev
Log:
o Clarify how site descriptor inheritance works.

Modified:
    maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt

Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=984960&r1=984959&r2=984960&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Thu Aug 12 20:48:33 2010
@@ -6,7 +6,7 @@
  Maria Odea Ching
  Dennis Lundberg
  ------
- 2009-03-08
+ 2010-08-12
  ------
 
  ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -147,8 +147,14 @@ Configuring the Site Descriptor
 
 * Inheritance
 
-  Site descriptors are inherited along the same lines as project descriptors are. When you deploy a project, its site
-  descriptor is also deployed so that it can be inherited.
+  Site descriptors are inherited along the same lines as project descriptors
+  are. If you want your project's site descriptor to be inherited, you need to
+  attach it to the project's main artifact. You use the
+  <<<site:attach-descriptor>>> goal to attach the site descriptor to your
+  project's main artifact.
+
+  In Maven 2 the site descriptor is attached automatically for projects with
+  packaging set to "pom".
 
   By default, only the basic settings are inherited. From the body, <<only>>
   the links are inherited, and these accumulate to contain all the parents'