Vincent,

I don't think this is correct. When we fix the site plugin so that pages are only conditionally treated as velocity templates, this will then show \} in the output, I think.

The fix needs to be made in the site plugin.

Cheers,
Brett

On 25/05/2007, at 8:25 AM, [EMAIL PROTECTED] wrote:

Author: vsiveton
Date: Thu May 24 15:25:55 2007
New Revision: 541459

URL: http://svn.apache.org/viewvc?view=rev&rev=541459
Log:
o fixed a Velocity ParseErrorException for ${..}
o added new header

Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-bash-m2- completion.apt
    maven/site/trunk/src/site/apt/release-notes.apt

Modified: maven/site/trunk/src/site/apt/guides/mini/guide-bash-m2- completion.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/ guides/mini/guide-bash-m2-completion.apt? view=diff&rev=541459&r1=541458&r2=541459 ====================================================================== ======== --- maven/site/trunk/src/site/apt/guides/mini/guide-bash-m2- completion.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-bash-m2- completion.apt Thu May 24 15:25:55 2007
@@ -6,16 +6,36 @@
  ------
  12 October 2005
  ------
-
-Guide to Maven 2.x auto completion using BASH
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~   http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Guide to Maven 2.x auto completion using BASH

First you must go to the following site to install the BASH programmable auto completion setup if your distro doesn't have it by default. I don't think many do so you'll need to go {{{http://www.caliban.org/bash/ index.shtml#completion}here}}.
-
+
Once you've setup your system for auto completion you need to take the
  following:
-
+
 +----+

 #!/bin/bash
@@ -35,7 +55,7 @@
   local cur goals

   COMPREPLY=()
-  cur=${COMP_WORDS[COMP_CWORD]}
+  cur=${ COMP_WORDS[COMP_CWORD]}
   goals='clean compile test install package deploy site'
   goals=$goals _m2_make_goals "eclipse" "eclipse"
   goals=$goals _m2_make_goals "idea" "idea"

Modified: maven/site/trunk/src/site/apt/release-notes.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/ release-notes.apt?view=diff&rev=541459&r1=541458&r2=541459 ====================================================================== ========
--- maven/site/trunk/src/site/apt/release-notes.apt (original)
+++ maven/site/trunk/src/site/apt/release-notes.apt Thu May 24 15:25:55 2007
@@ -7,6 +7,26 @@
 18 October 2005
  ------

+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~   http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
 Release Notes - Maven 2.0.6

The Apache Maven team would like to announce the release of Maven 2.0.6.
@@ -33,19 +53,19 @@

