This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new ef51b643 directories, not folders
ef51b643 is described below
commit ef51b6439e527e3e0d2d43c63c84c136754ecacd
Author: Michael Osipov <[email protected]>
AuthorDate: Wed Mar 8 14:57:39 2023 +0100
directories, not folders
---
.../deploy-component-reference-documentation.apt | 2 +-
.../apt/guides/mini/guide-3rd-party-jars-local.apt | 2 +-
content/apt/guides/mini/guide-encryption.apt | 2 +-
content/apt/guides/mini/guide-releasing.apt | 2 +-
content/apt/plugin-developers/common-bugs.apt | 2 +-
content/apt/plugins/index.apt | 12 +++---
content/apt/plugins/localization.apt | 10 ++---
content/markdown/docs/3.3.1/release-notes.md | 46 +++++++++++-----------
content/markdown/docs/3.3.9/release-notes.md | 40 +++++++++----------
content/markdown/faq-unoffical.md | 6 +--
content/markdown/install.md.vm | 2 +-
content/markdown/maven-jsr330.md | 2 +-
content/markdown/security-plexus-archiver.md | 2 +-
content/markdown/security.md | 2 +-
content/resources/xsd/maven-v3_0_0.xsd | 2 +-
15 files changed, 67 insertions(+), 67 deletions(-)
diff --git
a/content/apt/developers/website/deploy-component-reference-documentation.apt
b/content/apt/developers/website/deploy-component-reference-documentation.apt
index 2ada4474..58d15fda 100644
---
a/content/apt/developers/website/deploy-component-reference-documentation.apt
+++
b/content/apt/developers/website/deploy-component-reference-documentation.apt
@@ -65,7 +65,7 @@ How components reference documentation publication works
[[0]] prerequisite: eventually build the component if it has not been done
previously, or some reports may miss build or integration information:
- Notice: In cases where you have prepared a release you can simple change into
<<<target/checkout>>> folder and continue with 2.
+ Notice: In cases where you have prepared a release you can simple change into
<<<target/checkout>>> directory and continue with 2.
------------
mvn -Prun-its install
diff --git a/content/apt/guides/mini/guide-3rd-party-jars-local.apt
b/content/apt/guides/mini/guide-3rd-party-jars-local.apt
index 4c424769..87009255 100644
--- a/content/apt/guides/mini/guide-3rd-party-jars-local.apt
+++ b/content/apt/guides/mini/guide-3rd-party-jars-local.apt
@@ -50,7 +50,7 @@ mvn install:install-file -Dfile=<path-to-file>
-DpomFile=<path-to-pomfile>
----
With version 2.5 of the maven-install-plugin, it can get even simpler: if the
JAR was built by Apache Maven, it'll contain a
- pom.xml in a subfolder of the META-INF/ directory, which will be read by
default. In that case, all you need to do is:
+ pom.xml in a subdirectory of the META-INF/ directory, which will be read by
default. In that case, all you need to do is:
----
mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file
-Dfile=<path-to-file>
diff --git a/content/apt/guides/mini/guide-encryption.apt
b/content/apt/guides/mini/guide-encryption.apt
index 91fdd3e9..3b655fc9 100644
--- a/content/apt/guides/mini/guide-encryption.apt
+++ b/content/apt/guides/mini/guide-encryption.apt
@@ -54,7 +54,7 @@
The implemented solution adds the following capabilities:
- * authorized users have an additional <<<settings-security.xml>>> file in
their <<<$\{user.home\}/.m2>>> folder
+ * authorized users have an additional <<<settings-security.xml>>> file in
their <<<$\{user.home\}/.m2>>> directory
** this file either contains encrypted <<master password>>, used to
encrypt other passwords
diff --git a/content/apt/guides/mini/guide-releasing.apt
b/content/apt/guides/mini/guide-releasing.apt
index 478005de..b2961fa1 100644
--- a/content/apt/guides/mini/guide-releasing.apt
+++ b/content/apt/guides/mini/guide-releasing.apt
@@ -170,7 +170,7 @@ mvn release:prepare \
* <<A Desired SCM provider tag name>>.
This is a SCM provider specific value, in the case of the Subversion SCM
provider this value
- is equal to the folder name that will appear under the URL provided by the
the tagBase parameter.
+ is equal to the directory name that will appear under the URL provided by
the the tagBase parameter.
* <<A Desired project release version>>.
diff --git a/content/apt/plugin-developers/common-bugs.apt
b/content/apt/plugin-developers/common-bugs.apt
index 2d9101e7..c0594891 100644
--- a/content/apt/plugin-developers/common-bugs.apt
+++ b/content/apt/plugin-developers/common-bugs.apt
@@ -329,7 +329,7 @@ public MyMojo extends AbstractMojo
[[b]] Embedded Maven Invocations
Other tools, most notably IDEs, that run Maven under the hood may have
set the current working directory to
- their installation folder or whatever they like.
+ their installation directory or whatever they like.
[[c]] Maven Invocations using the <<<-f>>> Switch
diff --git a/content/apt/plugins/index.apt b/content/apt/plugins/index.apt
index d4a09810..e6786ee5 100644
--- a/content/apt/plugins/index.apt
+++ b/content/apt/plugins/index.apt
@@ -50,7 +50,7 @@ Available Plugins
* Supported By The Maven Project
To see the most up-to-date list browse the Maven repository, specifically
- the {{{https://repo.maven.apache.org/maven2/org/apache/maven/plugins/}
<<<org/apache/maven/plugins>>>}} subfolder.
+ the {{{https://repo.maven.apache.org/maven2/org/apache/maven/plugins/}
<<<org/apache/maven/plugins>>>}} subdirectory.
<(Plugins are organized according to a directory structure that resembles
the standard Java package naming convention)>
~~ TODO: the repository manager should be able to produce a page like this.
Ensure all descriptions are in the POM of these plugins.
@@ -183,15 +183,15 @@ Available Plugins
\* <<B>>uild or <<R>>eporting plugin
There are also some sandbox plugins into our
{{{https://svn.apache.org/repos/asf/maven/sandbox/trunk/plugins}source
repository}}.
-
- Previous archived versions of plugins reference documentations are
{{{../plugins-archives/}located here}}.
+
+ Previous archived versions of plugins reference documentations are
{{{../plugins-archives/}located here}}.
* Retired
*--------------------------------------------------------------+------------+--------------+-------------------+------------------+
|| <<Plugin>> || <<Type*>> ||
<<Version>> || <<Retired Date>> || <<Description>>
*--------------------------------------------------------------+------------+--------------+-------------------+------------------+
-| {{{/plugins/maven-ant-plugin/} <<<ant>>>}} | B |
2.4 | 2019-06-02 | Generate an Ant build file for the project.
+| {{{/plugins/maven-ant-plugin/} <<<ant>>>}} | B |
2.4 | 2019-06-02 | Generate an Ant build file for the project.
*--------------------------------------------------------------+------------+--------------+-------------------+------------------+
| {{{/plugins/maven-eclipse-plugin/} <<<eclipse>>>}} | B |
2.10 | 2015-10-07 | Generate an Eclipse project files for the
current project.
*--------------------------------------------------------------+------------+--------------+-------------------+------------------+
@@ -208,7 +208,7 @@ Available Plugins
** At MojoHaus (formerly known as {codehaus.org})
- There are also {{{https://www.mojohaus.org/plugins.html}many plug-ins}}
available at
+ There are also {{{https://www.mojohaus.org/plugins.html}many plug-ins}}
available at
the {{{https://github.com/mojohaus} MojoHaus}} project at GitHub.
Here are a few common ones:
@@ -218,7 +218,7 @@ Available Plugins
*---------------------------------------------------------------------------------+----------------------------------+
| {{{https://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/}
<<<animal-sniffer>>>}}| Build signatures of APIs (JDK for example) and checks
your classes against them.
*---------------------------------------------------------------------------------+----------------------------------+
-| {{{https://www.mojohaus.org/build-helper-maven-plugin/} <<<build-helper>>>}}
| Attach extra artifacts and source folders to build.
+| {{{https://www.mojohaus.org/build-helper-maven-plugin/} <<<build-helper>>>}}
| Attach extra artifacts and source directories to build.
*---------------------------------------------------------------------------------+----------------------------------+
| {{{https://www.mojohaus.org/buildplan-maven-plugin/} <<<buildplan>>>}}
| Inspect the lifecycle of your build.
*---------------------------------------------------------------------------------+----------------------------------+
diff --git a/content/apt/plugins/localization.apt
b/content/apt/plugins/localization.apt
index b73b4342..e3e0ae94 100644
--- a/content/apt/plugins/localization.apt
+++ b/content/apt/plugins/localization.apt
@@ -85,7 +85,7 @@ Localization of Plugins
* Check out the source code for the plugin you want to add a translation to.
* Find the resource bundles that needs to be translated. They are often found
- in the <<<src/main/resources>>> folder.
+ in the <<<src/main/resources>>> directory.
* Copy the basefile for the bundle, i.e. the one <<without>> a language
extension. The copy should have the same name as the original file, except
@@ -122,7 +122,7 @@ Localization of Plugins
</plugins>
</build>
+-----
-
+
* Run "mvn site" on that project to test it.
* When you are happy with your translation, create an issue in JIRA for the
@@ -131,7 +131,7 @@ Localization of Plugins
* Create a patch file that contains your new translation. Use the issue
number
when you name the file:
-
+
------
svn diff > MYISSUE-123.patch
------
@@ -156,7 +156,7 @@ native2ascii checkstyle-report_es.properties
checkstyle-report_es-encoded.proper
** Tools to find out the charset of a file
* Unix <<<file>>> command
-
+
* {{{http://cpdetector.sourceforge.net/}cpdetector}}
* {{{http://plugins.intellij.net/plugin/?id=24}IntelliJ IDEA
ShowEncodingPlugin}}
@@ -172,7 +172,7 @@ native2ascii checkstyle-report_es.properties
checkstyle-report_es-encoded.proper
** Tools to convert a file from one encoding to another encoding
* Unix <<<iconv>>> command
-
+
* Notepad++
[]
diff --git a/content/markdown/docs/3.3.1/release-notes.md
b/content/markdown/docs/3.3.1/release-notes.md
index eb464c1f..717c62e0 100644
--- a/content/markdown/docs/3.3.1/release-notes.md
+++ b/content/markdown/docs/3.3.1/release-notes.md
@@ -1,6 +1,6 @@
# Release Notes – Maven 3.3.1
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -24,7 +24,7 @@
## Overview
-The Apache Maven team would like to announce the release of Maven Version
3.3.1. The new
+The Apache Maven team would like to announce the release of Maven Version
3.3.1. The new
Maven Version is [available for download][0].
Maven is a software project management and comprehension tool. Based on the
concept of a project object model
@@ -54,14 +54,14 @@ The new [Maven 3.3.1 Release is just
out](http://mail-archives.apache.org/mod_mb
### Toolchains
-* In our days it becomes more and more important to be able to use different
JDK
+* In our days it becomes more and more important to be able to use different
JDK
to be used by Maven itself and which is used to compile/test your production
code.
- This concept is know under the name [Toolchains][0] which is unfortunately
not very
+ This concept is know under the name [Toolchains][0] which is unfortunately
not very
well-known.
-* The handling of the [`toolchains.xml`][MNG-3891] file has been adjusted with
the
+* The handling of the [`toolchains.xml`][MNG-3891] file has been adjusted with
the
handling of `settings.xml` which means it will be searched within the
- `${maven.home}/conf/` folder and furthermore within the `${user.home}/.m2/`
folder.
+ `${maven.home}/conf/` directory and furthermore within the
`${user.home}/.m2/` directory.
* For a better understanding and as an example of the `toolchains.xml` file
has been added
to the [Maven distribution][MNG-5745].
@@ -74,19 +74,19 @@ The new [Maven 3.3.1 Release is just
out](http://mail-archives.apache.org/mod_mb
### Core Extensions
-* Core Extension mechanism has [been improved][MNG-5771] to make
+* Core Extension mechanism has [been improved][MNG-5771] to make
it simpler to use.
* The old way (up to Maven 3.2.5) was to create a jar (must be shaded if you
have other dependencies)
- which contains the extension and put it manually into the
`${MAVEN_HOME}/lib/ext` folder.
- This means you had to change the Maven installation. The consequence was
that everyone who likes
- to use this needed to change it's installation and makes the on-boarding for
a developer much
- more inconvenient. The other option was to give the path to the jar on
command line via
+ which contains the extension and put it manually into the
`${MAVEN_HOME}/lib/ext` directory.
+ This means you had to change the Maven installation. The consequence was
that everyone who likes
+ to use this needed to change it's installation and makes the on-boarding for
a developer much
+ more inconvenient. The other option was to give the path to the jar on
command line via
`mvn -Dmaven.ext.class.path=extension.jar`. This has the drawback giving
those
options to your Maven build every time you are calling Maven. Not very
convenient as well.
-
-* From now on this can be done much more simpler and in a more Maven like way.
So
- you can define an `${maven.projectBasedir}/.mvn/extensions.xml` file which
looks
+
+* From now on this can be done much more simpler and in a more Maven like way.
So
+ you can define an `${maven.projectBasedir}/.mvn/extensions.xml` file which
looks
like the following:
``` xml
@@ -126,11 +126,11 @@ The new [Maven 3.3.1 Release is just
out](http://mail-archives.apache.org/mod_mb
configuration options for the command line. For example things like `-T3 -U
--fail-at-end`. So you only have to call maven just by using `mvn clean
package` instead of `mvn -T3 -U --fail-at-end clean package` and not to miss
- the `-T3 -U --fail-at-end` options. The
`${maven.projectBasedir}/.mvn/maven.config`
- is located in the `${maven.projectBasedir}/.mvn/` folder which is in the
root
- of a multi module build. This folder is part of the project and will be
checked
- in into your version control. This results in being picked by everybody who
- checks out the project and no need to remember to call this project
+ the `-T3 -U --fail-at-end` options. The
`${maven.projectBasedir}/.mvn/maven.config`
+ is located in the `${maven.projectBasedir}/.mvn/` directory which is in the
root
+ of a multi module build. This directory is part of the project and will be
checked
+ in into your version control. This results in being picked by everybody who
+ checks out the project and no need to remember to call this project
via `mvn -T3 -U --fail-at-end clean package` instead of `mvn clean package`.
* In Maven it is not simple to define JVM configuration on a per project base.
@@ -183,7 +183,7 @@ The configuration which is used here can be defined in your
pom by using an exec
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
```
@@ -215,7 +215,7 @@ executions on command like the following:
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
```
@@ -228,12 +228,12 @@ mvn exec:java@second-cli
```
So now you can define more than one configuration for command line executions.
-
+
* The Maven team has decided to [drop support for Win9x in launch
scripts](https://issues.apache.org/jira/browse/MNG-5776)
at long last. Yeah.
-The above release notes have [originally been written by Karl Heinz Marbaise
+The above release notes have [originally been written by Karl Heinz Marbaise
and migrated afterwards to the Apache Maven
project](http://blog.soebes.de/blog/2015/03/17/apache-maven-3-dot-3-1-features/).
diff --git a/content/markdown/docs/3.3.9/release-notes.md
b/content/markdown/docs/3.3.9/release-notes.md
index bf5ba3ea..87bf475c 100644
--- a/content/markdown/docs/3.3.9/release-notes.md
+++ b/content/markdown/docs/3.3.9/release-notes.md
@@ -1,4 +1,4 @@
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -80,9 +80,9 @@ Improvements
* Switch to official [Guice](https://github.com/google/guice/wiki/Motivation)
4.0, upgrade to
[Eclipse/Sisu](https://www.eclipse.org/sisu/) 0.3.2 has been done with
[MNG-5923][MNG-5923] and [MNG-5924][MNG-5924].
-
+
* Several areas of Maven Core have been changed to use
- [Commons Lang](https://commons.apache.org/proper/commons-lang/)'s Validate
to intercept invalid
+ [Commons Lang](https://commons.apache.org/proper/commons-lang/)'s Validate
to intercept invalid
input [MNG-5649][MNG-5649].
* Upgrade Java minimum version prerequisite from Java 6 to Java 7
[MNG-5780][MNG-5780].
@@ -93,13 +93,13 @@ Improvements
* Close IO streams in finally or try-with-resource statement
[MNG-5844][MNG-5844].
- * Make url inheritance algorithm more visible [MNG-5871][MNG-5871].
+ * Make url inheritance algorithm more visible [MNG-5871][MNG-5871].
- * Update used [Modello](https://codehaus-plexus.github.io/modello/) version
from 1.8.1 to 1.8.3 [MNG-5888][MNG-5888].
+ * Update used [Modello](https://codehaus-plexus.github.io/modello/) version
from 1.8.1 to 1.8.3 [MNG-5888][MNG-5888].
* Maven build does not work with Maven 2.2.1 [MNG-5905][MNG-5905].
- * Use canonical name for UTC timezone [MNG-5906][MNG-5906].
+ * Use canonical name for UTC timezone [MNG-5906][MNG-5906].
* Upgrade [maven-parent](/pom/maven/) to version 27 [MNG-5911][MNG-5911].
@@ -108,9 +108,9 @@ Improvements
* Upgraded to
[plexus-component-*](https://codehaus-plexus.github.io/plexus-containers/) 1.6
that uses
[asm](http://asm.ow2.org/) 5.x [MNG-5921][MNG-5921].
- * Upgrade [plexus-utils](https://codehaus-plexus.github.io/plexus-utils/) to
3.0.22 to support `combine.id` as configuration attribute for Map merging
[MNG-5922][MNG-5922].
+ * Upgrade [plexus-utils](https://codehaus-plexus.github.io/plexus-utils/) to
3.0.22 to support `combine.id` as configuration attribute for Map merging
[MNG-5922][MNG-5922].
- * Update
[animal-sniffer-maven-plugin](https://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/)
to 1.14. MANIMALSNIFFER-49 required when building with JDK9
[MNG-5925][MNG-5925].
+ * Update
[animal-sniffer-maven-plugin](https://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/)
to 1.14. MANIMALSNIFFER-49 required when building with JDK9
[MNG-5925][MNG-5925].
Bugs
@@ -125,8 +125,8 @@ Bugs
* The scripts to call Maven has introduced a bug related to the handling of
the
`MAVEN_OPTS` and debugging options which has been fixed by
[MNG-5813][MNG-5813].
- * Since Maven 3.3.1 it is possible to have configurations stored on a per
project base in the
- `${maven.projectBasedir}/.mvn` folder of the project. There you can use the
`maven.config`
+ * Since Maven 3.3.1 it is possible to have configurations stored on a per
project base in the
+ `${maven.projectBasedir}/.mvn` directory of the project. There you can use
the `maven.config`
file to store command line options instead of repeating them every time you
call Maven.
In cases where this file has been empty Maven ended with a failure. This
has been fixed
with [MNG-5816][MNG-5816].
@@ -137,31 +137,31 @@ Bugs
This has been fixed by [MNG-5840][MNG-5840].
* In cases where you start Maven in the root of a windows drive Maven will
fail.
- This has been fixed by [MNG-5796][MNG-5796].
+ This has been fixed by [MNG-5796][MNG-5796].
- * The `<prerequisites>` elements is intended for [buildtime checking but not
for runtime checks][MNG-4840]
- which should be left to [maven-enforcer-plugin][maven-enforcer-plugin].
+ * The `<prerequisites>` elements is intended for [buildtime checking but not
for runtime checks][MNG-4840]
+ which should be left to [maven-enforcer-plugin][maven-enforcer-plugin].
This has not been documented accordingly. This has been done with
[MNG-5297][MNG-5297].
* In situations like this: `mvn -Dtest=\"anton\" clean package` the trailing
quote
is stripped away which could cause problems. This has been fixed with
[MNG-5681][MNG-5681].
- * Possible NullPointerException in
org.apache.maven.repository.MetadataResolutionResult
+ * Possible NullPointerException in
org.apache.maven.repository.MetadataResolutionResult
has been fixed with [MNG-5721].
* There had been several issues with the `mvn` script which are for example
- wrong locating the `.mvn` folder, nonportable shell constructs, wrongly
setting
+ wrong locating the `.mvn` directory, nonportable shell constructs, wrongly
setting
'maven.multiModuleProjectDirectory' variable or directories which contain
spaces. Those
- issues have been fixed [MNG-5786][MNG-5786], [MNG-5858][MNG-5858],
+ issues have been fixed [MNG-5786][MNG-5786], [MNG-5858][MNG-5858],
[MNG-5882][MNG-5882] and [MNG-5884][MNG-5884].
* Broken link of 'Building Maven' in README.md has been fixed by
[MNG-5886][MNG-5886].
- * [maven-aether-provider][maven-aether-provider]/[maven-compat][maven-compat]
- does not always generate snapshot versions using Gregorian calendar year
- fixed in [MNG-5877][MNG-5877]
+ * [maven-aether-provider][maven-aether-provider]/[maven-compat][maven-compat]
+ does not always generate snapshot versions using Gregorian calendar year
+ fixed in [MNG-5877][MNG-5877]
- * Log file command line option description contains an extra word has been
fixed by [MNG-5891][MNG-5891]
+ * Log file command line option description contains an extra word has been
fixed by [MNG-5891][MNG-5891]
* org.apache.maven.repository.internal.RemoteSnapshotMetadataTest fails to
start at midnight fixed with
[MNG-5907][MNG-5907].
diff --git a/content/markdown/faq-unoffical.md
b/content/markdown/faq-unoffical.md
index 56242258..8d65de0e 100644
--- a/content/markdown/faq-unoffical.md
+++ b/content/markdown/faq-unoffical.md
@@ -40,7 +40,7 @@ This page serves as a collection of questions *with* answers.
If you have a freq
### Eclipse
-[How do I specify which output folders the Eclipse plugin puts into the
.classpath file?](#How do I specify which output folders the Eclipse plugin
puts into the .classpath file?]
+[How do I specify which output directories the Eclipse plugin puts into the
.classpath file?](#How do I specify which output directories the Eclipse plugin
puts into the .classpath file?]
[Where can I get the Maven plugin for Eclipse?](#Where can I get the Maven
plugin for Eclipse?]
[I issued\- mvn \-Declipse.downloadSources=true eclipse eclipse goal. It
created .classpath and .project for both modules, and in my local repository it
downloaded sources Ho do I access them in eclipse?](#I issued- mvn
-Declipse.downloadSources=true eclipse eclipse goal. It created .classpath and
.project for both modules, and in my local repository it downloaded sources Ho
do I access them in eclipse?]
[Is it possible that if I do mvn eclipse eclipse goal that my project would
get disconnected from the subversion repository?](#Is it possible that if I do
mvn eclipse eclipse goal that my project would get disconnected from the
subversion repository?]
@@ -517,7 +517,7 @@ To specify a remote repo in Maven, add the `<repositories>`
element to the POM:
Or, refer to the following page
[http://maven.apache.org/guides/mini/guide-multiple-repositories.html)
_Repositories_
-### How do I specify which output folders the Eclipse plugin puts into the
.classpath file?
+### How do I specify which output directories the Eclipse plugin puts into the
.classpath file?
```
<build>
@@ -1518,7 +1518,7 @@ Wagon wagon;
### How do I set the base directory for creating the packages created by
assembly?
-The assembly plugin, by default, saves the packages to your
project.build.directory folder from your pom or
+The assembly plugin, by default, saves the packages to your
project.build.directory directory from your pom or
```
<project>
...
diff --git a/content/markdown/install.md.vm b/content/markdown/install.md.vm
index 6c1d059c..7e003d4a 100644
--- a/content/markdown/install.md.vm
+++ b/content/markdown/install.md.vm
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
The installation of Apache Maven is a simple process of extracting the archive
-and adding the `bin` folder with the `mvn` command to the `PATH`.
+and adding the `bin` directory with the `mvn` command to the `PATH`.
Detailed steps are:
diff --git a/content/markdown/maven-jsr330.md b/content/markdown/maven-jsr330.md
index 402f12d1..65359822 100644
--- a/content/markdown/maven-jsr330.md
+++ b/content/markdown/maven-jsr330.md
@@ -123,7 +123,7 @@ Ok, so let\'s take a look at the POM:
```
So, as mentioned, we have the `javax.inject` dependency and the
`sisu-maven-plugin` configured to create
-the JSR-330 component index. When you build and place the extension JAR in the
`${MAVEN_HOME}/lib/ext` folder,
+the JSR-330 component index. When you build and place the extension JAR in the
`${MAVEN_HOME}/lib/ext` directory,
it will automatically get picked up by Maven. In the case of this example, we
have an implementation of
an `EventSpy` that times the executions of individual mojos within a phase in
the lifecycle.
diff --git a/content/markdown/security-plexus-archiver.md
b/content/markdown/security-plexus-archiver.md
index 6c6829c4..49decd71 100644
--- a/content/markdown/security-plexus-archiver.md
+++ b/content/markdown/security-plexus-archiver.md
@@ -23,7 +23,7 @@ an arbitrary file write generic vulnerability, that can be
achieved using a
specially crafted zip (or bzip2, gzip, tar, xz, war) archive, that holds
path traversal filenames. So when the filename gets concatenated to the
target extraction directory, if the extraction tool used does not make
-sufficient checks, the final path ends up outside of the target folder.
+sufficient checks, the final path ends up outside of the target directory.
The Apache Maven team has been informed because the plexus-archiver library
did not make sufficient checks and it is a library used by most of the
diff --git a/content/markdown/security.md b/content/markdown/security.md
index cea1c2e6..6ef1552d 100644
--- a/content/markdown/security.md
+++ b/content/markdown/security.md
@@ -77,7 +77,7 @@ an arbitrary file write generic vulnerability, that can be
achieved using a
specially crafted zip (or bzip2, gzip, tar, xz, war) archive, that holds
path traversal filenames. So when the filename gets concatenated to the
target extraction directory, if the extraction tool used does not make
-sufficient checks, the final path ends up outside of the target folder.
+sufficient checks, the final path ends up outside of the target directory.
The affected plugins use plexus-archiver to unpack dependencies to disk
and have been identified as potential triggers for exposing the vulnerability
if dependencies are compromised.
diff --git a/content/resources/xsd/maven-v3_0_0.xsd
b/content/resources/xsd/maven-v3_0_0.xsd
index 70629cf5..6aab6d04 100644
--- a/content/resources/xsd/maven-v3_0_0.xsd
+++ b/content/resources/xsd/maven-v3_0_0.xsd
@@ -1022,7 +1022,7 @@
For StarTeam access:
</p>
<div class="source">
-
<pre>scm:starteam:username:password@host:port/project/view/folder</pre>
+
<pre>scm:starteam:username:password@host:port/project/view/directory</pre>
</div>
All of this information can be had from either the StarTeam
Universal
