From 4062259129fb0753a4c80bc6e55dcf39720a8221 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 14 Dec 2008 23:00:14 +0000 Subject: [PATCH] [MNG-3908] Review documentation in maven-distribution/src/conf/settings.xml for mvn 3.0 o Replaced references to system properties with CLI options as added in MNG-557 and MNG-3914 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726571 13f79535-47bb-0310-9956-ffa450edef68 --- maven-distribution/src/conf/settings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-distribution/src/conf/settings.xml b/maven-distribution/src/conf/settings.xml index 11397701d6..205a9e6660 100644 --- a/maven-distribution/src/conf/settings.xml +++ b/maven-distribution/src/conf/settings.xml @@ -21,20 +21,20 @@ under the License. | This is the configuration file for Maven. It can be specified at two levels: | | 1. User Level. This settings.xml file provides configuration for a single user, - | and is normally provided in $HOME/.m2/settings.xml. + | and is normally provided in ${user.home}/.m2/settings.xml. | - | NOTE: This location can be overridden with the system property: + | NOTE: This location can be overridden with the CLI option: | - | -Dorg.apache.maven.user-settings=/path/to/user/settings.xml + | --settings /path/to/user/settings.xml | - | 2. Global Level. This settings.xml file provides configuration for all maven - | users on a machine (assuming they're all using the same maven + | 2. Global Level. This settings.xml file provides configuration for all Maven + | users on a machine (assuming they're all using the same Maven | installation). It's normally provided in | ${maven.home}/conf/settings.xml. | - | NOTE: This location can be overridden with the system property: + | NOTE: This location can be overridden with the CLI option: | - | -Dorg.apache.maven.global-settings=/path/to/global/settings.xml + | --global-settings /path/to/global/settings.xml | | The sections in this sample file are intended to give you a running start at | getting the most out of your Maven installation. Where appropriate, the default