You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2024/12/12 16:13:03 UTC
(maven-doxia-site) branch master updated (8e1018c -> fd5b1f2)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
from 8e1018c Fix link to Plexus
new 2e94fb2 Update to m-site-p 3.21.0
new fd5b1f2 Workaround for DOXIA-764
The 2 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.
Summary of changes:
content/fml/faq.fml | 18 ++++++------------
content/xdoc/overview.xml | 9 +++------
pom.xml | 4 +++-
3 files changed, 12 insertions(+), 19 deletions(-)
(maven-doxia-site) 01/02: Update to m-site-p 3.21.0
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 2e94fb29ad21a73a1dd8b8d88bcea7d18a563863
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Dec 11 23:11:18 2024 +0100
Update to m-site-p 3.21.0
Leverage Doxia 2.0.0 and Fluido Skin 2.0.1
---
pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 07608c4..d589ce8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,9 @@ under the License.
<properties>
<maven.site.path>doxia-site</maven.site.path>
- <doxiaVersion>1.12.0</doxiaVersion>
+ <version.maven-fluido-skin>2.0.1</version.maven-fluido-skin>
+ <version.maven-site-plugin>3.21.0</version.maven-site-plugin>
+ <doxiaVersion>2.0.0</doxiaVersion>
<site.output>${project.build.directory}/site</site.output>
</properties>
(maven-doxia-site) 02/02: Workaround for DOXIA-764
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit fd5b1f232629bf5e3dcbe0960da8faad9dfe1ea4
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Dec 12 14:36:04 2024 +0100
Workaround for DOXIA-764
Remove newlines directly following <source> tags
---
content/fml/faq.fml | 18 ++++++------------
content/xdoc/overview.xml | 9 +++------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/content/fml/faq.fml b/content/fml/faq.fml
index 8904459..1dfba22 100644
--- a/content/fml/faq.fml
+++ b/content/fml/faq.fml
@@ -99,33 +99,28 @@ under the License.
<p>
Your favorite IDE probably supports XSD schema's for Xdoc and FML files. You need to
specify the following:
- <source>
-<document xmlns="http://maven.apache.org/XDOC/2.0"
+ <source><document xmlns="http://maven.apache.org/XDOC/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
...
</document></source>
- <source>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1"
+ <source><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">
...
</faqs></source>
- <source>
-<book xmlns="http://maven.apache.org/BOOK/1.0.0"
+ <source><book xmlns="http://maven.apache.org/BOOK/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/BOOK/1.0.0 http://maven.apache.org/xsd/book-1.0.0.xsd">
...
</book></source>
- <source>
-<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
+ <source><document xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 http://maven.apache.org/xsd/document-1.0.1.xsd"
outputName="...">
...
</document></source>
- <source>
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ <source><project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
...
@@ -145,8 +140,7 @@ under the License.
</p>
<p>
For instance, you could add the following in your Xdoc XML files to be similar to XHTML 1.0 Transitional dtd:
- <source>
-<!DOCTYPE document [
+ <source><!DOCTYPE document [
<!-- These are the entity sets for ISO Latin 1 characters for the XHTML -->
<!ENTITY % HTMLlat1 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
%HTMLlat1;
diff --git a/content/xdoc/overview.xml b/content/xdoc/overview.xml
index b3a0416..71c494e 100644
--- a/content/xdoc/overview.xml
+++ b/content/xdoc/overview.xml
@@ -77,15 +77,13 @@ under the License.
<p>
For instance, you could do things like:
</p>
- <source>
-sink.paragraph();
+ <source>sink.paragraph();
sink.text( "my text" );
sink.paragraph_(); </source>
<p>
similar to this HTML markup:
</p>
- <source>
-<p>my text</p></source>
+ <source><p>my text</p></source>
<p>To find out more about the Sink API, you could read the Javadoc
<a class="externalLink"
href="http://maven.apache.org/doxia/doxia/doxia-sink-api/apidocs/org/apache/maven/doxia/sink/Sink.html">here</a>.
@@ -97,8 +95,7 @@ sink.paragraph_(); </source>
The <i>Core</i> is the API to parse a source and populate it in a <i>Sink</i>
object. The <i>Parser</i> interface contains only one method:
</p>
- <source>
-void parse( Reader source, Sink sink )
+ <source>void parse( Reader source, Sink sink )
throws ParseException; </source>
<p>
The <i>ParseException</i> class has the responsibility to catch all parsing