The full list of changes can be found {{{http:// jira.codehaus.org/secure/IssueNavigator.jspa? reset=true&&pid=10500&fixfor=13010&sorter/field=issuekey&sorter/ order=DESC}
   here}}, and is reproduced below.
-
+
 ** Changes that may affect existing builds

- * {{{http://jira.codehaus.org/browse/MNG-1577} MNG-1577}} - Maven will now only obey the dependendencyManagment element in the POM and + * {{{http://jira.codehaus.org/browse/MNG-1577} MNG-1577}} - Maven will now only obey the dependendencyManagment element in the POM and will align all transitive dependencies to versions specified in the dependencyManagement. To detect any problems that you might have you can refer to these {{{http://maven.apache.org/plugins/ maven-dependency-plugin/examples/preparing-dependencies.html} notes}} to
       prepare for the upgrade.
-
+
 ** Bug

* [MNG-1577] - dependencyManagement does not work for transitive dependencies

-    * [MNG-2339] - ${project.*} are interpreted in the wrong place
+    * [MNG-2339] - $\{project.*\} are interpreted in the wrong place

     * [MNG-2362] - Deployed POM is not valid XML

@@ -69,18 +89,18 @@

* [MNG-2897] - Make sure that Xpp3Dom is shared from the core to plugins

- * [MNG-2899] - In cases where ${version} is used in depMan we get null versions in attached artifacts + * [MNG-2899] - In cases where $\{version\} is used in depMan we get null versions in attached artifacts

* [MNG-2900] - Extensions that have no declared dependency on plexus-utils yet need it at runtime will fail.

 ** Improvement

     * [MNG-2252] - Upgrade to plexus-utils 1.3
-
+
* [MNG-2823] - More control over what WARNING messages are displayed
-
+
* [MNG-2828] - Upgrade the dependency on plexus-utils to a more recent version
-
+
* [MNG-2892] - Use shade to hide the use of plexus-utils internally so that plugins can use their own version


@@ -238,86 +258,86 @@
 ** Improvement

* [MNG-830] - review plugins use of expression and change to default-value/component where appropriate
-
+
* [MNG-1299] - Document m1 xdocs compatibility with the m2 site plug-in
-
+
     * [MNG-1508] - Need a process-test-classes phase
-
+
     * [MNG-1540] - ability to categorise guides in the maven site
-
+
* [MNG-1560] - Guide to accessing repository with https client authentication
-
+
* [MNG-1929] - Plugin Goal report should indicate which fields are read only. (Patch Attached)
-
+
* [MNG-1952] - Give equal footing to all m2 plugins and add Cargo plugin to the list
-
+
* [MNG-1997] - document xsd support for pom and settings in guides
-
+
* [MNG-2129] - generated source repo page is misleading when added to the "general site".
-
+
     * [MNG-2153] - Updated resource bundles for pl and en locales
-
-    * [MNG-2213] - Current settings.xml example incorrect
-
+
+    * [MNG-2213] - Current settings.xml example incorrect
+
* [MNG-2246] - mojo developer guide takes a shortcut at explaining fully how the command line can be shortened
-
+
* [MNG-2250] - fix misspelled and added missing words in getting started guide and philosphy of maven
-
+
     * [MNG-2251] - Upgrade to plexus-utils 1.2
-
+
     * [MNG-2306] - mojo javadoc annotations support for IntelliJ Idea
-
+
     * [MNG-2311] - site plugin i18n HU
-
+
* [MNG-2324] - Add a getWagon(Repository) method to the WagonManager
-
+
* [MNG-2346] - FAQ: Why does maven compile my test classes but does not run them?
-
+
     * [MNG-2355] - Documentation of the @component javadoc tag
-
+
     * [MNG-2357] - misc cleanup
-
+
* [MNG-2375] - Generate docs for mojo goals should list whehter or not each parameter is read-only
-
+
     * [MNG-2379] - review and link to free Maven courseware
-
+
     * [MNG-2474] - missing jar files in javax repository
-
+
* [MNG-2494] - Plugin development guide should have link to test harness plugin
-
+
* [MNG-2638] - Please add Developpez.com Maven FAQ to articles (french)

 ** New Feature
-
+
     * [MNG-2169] - Want to contribute: Contributing Maven 2 refcard
-
+
* [MNG-2293] - maven-plugin-descriptor: Not possible to define a default implementation for a field defined by its interface
-
+
     * [MNG-2454] - add @since to mojo at class level

 ** Task
-
+
     * [MNG-1059] - update mojo API documentation
-
+
* [MNG-1069] - Verify the embedder is using the same strategy for locating the local repo as the CLI
-
+
     * [MNG-1213] - more info on the plugin summary
-
+
     * [MNG-1325] - Document ibiblio synchronization process
-
+
     * [MNG-2117] - Update doap file descriptor
-
+
     * [MNG-2300] - broken links on  http://maven.apache.org/plugins/
-
+
     * [MNG-2393] - documentation of -U on CLI usage help is incorrect


 ** Wish
-
+
     * [MNG-1731] - I18n issues with report generation
-
+
* [MNG-1880] - Add new pre and post phases to the integration- test phase
-
+
* [MNG-2361] - Document pomRefId attribute for M2 ant tasks on M2 website.

 * 2.0.4 Release Notes
@@ -330,7 +350,7 @@

* <<MNG-2196>> - Fails when parent module is not located a level above

- * <<MNG-2207>> - Infinite Recursion when POM element has value with substring that is self-referencing + * <<MNG-2207>> - Infinite Recursion when POM element has value with substring that is self-referencing

     []

@@ -383,7 +403,7 @@

* <<MNG-2078>> - Fixup super pom to activate the profile only when -DperformRelease=true.

- * <<MNG-2083>> - Path to missing dependency is not shown nor url to download + * <<MNG-2083>> - Path to missing dependency is not shown nor url to download

     * <<MNG-2087>> - NPE in PluginXdocGenerator

@@ -531,7 +551,7 @@

* <<MNG-1630>> - Optional tag in dependencyManagement is not inherited in the children projects

- * <<MNG-1642>> - Incorrect APT markup applied to the Title of the guide-releasing.apt + * <<MNG-1642>> - Incorrect APT markup applied to the Title of the guide-releasing.apt

     * <<MNG-1646>> - Optional tag in project dependency doesn't work



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to