Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 12615 invoked from network); 25 Nov 2010 19:02:03 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Nov 2010 19:02:03 -0000 Received: (qmail 11123 invoked by uid 500); 25 Nov 2010 19:02:03 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 11073 invoked by uid 500); 25 Nov 2010 19:02:03 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 11066 invoked by uid 99); 25 Nov 2010 19:02:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Nov 2010 19:02:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Nov 2010 19:02:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 36AA123889D7; Thu, 25 Nov 2010 19:00:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1039144 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/site/apt/examples/sitedescriptor.apt src/site/apt/index.apt Date: Thu, 25 Nov 2010 19:00:31 -0000 To: commits@maven.apache.org From: dennisl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101125190031.36AA123889D7@eris.apache.org> Author: dennisl Date: Thu Nov 25 19:00:30 2010 New Revision: 1039144 URL: http://svn.apache.org/viewvc?rev=1039144&view=rev Log: Merge site updates in r1039137 and r1039143 from trunk. Modified: maven/plugins/branches/maven-site-plugin-3.x/ (props changed) maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt Propchange: maven/plugins/branches/maven-site-plugin-3.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 25 19:00:30 2010 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476 +/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143 Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt?rev=1039144&r1=1039143&r2=1039144&view=diff ============================================================================== --- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt Thu Nov 25 19:00:30 2010 @@ -42,7 +42,7 @@ Configuring the Site Descriptor The format is nearly the same, so you can probably reuse most of your old file. There is an - {{{http://maven.apache.org/doxia/doxia-sitetools-1.0.x/doxia-decoration-model/decoration.html}XML Schema Reference for the site descriptor}} + {{{http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/decoration.html}XML Schema Reference for the site descriptor}} available. The XML Schema for the site descriptor is published at {{http://maven.apache.org/xsd/decoration-1.0.0.xsd}}. Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt?rev=1039144&r1=1039143&r2=1039144&view=diff ============================================================================== --- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt Thu Nov 25 19:00:30 2010 @@ -3,7 +3,7 @@ ------ Maria Odea Ching ------ - 2009-03-08 + 2010-11-25 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -61,7 +61,7 @@ Maven Site Plugin * {{{./jar-mojo.html}site:jar}} bundles the site output into a JAR so that it can be deployed to a repository. - * {{{./effective-site-mojo.html}site:effective-site}} calculates effective site descriptor, after inheritance and + * {{{./effective-site-mojo.html}site:effective-site}} calculates the effective site descriptor, after inheritance and interpolation. * Usage