svn commit: r1056950 - /maven/site/trunk/src/site/apt/settings.apt

[be...@apache.org]

Author: bentmann
Date: Sun Jan  9 14:56:01 2011
New Revision: 1056950

URL: http://svn.apache.org/viewvc?rev=1056950&view=rev
Log:
o Mentioned merging of global and user settings

Modified:
    maven/site/trunk/src/site/apt/settings.apt

Modified: maven/site/trunk/src/site/apt/settings.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/settings.apt?rev=1056950&r1=1056949&r2=1056950&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/settings.apt (original)
+++ maven/site/trunk/src/site/apt/settings.apt Sun Jan  9 14:56:01 2011
@@ -45,8 +45,9 @@ Settings Reference
   The <<<settings>>> element in the <<<settings.xml>>> file contains elements used to define values
   which configure Maven execution in various ways, like the <<<pom.xml>>>, but should not be bundled to
   any specific project, or distributed to an audience. These include values such as the local repository
-  location, alternate remote repository servers, and authentication information. There are two
-  locations where a <<<settings.xml>>> file may live:
+  location, alternate remote repository servers, and authentication information.
+  
+  There are two locations where a <<<settings.xml>>> file may live:
 
   * The Maven install: <<<$M2_HOME/conf/settings.xml>>>
 
@@ -54,6 +55,14 @@ Settings Reference
 
   []
 
+  The former <<<settings.xml>>> are also called global settings, the latter <<<settings.xml>>> are referred to as
+  user settings. If both files exists, their contents gets merged, with the user-specific <<<settings.xml>>> being
+  dominant.
+
+  Tip: If you need to create user-specific settings from scratch, it's easiest to copy the global settings from your
+  Maven installation to your <<<$\{user.home\}/.m2>>> directory. Maven's default <<<settings.xml>>> is a template with
+  comments and examples so you can quickly tweak it to match your needs.
+
   Here is an overview of the top elements under <<<settings>>>:
 
 +------------------------------------+