diff --git a/src/site/markdown/cache-configuration.md b/src/site/markdown/cache-configuration.md index 657d4ba60951..8014d8401d70 100644 --- a/src/site/markdown/cache-configuration.md +++ b/src/site/markdown/cache-configuration.md @@ -18,7 +18,7 @@ under the License. --> # Maven Cache Configuration Enhancement -This document describes the enhanced cache configuration functionality in Maven's DefaultRequestCache. +This document describes the enhanced cache configuration functionality in `DefaultRequestCache`. ## Overview diff --git a/src/site/markdown/configuring.md b/src/site/markdown/configuring.md index d0b4470ed8d8..e888345c6b79 100644 --- a/src/site/markdown/configuring.md +++ b/src/site/markdown/configuring.md @@ -51,8 +51,8 @@ various parts of the system. The main entry point is the `${maven.home}/conf/maven.properties` properties file. This file, along with any other files loaded from it (see below) are called _Maven properties files_ and are Java properties files with a -few enhancements. Contrary to standard properties file, those files -are UTF-8 encoded. +few enhancements. Unlike standard properties files, these files are +UTF-8 encoded. ### File Inclusion @@ -90,13 +90,21 @@ from `${session.rootDirectory}/.mvn/maven-user.properties`. ## Settings +Settings are configured in the `~/.m2/settings.xml` file (user level), +`${session.rootDirectory}/.mvn/settings.xml` (project level), and +`${maven.installation.conf}/settings.xml` (Maven installation level). See [Settings Reference](./api/maven-api-settings/settings.html) for details. + ## Extensions +Extensions allow you to add additional functionality to Maven. They are +configured in the `~/.m2/extensions.xml` file (user level), +`${session.rootDirectory}/.mvn/extensions.xml` (project level), and `${maven.installation.conf}/extensions.xml` (Maven installation level). + ## Maven Command Line Arguments Maven is a command line tool, and, as such, accepts various command -line arguments. The `MAVEN_ARGS` environment value is used to -provide additional arguments to Maven. Those arguments will be +line arguments. The `MAVEN_ARGS` environment variable is used to +provide additional arguments to Maven. These arguments will be prepended to the actual list of command line arguments. For example, options and goals could be defined with the value