Skip to content

Commit f5c5fc9

Browse files
ottlingermichael-o
authored andcommitted
Fix typos in history.apt and faq.fml
1 parent 64c4035 commit f5c5fc9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/site/apt/history.apt

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Maven Site Plugin History
3434
Maven Site Plugin uses:
3535

3636
* {{{/doxia/}Doxia}} to parse {{{/doxia/references/}many markup languages}} then render HTML: see
37-
{{{./examples/creating-content.html}Creating Content}} documentation for mode details (particularly which markups
37+
{{{./examples/creating-content.html}Creating Content}} documentation for more details (particularly which markups
3838
are enabled by default in maven-site-plugin and how to add one),
3939

4040
* {{{/doxia/doxia-sitetools/doxia-site-renderer/}Doxia Sitetools - Site Renderer}} to integrate document content into
@@ -52,15 +52,15 @@ Maven Site Plugin History
5252

5353
Given this layered approach, rendering issues reported to {{{https://issues.apache.org/jira/projects/MSITE}MSITE Maven Site Plugin issue tracker}}
5454
are often translated to {{{https://issues.apache.org/jira/projects/DOXIA}Doxia}} or
55-
{{{https://issues.apache.org/jira/projects/DOXIASITETOOLS}Doxia Sitetools}}, and issues fixed in
56-
Doxia or Doxia Sitetools benefit to maven-site-plugin once dependency is upgraded.
55+
{{{https://issues.apache.org/jira/projects/DOXIASITETOOLS}Doxia Sitetools}} issues. Any issues fixed in
56+
Doxia or Doxia Sitetools are inherited to the maven-site-plugin once its dependency is updated.
5757

5858
Knowing which version of
5959
maven-site-plugin uses which version of Doxia or Doxia Sitetools is useful to choose to which version to upgrade
6060
maven-site-plugin to benefit from a fix: this is the basis for the {{{./migrate.html}simplified migration guide}}.
6161

6262
*-----------------*--------------------*--------*------------------*--------------------*---*-------*---------------*
63-
|| relelease date || maven-site-plugin || {{{/doxia/}Doxia}} || {{{/doxia/doxia-sitetools/}Doxia Sitetools}} || {{{/shared/maven-reporting-exec/}Maven Reporting Executor}} || minimum Java || minimum Maven || Comment
63+
|| release date || maven-site-plugin || {{{/doxia/}Doxia}} || {{{/doxia/doxia-sitetools/}Doxia Sitetools}} || {{{/shared/maven-reporting-exec/}Maven Reporting Executor}} || minimum Java || minimum Maven || Comment
6464
*-----------------*--------------------*--------*------------------*--------------------*---*-------*---------------*
6565
| 2024-07 | 4.0.0-M16 | | |
6666
*-----------------*--------------------*--------*------------------*--------------------*---*-------*---------------*

src/site/fml/faq.fml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ under the License.
2929
<dt><code>mvn site</code></dt>
3030
<dd>
3131
Calls the <i>site</i> <b>phase</b> of the site <b>lifecycle</b>.
32-
Full site lifecycle consists in the following life cycle phases: <code>pre-site</code>, <code>site</code>, <code>post-site</code> and <code>site-deploy</code>.
32+
Full site lifecycle consists of the following life cycle phases: <code>pre-site</code>, <code>site</code>, <code>post-site</code> and <code>site-deploy</code>.
3333
See <a href="/guides/introduction/introduction-to-the-lifecycle.html#Lifecycle_Reference">Lifecycle Reference</a>.
3434
Then it calls plugin goals associated to <code>pre-site</code> and <code>site</code> phases.</dd>
3535
<dt><code>mvn site:site</code></dt>
@@ -38,8 +38,8 @@ under the License.
3838
</dl>
3939
</answer>
4040
</faq>
41-
<faq id="How do I Integrate static (X)HTML pages into my Maven site">
42-
<question>How do I Integrate static (X)HTML pages into my Maven site?</question>
41+
<faq id="How do I integrate static (X)HTML pages into my Maven site">
42+
<question>How do I integrate static (X)HTML pages into my Maven site?</question>
4343
<answer>
4444
<p>
4545
You can integrate your static pages by following these steps:

0 commit comments

Comments
 (0)