Author: hboutemy
Date: Mon Dec 28 17:26:07 2015
New Revision: 1721955
URL: http://svn.apache.org/viewvc?rev=1721955&view=rev
Log:
added FML macros (just discovered it was supported...)
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq-macro.fml
(with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt?rev=1721955&r1=1721954&r2=1721955&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/index.apt
Mon Dec 28 17:26:07 2015
@@ -38,7 +38,7 @@ Doxia Formats
*--------------------+-------------------------------------------------------+-----------------------------------+
| Apt | {{{./index.html} <<<apt/*.apt>>>}} |
{{{./apt-macro.html} macro}} |
*--------------------+-------------------------------------------------------+-----------------------------------+
-| FML | {{{./faq.html} <<<fml/*.fml>>>}} |
|
+| FML | {{{./faq.html} <<<fml/*.fml>>>}} |
{{{./faq-macro.html} macro}} |
*--------------------+-------------------------------------------------------+-----------------------------------+
| Markdown | {{{./markdown.html} <<<markdown/*.md>>>}} |
{{{./markdown-macro.html} macro}} |
*--------------------+-------------------------------------------------------+-----------------------------------+
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq-macro.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq-macro.fml?rev=1721955&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq-macro.fml
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq-macro.fml
Mon Dec 28 17:26:07 2015
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+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.
+-->
+
+<faqs xmlns="http://maven.apache.org/FML/1.0.1";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0.1
http://maven.apache.org/xsd/fml-1.0.1.xsd";
+ title="Macros in FML">
+
+ <part id="Macros in FML">
+ <title>Macros in FML</title>
+
+ <!-- START SNIPPET: macros -->
+ <faq id="TOC">
+ <question>Is TOC Macro supported?</question>
+ <answer>
+ <macro name="toc">
+ </macro>
+ </answer>
+ </faq>
+
+ <faq id="echo">
+ <question>Is Echo Macro supported?</question>
+ <answer>
+ <macro name="echo">
+ <param name="param1" value="value1"/>
+ <param name="param2" value="value2"/>
+ </macro>
+ </answer>
+ </faq>
+
+ <faq id="snippet">
+ <question>Is Snippet Macro supported?</question>
+ <answer>
+ <macro name="snippet">
+ <param name="id" value="macros"/>
+ <param name="file" value="src/site/fml/faq-macro.fml"/>
+ </macro>
+ </answer>
+ </faq>
+ <!-- END SNIPPET: macros -->
+ </part>
+
+</faqs>
+
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq-macro.fml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq-macro.fml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml?rev=1721955&r1=1721954&r2=1721955&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/fml/faq.fml
Mon Dec 28 17:26:07 2015
@@ -18,9 +18,8 @@ specific language governing permissions
under the License.
-->
-<faqs xmlns="http://maven.apache.org/FML/1.0.1";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.1.xsd"
+<faqs xmlns="http://maven.apache.org/FML/1.0.1";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0.1
http://maven.apache.org/xsd/fml-1.0.1.xsd";
title="Oft Asked Questions">
<part id="contributing">
@@ -34,7 +33,7 @@ under the License.
A paragraph with a <a href="#Using_Maven">local link</a>,
a link to another <a href="./cdc.html">source document</a>,
an <a href="http://maven.apache.org/?l=a&m=b";>external link</a>
- with entities, an <i>italic</i> text and <b>non-US-ASCII characters:
àéèç</b>.
+ with entities, an <i>italic</i> text and <b>non-US-ASCII characters:
����</b>.
</p>
</answer>
</faq>
