This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
The following commit(s) were added to refs/heads/master by this push:
new ecd62ed Try to unbreak CI (#28)
ecd62ed is described below
commit ecd62ed94b6e9445237e780171edff8f437a4895
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Sat Dec 30 13:14:44 2023 +0000
Try to unbreak CI (#28)
* run-on sentence\
* remove book renderer vestiges
* failonerror=False
* simplify language
---
content/apt/book/index.apt | 9 +++------
content/apt/doxia-tools/index.apt | 2 --
content/resources/.htaccess | 1 -
content/resources/components.links | 4 ----
content/resources/doxia-tools/components.links | 4 ----
pom.xml | 2 +-
6 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/content/apt/book/index.apt b/content/apt/book/index.apt
index 98c3c58..0fe35ae 100644
--- a/content/apt/book/index.apt
+++ b/content/apt/book/index.apt
@@ -29,8 +29,7 @@
Introduction
- Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. Combined with the
- Doxia Book Maven you are able to include the manuals directly in your
generated site with links to the off-line
+ Doxia allows you to write books like user manuals and guides in any format
supported by Doxia. You can include the manuals directly in your generated site
with links to the off-line
friendly formats like XDoc, PDF, RTF and LaTeX.
The Xdoc output which has been rendered into this site can be viewed
{{{../doxia-example-book/index.html}here}}.
@@ -40,14 +39,12 @@ Introduction
* How It Works
- The only thing you need in addition to the content files itself is a simple
book descriptor which is used to specify
+ The only thing you need in addition to the content files is a simple book
descriptor which specifies
the ordering of the sections and the names for the chapters.
- See {{{../doxia-tools/doxia-book-renderer/book.html}The Book Descriptor
Reference}} for a reference to the descriptor.
-
* Creating a Book Descriptor
- An XML file is used to describe the layout of the book.
+ An XML file describes the layout of the book.
A sample is given below:
diff --git a/content/apt/doxia-tools/index.apt
b/content/apt/doxia-tools/index.apt
index 97b4a85..e07a513 100644
--- a/content/apt/doxia-tools/index.apt
+++ b/content/apt/doxia-tools/index.apt
@@ -39,5 +39,3 @@ Available Doxia Tools
*--------------------------------------------------------------+--------------+------------+------------------+------------------------+--------------------+
| {{{./doxia-book-maven-plugin/} Doxia Book Maven Plugin}} | 1.2
| 2010-11-09 | Create books in different output formats. |
{{{https://gitbox.apache.org/repos/asf/maven-doxia-book-maven-plugin.git}Git}}
/ {{{https://github.com/apache/maven-doxia-book-maven-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/DOXIATOOLS}Jira DOXIATOOLS}}
*--------------------------------------------------------------+--------------+------------+------------------+------------------------+--------------------+
-| {{{./doxia-book-renderer/} Doxia Book Renderer}} | 1.2
| 2010-11-09 | |
{{{https://gitbox.apache.org/repos/asf/maven-doxia-book-renderer.git}Git}} /
{{{https://github.com/apache/maven-doxia-book-renderer/}GitHub}} |
{{{https://issues.apache.org/jira/browse/DOXIATOOLS}Jira DOXIATOOLS}}
-*--------------------------------------------------------------+--------------+------------+------------------+------------------------+--------------------+
diff --git a/content/resources/.htaccess b/content/resources/.htaccess
index 08cb365..7ceef2c 100644
--- a/content/resources/.htaccess
+++ b/content/resources/.htaccess
@@ -1,7 +1,6 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements; and to You under the Apache License, Version
2.0.
RedirectMatch permanent ^/doxia/doxia-1.2/(.*)$
/doxia/doxia-archives/doxia-1.2/$1
RedirectMatch permanent ^/doxia/doxia-sitetools-1.2
/doxia/doxia-sitetools-archives/doxia-sitetools-1.2/$1
-Redirect Permanent /doxia/doxia-ide/index.html /doxia/doxia-ide.html
# support resources pointed from /doxia/*-archives/
Redirect Permanent /doxia/images/apache-maven-project.png
/images/apache-maven-project.png
RedirectMatch permanent ^/doxia/.*-archives/images/(.*)$ /doxia/images/$1
diff --git a/content/resources/components.links
b/content/resources/components.links
index 993f4b9..0d4e641 100644
--- a/content/resources/components.links
+++ b/content/resources/components.links
@@ -3,8 +3,4 @@
# links property file for Ant's symlink task in pom.xml:
# links to components in https://maven.apache.org/doxia/components/
doxia=components/doxia
-doxia-archives=components/doxia-archives
-doxia-sitetools=components/doxia-sitetools
-doxia-sitetools-archives=components/doxia-sitetools-archives
-doxia-ide=components/doxia-ide
doxia-tools-archives=components/doxia-tools-archives
diff --git a/content/resources/doxia-tools/components.links
b/content/resources/doxia-tools/components.links
index e9a770f..fe807d0 100644
--- a/content/resources/doxia-tools/components.links
+++ b/content/resources/doxia-tools/components.links
@@ -2,7 +2,3 @@
# links property file for Ant's symlink task in pom.xml:
# links to components in https://maven.apache.org/doxia/components/
-doxia-converter=../components/doxia-tools/doxia-converter
-doxia-linkcheck=../components/doxia-tools/doxia-linkcheck
-doxia-book-maven-plugin=../components/doxia-tools/doxia-book-maven-plugin
-doxia-book-renderer=../components/doxia-tools/doxia-book-renderer
diff --git a/pom.xml b/pom.xml
index bef83b2..0286bf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,7 +315,7 @@ under the License.
</fileset>
</copy>
<!-- links to components directories containing releases
documentation: https://maven.apache.org/developers/website/ -->
- <symlink action="recreate" overwrite="true">
+ <symlink action="recreate" failonerror="false"
overwrite="true">
<fileset dir="${project.reporting.outputDirectory}"
includes="**/components.links" />
</symlink>
</target>
