You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/12/30 12:05:40 UTC
(maven-doxia-site) branch DOXIA-703 updated (5126f58 -> 22174b4)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
discard 5126f58 simplify language
discard 0f02e33 one more
discard ff6cf46 doxia-archives
discard 5adf277 doxia-sitetools
discard 07087ff last one
discard 9648c61 spotless
discard 2973ac8 failonerror=False
discard 5e2f721 doxia-linkcheck
discard 6284efb remove book renderer vestiges
discard 2ece00f revert
discard d544efd revert
discard 70b8a05 Revert "run-on sentence"
discard 9d9c96b remove reference to deleted page
discard b5ced88 Update apt-format.apt
discard aa51988 run-on sentence
add 3764390 Fix dependabot config
new 7f58e38 run-on sentence
new f25a4f7 Update apt-format.apt
new 9eca57c remove reference to deleted page
new b0c87d5 Revert "run-on sentence"
new 792403f revert
new 27f5a31 revert
new e902933 remove book renderer vestiges
new f88501f doxia-linkcheck
new 1216e32 failonerror=False
new 4714978 spotless
new 86fdb9d last one
new f27f1ed doxia-sitetools
new ac4e656 doxia-archives
new 65b2e27 one more
new 22174b4 simplify language
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5126f58)
\
N -- N -- N refs/heads/DOXIA-703 (22174b4)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 15 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:
.github/dependabot.yml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
(maven-doxia-site) 01/15: run-on sentence
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 7f58e385512af2a88236fcaf1e12a8aa4bb3ce9c
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Mon Nov 14 07:26:55 2022 -0500
run-on sentence
@olamy
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt b/content/apt/references/apt-format.apt
index 521321c..bfac8fd 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -41,7 +41,7 @@ The APT format
The information contained in this document corresponds to the original
APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
- format, see this separate {{{./doxia-apt.html}document}}
+ format. See this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
with a {{{./doxia-apt.html}\[Change\]}} link.
(maven-doxia-site) 02/15: Update apt-format.apt
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit f25a4f78056e6e7e8341bcac053f675a7c0d79fb
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Mon Feb 6 10:52:56 2023 -0500
Update apt-format.apt
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt b/content/apt/references/apt-format.apt
index bfac8fd..2b72f67 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -39,7 +39,7 @@ The APT format
* Important Notice
The information contained in this document corresponds to the original
- APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
+ APT format as published by {{{https://www.xmlmind.com/}XMLmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
format. See this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
(maven-doxia-site) 11/15: last one
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 86fdb9d2a0572e4997f79ca73b20c18e06b7f8ca
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 08:09:27 2023 -0400
last one
---
content/resources/doxia-tools/components.links | 1 -
1 file changed, 1 deletion(-)
diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links
index f051184..fe807d0 100644
--- a/content/resources/doxia-tools/components.links
+++ b/content/resources/doxia-tools/components.links
@@ -2,4 +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
(maven-doxia-site) 12/15: doxia-sitetools
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit f27f1edc741cf61b79582f49d1fbb1fea8b96857
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 08:56:35 2023 -0400
doxia-sitetools
---
content/resources/components.links | 1 -
1 file changed, 1 deletion(-)
diff --git a/content/resources/components.links b/content/resources/components.links
index 8cbdef2..efc9603 100644
--- a/content/resources/components.links
+++ b/content/resources/components.links
@@ -4,6 +4,5 @@
# 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-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 03/15: remove reference to deleted page
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 9eca57c15c10ab688f169a4f4fc4bdb237dc2c09
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 07:30:29 2023 -0400
remove reference to deleted page
---
content/resources/.htaccess | 1 -
content/resources/components.links | 1 -
2 files changed, 2 deletions(-)
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..8cbdef2 100644
--- a/content/resources/components.links
+++ b/content/resources/components.links
@@ -6,5 +6,4 @@ 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
(maven-doxia-site) 13/15: doxia-archives
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit ac4e6560efa6f08d643ff83454fdbe243793162b
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 09:04:31 2023 -0400
doxia-archives
---
content/resources/components.links | 1 -
1 file changed, 1 deletion(-)
diff --git a/content/resources/components.links b/content/resources/components.links
index efc9603..4e841ae 100644
--- a/content/resources/components.links
+++ b/content/resources/components.links
@@ -3,6 +3,5 @@
# 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-archives=components/doxia-sitetools-archives
doxia-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 15/15: simplify language
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 22174b44ebe5dfbb59f48ae3a386207706995f78
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Thu Jun 8 07:01:42 2023 -0400
simplify language
---
content/apt/book/index.apt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/content/apt/book/index.apt b/content/apt/book/index.apt
index f07141f..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,12 +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.
* 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:
(maven-doxia-site) 05/15: revert
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 792403f302cf47817bd62583ba9d75db5f105914
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 07:32:49 2023 -0400
revert
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt b/content/apt/references/apt-format.apt
index a86bfdd..1f65b81 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -39,7 +39,7 @@ The APT format
* Important Notice
The information contained in this document corresponds to the original
- APT format as published by {{{https://www.xmlmind.com/}XMLmind}}.
+ APT format as published by {{{http://www.xmlmind.com/}XMLmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
(maven-doxia-site) 04/15: Revert "run-on sentence"
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit b0c87d5eaeee96caee1dd3fd9d850ee4563bf9e7
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 07:32:00 2023 -0400
Revert "run-on sentence"
This reverts commit 2778eb76c5d1d371efa03aa4b1ecf753a50bc6b6.
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt b/content/apt/references/apt-format.apt
index 2b72f67..a86bfdd 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -41,7 +41,7 @@ The APT format
The information contained in this document corresponds to the original
APT format as published by {{{https://www.xmlmind.com/}XMLmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
- format. See this separate {{{./doxia-apt.html}document}}
+ format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
with a {{{./doxia-apt.html}\[Change\]}} link.
(maven-doxia-site) 06/15: revert
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 27f5a31ed1fe771e53b54ec63b56e66e85bf28e1
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 07:33:24 2023 -0400
revert
---
content/apt/references/apt-format.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/references/apt-format.apt b/content/apt/references/apt-format.apt
index 1f65b81..521321c 100644
--- a/content/apt/references/apt-format.apt
+++ b/content/apt/references/apt-format.apt
@@ -39,7 +39,7 @@ The APT format
* Important Notice
The information contained in this document corresponds to the original
- APT format as published by {{{http://www.xmlmind.com/}XMLmind}}.
+ APT format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
In version 1.1 Maven Doxia has applied several modifications to this original
format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
(maven-doxia-site) 09/15: failonerror=False
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 1216e320af87329461dcd9907404ce1094f03a81
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 08:01:17 2023 -0400
failonerror=False
---
content/resources/doxia-tools/components.links | 1 -
pom.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links
index 149b767..f051184 100644
--- a/content/resources/doxia-tools/components.links
+++ b/content/resources/doxia-tools/components.links
@@ -3,4 +3,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-book-maven-plugin=../components/doxia-tools/doxia-book-maven-plugin
diff --git a/pom.xml b/pom.xml
index bef83b2..78dfa82 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" overwrite="true" failonerror="false">
<fileset dir="${project.reporting.outputDirectory}" includes="**/components.links" />
</symlink>
</target>
(maven-doxia-site) 10/15: spotless
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 471497816acaab3cfbc4df1b63c527304b8b05bd
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 08:04:37 2023 -0400
spotless
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 78dfa82..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" failonerror="false">
+ <symlink action="recreate" failonerror="false" overwrite="true">
<fileset dir="${project.reporting.outputDirectory}" includes="**/components.links" />
</symlink>
</target>
(maven-doxia-site) 14/15: one more
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit 65b2e27d6b0f3c5ba23241bf1fa1ae4fefe5bd2b
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 09:12:24 2023 -0400
one more
---
content/resources/components.links | 1 -
1 file changed, 1 deletion(-)
diff --git a/content/resources/components.links b/content/resources/components.links
index 4e841ae..0d4e641 100644
--- a/content/resources/components.links
+++ b/content/resources/components.links
@@ -3,5 +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-sitetools-archives=components/doxia-sitetools-archives
doxia-tools-archives=components/doxia-tools-archives
(maven-doxia-site) 08/15: doxia-linkcheck
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit f88501fa7f7eae7f60510ab6e991f88ec0f79018
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 07:53:19 2023 -0400
doxia-linkcheck
---
content/resources/doxia-tools/components.links | 1 -
1 file changed, 1 deletion(-)
diff --git a/content/resources/doxia-tools/components.links b/content/resources/doxia-tools/components.links
index 6a2741c..149b767 100644
--- a/content/resources/doxia-tools/components.links
+++ b/content/resources/doxia-tools/components.links
@@ -3,5 +3,4 @@
# 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
(maven-doxia-site) 07/15: remove book renderer vestiges
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-703
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git
commit e9029332fb0e32be9b3b6d99729bdcac6dabf7dd
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Apr 23 07:43:37 2023 -0400
remove book renderer vestiges
---
content/apt/book/index.apt | 2 --
content/apt/doxia-tools/index.apt | 2 --
content/resources/doxia-tools/components.links | 1 -
3 files changed, 5 deletions(-)
diff --git a/content/apt/book/index.apt b/content/apt/book/index.apt
index 98c3c58..f07141f 100644
--- a/content/apt/book/index.apt
+++ b/content/apt/book/index.apt
@@ -43,8 +43,6 @@ Introduction
The only thing you need in addition to the content files itself is a simple book descriptor which is used to specify
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.
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/doxia-tools/components.links b/content/resources/doxia-tools/components.links
index e9a770f..6a2741c 100644
--- a/content/resources/doxia-tools/components.links
+++ b/content/resources/doxia-tools/components.links
@@ -5,4 +5,3 @@
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