svn commit: r1833479 - in /maven/website/content: maven-site-1.0-site.jar settings.html

[sv...@apache.org]

Author: svn-site-role
Date: Wed Jun 13 21:20:47 2018
New Revision: 1833479

Log:
Site checkin for project Apache Maven Site

Modified:
    maven/website/content/maven-site-1.0-site.jar
    maven/website/content/settings.html

Modified: maven/website/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.

Modified: maven/website/content/settings.html
==============================================================================
--- maven/website/content/settings.html (original)
+++ maven/website/content/settings.html Wed Jun 13 21:20:47 2018
@@ -303,7 +303,7 @@
 <li><b>id</b>: This is the ID of the server <i>(not of the user to login as)</i> that matches the <tt>id</tt> element of the repository/mirror that Maven tries to connect to.</li>
 <li><b>username</b>, <b>password</b>: These elements appear as a pair denoting the login and password required to authenticate to this server.</li>
 <li><b>privateKey</b>, <b>passphrase</b>: Like the previous two elements, this pair specifies a path to a private key (default is <tt>${user.home}/.ssh/id_dsa</tt>) and a <tt>passphrase</tt>, if required. The <tt>passphrase</tt> and <tt>password</tt> elements may be externalized in the future, but for now they must be set plain-text in the <tt>settings.xml</tt> file.</li>
-<li><b>filePermissions</b>, <b>directoryPermissions</b>: When a repository file or directory is created on deployment, these are the permissions to use. The legal values of each is a three digit number corrosponding to *nix file permissions, ie. 664, or 775.</li>
+<li><b>filePermissions</b>, <b>directoryPermissions</b>: When a repository file or directory is created on deployment, these are the permissions to use. The legal values of each is a three digit number corresponding to *nix file permissions, e.g. 664, or 775.</li>
 </ul>
 <p><i>Note:</i> If you use a private key to login to the server, make sure you omit the <tt>&lt;password&gt;</tt> element. Otherwise, the key will be ignored.</p>
 <div class="section">
@@ -368,7 +368,7 @@
 
 <li><b>id</b>: The unique identifier for this proxy. This is used to differentiate between <tt>proxy</tt> elements.</li>
 <li><b>active</b>: <tt>true</tt> if this proxy is active. This is useful for declaring a set of proxies, but only one may be active at a time.</li>
-<li><b>protocol</b>, <b>host</b>, <b>port</b>: The <tt>protocol://host:port</tt> of the proxy, seperated into discrete elements.</li>
+<li><b>protocol</b>, <b>host</b>, <b>port</b>: The <tt>protocol://host:port</tt> of the proxy, separated into discrete elements.</li>
 <li><b>username</b>, <b>password</b>: These elements appear as a pair denoting the login and password required to authenticate to this proxy server.</li>
 <li><b>nonProxyHosts</b>: This is a list of hosts which should not be proxied. The delimiter of the list is the expected type of the proxy server; the example above is pipe delimited - comma delimited is also common.</li>
 </ul></div>
@@ -533,7 +533,7 @@
 &lt;/settings&gt;
 </pre></div></div>
 
-<p>The final piece of the <tt>settings.xml</tt> puzzle is the <tt>activeProfiles</tt> element. This contains a set of <tt>activeProfile</tt> elements, which each have a value of a <tt>profile</tt> <tt>id</tt>. Any <tt>profile</tt> <tt>id</tt> defined as an <tt>activeProfile</tt> will be active, reguardless of any environment settings. If no matching profile is found nothing will happen. For example, if <tt>env-test</tt> is an <tt>activeProfile</tt>, a profile in a <tt>pom.xml</tt> (or <tt>profile.xml</tt> with a corrosponding <tt>id</tt> will be active. If no such profile is found then execution will continue as normal.</p></div></div>
+<p>The final piece of the <tt>settings.xml</tt> puzzle is the <tt>activeProfiles</tt> element. This contains a set of <tt>activeProfile</tt> elements, which each have a value of a <tt>profile</tt> <tt>id</tt>. Any <tt>profile</tt> <tt>id</tt> defined as an <tt>activeProfile</tt> will be active, regardless of any environment settings. If no matching profile is found nothing will happen. For example, if <tt>env-test</tt> is an <tt>activeProfile</tt>, a profile in a <tt>pom.xml</tt> (or <tt>profile.xml</tt> with a corresponding <tt>id</tt> will be active. If no such profile is found then execution will continue as normal.</p></div></div>
         </div>
       </div>
     </div>