You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/09 22:17:05 UTC

[maven-site-plugin] branch MSITE-824 created (now 5b341a6)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MSITE-824
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git.


      at 5b341a6  [MSITE-824] Generate (X)HTML5 by default

This branch includes the following new commits:

     new 5b341a6  [MSITE-824] Generate (X)HTML5 by default

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[maven-site-plugin] 01/01: [MSITE-824] Generate (X)HTML5 by default

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSITE-824
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git

commit 5b341a6c6136bd6e1e73e0ecf1ee410144478da9
Author: minfrin <mi...@users.noreply.github.com>
AuthorDate: Sun May 13 20:04:04 2018 +0200

    [MSITE-824] Generate (X)HTML5 by default
    
    This closes #2
---
 pom.xml                                       | 7 +------
 src/site/apt/examples/creating-content.apt.vm | 9 +++++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 751310c..341d1d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,7 +337,7 @@ under the License.
 
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-core</artifactId>
+      <artifactId>doxia-module-xhtml5</artifactId>
       <version>${doxiaVersion}</version>
     </dependency>
     <dependency>
@@ -347,11 +347,6 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-module-xhtml5</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-module-apt</artifactId>
       <version>${doxiaVersion}</version>
       <scope>runtime</scope>
diff --git a/src/site/apt/examples/creating-content.apt.vm b/src/site/apt/examples/creating-content.apt.vm
index 5adf3b4..aca73e6 100644
--- a/src/site/apt/examples/creating-content.apt.vm
+++ b/src/site/apt/examples/creating-content.apt.vm
@@ -57,6 +57,9 @@ Creating Content
       +- xhtml/
       |  +- xhtml-too.xhtml
       |
+      +- xhtml5/
+      |  +- xhtml5-content.xhtml5
+      |
       +- site.xml
 --------------------
 
@@ -95,7 +98,7 @@ Creating Content
   {{{/doxia/references/index.html}Doxia Markup Languages}}),
   but in this case you need to add the corresponding Doxia dependency to your site plugin configuration, as
   explained in the last paragraph.
-  Note that Doxia also supports several output formats, the site plugin only creates XHTML.
+  Note that Doxia also supports several output formats, the site plugin only creates XHTML5.
 
   Note that all of the above is optional - just one index file is required in
   one of the input trees. The paths under each format will be merged together
@@ -113,6 +116,8 @@ Creating Content
       +- general.html
       +- faq.html
       +- other.html
+      +- xhtml-too.html
+      +- xhtml5-content.html
 --------------------
 
   This means that <<</src/site/apt/index.apt>>> will be available in the site as
@@ -144,7 +149,7 @@ Creating Content
             +- pic1.jpg
 --------------------
 
-  The file <<<site.css>>> will be added to the default XHTML output, so it can
+  The file <<<site.css>>> will be added to the default XHTML5 output, so it can
   be used to adjust the default Maven stylesheets if desired.
 
   The file <<<pic1.jpg>>> will be available via a relative reference to the