You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2013/11/22 21:44:06 UTC
[2/2] git commit: - Correct spelling of URL - Remove incorrect usage
of apostrophes in plurals
- Correct spelling of URL
- Remove incorrect usage of apostrophes in plurals
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/7436d740
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/7436d740
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/7436d740
Branch: refs/heads/master
Commit: 7436d740d8d062d2d6f6f6bac79a969195878d35
Parents: b6ffc49
Author: Michael Osipov <mi...@apache.org>
Authored: Fri Nov 22 21:42:10 2013 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri Nov 22 21:42:10 2013 +0100
----------------------------------------------------------------------
src/site/apt/accurev.apt | 82 ++++----
src/site/apt/bazaar.apt | 124 +++++------
src/site/apt/cvs.apt | 318 ++++++++++++++--------------
src/site/apt/git.apt | 180 ++++++++--------
src/site/apt/index.apt | 84 ++++----
src/site/apt/jazz.apt | 394 +++++++++++++++++------------------
src/site/apt/local.apt | 110 +++++-----
src/site/apt/mercurial.apt | 114 +++++-----
src/site/apt/perforce.apt | 130 ++++++------
src/site/apt/scm-url-format.apt | 86 ++++----
src/site/apt/scms-overview.apt | 186 ++++++++---------
src/site/apt/starteam.apt | 146 ++++++-------
src/site/apt/subversion.apt | 174 ++++++++--------
src/site/apt/synergy.apt | 378 ++++++++++++++++-----------------
src/site/apt/tfs.apt | 100 ++++-----
src/site/apt/vss.apt | 158 +++++++-------
16 files changed, 1382 insertions(+), 1382 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/accurev.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/accurev.apt b/src/site/apt/accurev.apt
index 68465ed..e1b93fa 100644
--- a/src/site/apt/accurev.apt
+++ b/src/site/apt/accurev.apt
@@ -1,41 +1,41 @@
- ------
- SCM Implementation: Accurev
- ------
- Olivier Lamy
- ------
- 2008-08-10
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: Accurev
-
-* General Info
-
- Link: {{http://www.accurev.com//}}
-
- License: Commercial
-
-* SCM Url
-
--------
-scm:accurev:server:port/depot/my_app/
--------
+ ------
+ SCM Implementation: Accurev
+ ------
+ Olivier Lamy
+ ------
+ 2008-08-10
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: Accurev
+
+* General Info
+
+ Link: {{http://www.accurev.com//}}
+
+ License: Commercial
+
+* SCM URL
+
+-------
+scm:accurev:server:port/depot/my_app/
+-------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/bazaar.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/bazaar.apt b/src/site/apt/bazaar.apt
index fb2e285..42122c3 100644
--- a/src/site/apt/bazaar.apt
+++ b/src/site/apt/bazaar.apt
@@ -1,62 +1,62 @@
- ------
- SCM Implementation: Bazaar
- ------
- Torbjørn Eikli Smørgrav
- ------
- 2006-02-01
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: Bazaar
-
-* General Info
-
- Link: {{http://bazaar-vcs.org/}}
-
- License: GNU General Public License
-
- "Bazaar-NG is a decentralized revision control system designed to be easy for developers
- and end users alike. Decentralized revision control systems give people the ability to work
- over the internet using the bazaar development model. When you use Bazaar-NG, you can commit
- to your own branches of your favorite free software projects without needing special permission."
-
- The provider supports Bazaar from version 0.7, though important features like sftp transport where
- not included before version 0.8.
-
-* SCM Url
-
- Path or url to the branch location.
- Supported protocols: FTP, SFTP, AFTP, HTTP, HTTPS and FILE.
-
--------
-scm:bazaar:url_to_repository
--------
-
-* Examples
-
--------
-scm:bazaar:http://host/v3 (read only)
-scm:bazaar:sftp://username:password@host/~/dev/project/v3 (relative path)
-scm:bazaar:sftp://host:port/home/smorgrav/dev/project/v3 (absolute path without explicit username)
-scm:bazaar:file://C:/dev/project/v3 (windows drive)
-scm:bazaar:file:///home/smorgrav/dev/project/v3 (linux drive)
--------
+ ------
+ SCM Implementation: Bazaar
+ ------
+ Torbjørn Eikli Smørgrav
+ ------
+ 2006-02-01
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: Bazaar
+
+* General Info
+
+ Link: {{http://bazaar-vcs.org/}}
+
+ License: GNU General Public License
+
+ "Bazaar-NG is a decentralized revision control system designed to be easy for developers
+ and end users alike. Decentralized revision control systems give people the ability to work
+ over the internet using the bazaar development model. When you use Bazaar-NG, you can commit
+ to your own branches of your favorite free software projects without needing special permission."
+
+ The provider supports Bazaar from version 0.7, though important features like sftp transport where
+ not included before version 0.8.
+
+* SCM URL
+
+ Path or url to the branch location.
+ Supported protocols: FTP, SFTP, AFTP, HTTP, HTTPS and FILE.
+
+-------
+scm:bazaar:url_to_repository
+-------
+
+* Examples
+
+-------
+scm:bazaar:http://host/v3 (read only)
+scm:bazaar:sftp://username:password@host/~/dev/project/v3 (relative path)
+scm:bazaar:sftp://host:port/home/smorgrav/dev/project/v3 (absolute path without explicit username)
+scm:bazaar:file://C:/dev/project/v3 (windows drive)
+scm:bazaar:file:///home/smorgrav/dev/project/v3 (linux drive)
+-------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/cvs.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/cvs.apt b/src/site/apt/cvs.apt
index faebc5e..39c7fa0 100644
--- a/src/site/apt/cvs.apt
+++ b/src/site/apt/cvs.apt
@@ -1,159 +1,159 @@
- ------
- SCM Implementation: CVS
- ------
- Wim Deblauwe
- ------
- 2008-09-02
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: CVS
-
-* General Info
-
- Link: {{https://www.cvshome.org/}}
-
- License: GPL
-
-* SCM Url
-
- The general format for a CVS SCM Url is
-
--------
-scm:cvs<delimiter><method>[<delimiter>username_password_servername_port]<delimiter>path_to_repository<delimiter>module_name
--------
-
- As delimiter you can use either colon ':' or, if you use a colon for one
- of the variables (e.g. a windows path), a pipe '|'.
-
- The following methods are supported:
-
- * <<<ext>>>, connecting to a server using an external rsh program
-
- * <<<local>>>, connecting to the local file system
-
- * <<<lserver>>>, connecting to a local server
-
- * <<<pserver>>>, connecting to a password-authenticating server
-
- * <<<sspi>>>, secure authentication (less supported by clients and servers, may require using native implementation, for more details see "How to choose the CVS provider implementation")
-
- * <<<sserver>>>, SSL connection method for CVS (only if cvs_native is used i.e. using -Dmaven.scm.provider.cvs.implementation=cvs_native with Maven)
-
- []
-
- Here are the format for each of the supported methods, using colon as
- delimiter.
-
--------
-scm:cvs<delimiter>local<delimiter>path_to_repository<delimiter>module_name
-scm:cvs<delimiter>lserver<delimiter>[username@]servername[<delimiter>port]<delimiter>path_to_repository<delimiter>module_name
-scm:cvs<delimiter>pserver<delimiter>[username[<delimiter>password]@]servername[<delimiter>port]<delimiter>path_to_repository<delimiter>module_name
-scm:cvs<delimiter>ext<delimiter>[username@]servername[<delimiter>port]<delimiter>path_to_repository<delimiter>module_name
-scm:cvs<delimiter>sspi<delimiter>[username@]host<delimiter>path<delimiter>module
--------
-
-* Examples
-
--------
-scm:cvs:pserver:anoncvs:@cvs.apache.org:/cvs/root:module
-scm:cvs|pserver|username@localhost|C:/Program Files/cvsnt/repositories|module_name
-scm:cvs:ext:username@cvs.apache.org:/cvs/root:module
-scm:cvs:local:/cvs/root:module
-scm:cvs:sspi:cvs.apache.org:2222:/cvs/root:module
--------
-
- If you use anonymous access, with an empty password, you need to add a colon (:) between the username and "@" like it's done in the first example.
- This tells the SCM provider that there is a password and that it is empty.
-
-* How to choose the CVS provider implementation
-
- By default, the pure java CVS provider is used (which may not support SSPI protocol), so you don't need a cvs client installed on your machine.
- In some case, you can want to use the installed CVS client (for example, CVSNT). To do it, you can change the implementation to use by settings the
- '<<<maven.scm.provider.cvs.implementation>>>' system property:
-
--------
--Dmaven.scm.provider.cvs.implementation=cvs_native
--------
-
-* Provider Configuration
-
- The provider configuration is defined in <<<${user.home}/.scm/cvs-settings.xml>>>
-
-** Compression level
-
- You can define the compression level in the provider configuration file (default value is 3). If compression level is equals to 0, there won't be any compression.
-
--------
-<cvs-settings>
- <compressionLevel>5</compressionLevel>
-</cvs-settings>
--------
-
- If you don't want compression, you can define the system property '<<<maven.scm.cvs.use_compression>>>'.
-
--------
-mvn -Dmaven.scm.cvs.use_compression=true scm:changelog
--------
-
-** .cvsrc file
-
- By default, maven-scm doesn't use <<<.cvsrc>>> file. If you want to use it, you should allow it inprovider configuration file.
-
--------
-<cvs-settings>
- <useCvsrc>true</useCvsrc>
-</cvs-settings>
--------
-
-** Trace CVS commands
-
- By default, maven-scm doesn't use '<<<-t>>>' global option of cvs command line to trace. If you want to use it, add the following lines in your provider configuration file:
-
--------
-<cvs-settings>
- <traceCvsCommand>true</traceCvsCommand>
-</cvs-settings>
--------
-
-** Temporary CVS files
-
- If you want to store CVS temporary files in a specific directory instead of default or value define in <<<$TMPDIR>>>, add the following lines in your provider configuration file:
-
--------
-<cvs-settings>
- <temporaryFilesDirectory>your_directory</temporaryFilesDirectory>
-</cvs-settings>
--------
-
-** Internal CVS variables
-
- If you want to add some internal CVS variables to the cvs command line, add the following lines in your provider configuration file:
-
--------
-<cvs-settings>
- <cvsVariables>
- <key1>value1</key1>
- <key2>value2</key2>
- </cvsVariables>
-</cvs-settings>
--------
+ ------
+ SCM Implementation: CVS
+ ------
+ Wim Deblauwe
+ ------
+ 2008-09-02
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: CVS
+
+* General Info
+
+ Link: {{https://www.cvshome.org/}}
+
+ License: GPL
+
+* SCM URL
+
+ The general format for a CVS SCM URL is
+
+-------
+scm:cvs<delimiter><method>[<delimiter>username_password_servername_port]<delimiter>path_to_repository<delimiter>module_name
+-------
+
+ As delimiter you can use either colon ':' or, if you use a colon for one
+ of the variables (e.g. a windows path), a pipe '|'.
+
+ The following methods are supported:
+
+ * <<<ext>>>, connecting to a server using an external rsh program
+
+ * <<<local>>>, connecting to the local file system
+
+ * <<<lserver>>>, connecting to a local server
+
+ * <<<pserver>>>, connecting to a password-authenticating server
+
+ * <<<sspi>>>, secure authentication (less supported by clients and servers, may require using native implementation, for more details see "How to choose the CVS provider implementation")
+
+ * <<<sserver>>>, SSL connection method for CVS (only if cvs_native is used i.e. using -Dmaven.scm.provider.cvs.implementation=cvs_native with Maven)
+
+ []
+
+ Here are the format for each of the supported methods, using colon as
+ delimiter.
+
+-------
+scm:cvs<delimiter>local<delimiter>path_to_repository<delimiter>module_name
+scm:cvs<delimiter>lserver<delimiter>[username@]servername[<delimiter>port]<delimiter>path_to_repository<delimiter>module_name
+scm:cvs<delimiter>pserver<delimiter>[username[<delimiter>password]@]servername[<delimiter>port]<delimiter>path_to_repository<delimiter>module_name
+scm:cvs<delimiter>ext<delimiter>[username@]servername[<delimiter>port]<delimiter>path_to_repository<delimiter>module_name
+scm:cvs<delimiter>sspi<delimiter>[username@]host<delimiter>path<delimiter>module
+-------
+
+* Examples
+
+-------
+scm:cvs:pserver:anoncvs:@cvs.apache.org:/cvs/root:module
+scm:cvs|pserver|username@localhost|C:/Program Files/cvsnt/repositories|module_name
+scm:cvs:ext:username@cvs.apache.org:/cvs/root:module
+scm:cvs:local:/cvs/root:module
+scm:cvs:sspi:cvs.apache.org:2222:/cvs/root:module
+-------
+
+ If you use anonymous access, with an empty password, you need to add a colon (:) between the username and "@" like it's done in the first example.
+ This tells the SCM provider that there is a password and that it is empty.
+
+* How to choose the CVS provider implementation
+
+ By default, the pure java CVS provider is used (which may not support SSPI protocol), so you don't need a cvs client installed on your machine.
+ In some case, you can want to use the installed CVS client (for example, CVSNT). To do it, you can change the implementation to use by settings the
+ '<<<maven.scm.provider.cvs.implementation>>>' system property:
+
+-------
+-Dmaven.scm.provider.cvs.implementation=cvs_native
+-------
+
+* Provider Configuration
+
+ The provider configuration is defined in <<<${user.home}/.scm/cvs-settings.xml>>>
+
+** Compression level
+
+ You can define the compression level in the provider configuration file (default value is 3). If compression level is equals to 0, there won't be any compression.
+
+-------
+<cvs-settings>
+ <compressionLevel>5</compressionLevel>
+</cvs-settings>
+-------
+
+ If you don't want compression, you can define the system property '<<<maven.scm.cvs.use_compression>>>'.
+
+-------
+mvn -Dmaven.scm.cvs.use_compression=true scm:changelog
+-------
+
+** .cvsrc file
+
+ By default, maven-scm doesn't use <<<.cvsrc>>> file. If you want to use it, you should allow it inprovider configuration file.
+
+-------
+<cvs-settings>
+ <useCvsrc>true</useCvsrc>
+</cvs-settings>
+-------
+
+** Trace CVS commands
+
+ By default, maven-scm doesn't use '<<<-t>>>' global option of cvs command line to trace. If you want to use it, add the following lines in your provider configuration file:
+
+-------
+<cvs-settings>
+ <traceCvsCommand>true</traceCvsCommand>
+</cvs-settings>
+-------
+
+** Temporary CVS files
+
+ If you want to store CVS temporary files in a specific directory instead of default or value define in <<<$TMPDIR>>>, add the following lines in your provider configuration file:
+
+-------
+<cvs-settings>
+ <temporaryFilesDirectory>your_directory</temporaryFilesDirectory>
+</cvs-settings>
+-------
+
+** Internal CVS variables
+
+ If you want to add some internal CVS variables to the cvs command line, add the following lines in your provider configuration file:
+
+-------
+<cvs-settings>
+ <cvsVariables>
+ <key1>value1</key1>
+ <key2>value2</key2>
+ </cvsVariables>
+</cvs-settings>
+-------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/git.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/git.apt b/src/site/apt/git.apt
index cf3577c..9cedd6c 100644
--- a/src/site/apt/git.apt
+++ b/src/site/apt/git.apt
@@ -1,90 +1,90 @@
- ------
- SCM Implementation: Git
- ------
- Olivier Lamy
- ------
- 2008-08-10
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: Git
-
-* General Info
-
- Link: {{http://git-scm.com/}}
-
- License: GNU General Public License v2
-
-* SCM Url
-
- For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator. The separator for the port has to be a colon in any case since this part is specified in the git URL specification. See man git-fetch.
-
--------
-scm:git:git://server_name[:port]/path_to_repository
-scm:git:http://server_name[:port]/path_to_repository
-scm:git:https://server_name[:port]/path_to_repository
-scm:git:ssh://server_name[:port]/path_to_repository
-scm:git:file://[hostname]/path_to_repository
--------
-
- * Examples
-
--------
-scm:git:git://github.com/path_to_repository
-scm:git:http://github.com/path_to_repository
-scm:git:https://github.com/path_to_repository
-scm:git:ssh://github.com/path_to_repository
-scm:git:file://localhost/path_to_repository
--------
-
-* Different Fetch and Push URLs
-
- In some cases a different URL has to be used for read and write operations. This can happen if e.g. fetch is performed via the http protocol, but writing to the repository is only possible via ssh. In this case both URLs may be written into the <developerConnection> tag. The fetch URL has to be prefixed with <<<[fetch=]>>> and the push URL with <<<[push=]>>>
-
- * Example:
-
--------
-<developerConnection>scm:git:[fetch=]http://mywebserver.org/path_to_repository[push=]ssh://username@otherserver:8898/~/repopath.git</developerConnection>
--------
-
-* Working with branches
-
- Since version 1.3, we assume that the name of the branch in the upstream repo is the same as the name of the current local branch. So whenever you invoke a maven-scm action which has to access the upstream repository, e.g. start a release, you should be on that very branch.
-
- In other words: If no branch is specified manually, every git-fetch, git-pull, git-push, etc will always work on the branch in the upstream repository which has the same branch name as your current local branch
-
--------
-git push pushUrl currentBranch:currentBranch
--------
-
-
-* Provider Configuration
-
- The provider configuration is defined in <<<${user.home}/.scm/git-settings.xml>>>.
-
--------
-<git-settings>
- <!-- will had the option --no-verify to the commit command can be helpfull to ignore trailing spaces issues with cygwin and the release plugin -->
- <commitNoVerify>false</commitNoVerify>
-</git-settings>
--------
-
+ ------
+ SCM Implementation: Git
+ ------
+ Olivier Lamy
+ ------
+ 2008-08-10
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: Git
+
+* General Info
+
+ Link: {{http://git-scm.com/}}
+
+ License: GNU General Public License v2
+
+* SCM URL
+
+ For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator. The separator for the port has to be a colon in any case since this part is specified in the git URL specification. See man git-fetch.
+
+-------
+scm:git:git://server_name[:port]/path_to_repository
+scm:git:http://server_name[:port]/path_to_repository
+scm:git:https://server_name[:port]/path_to_repository
+scm:git:ssh://server_name[:port]/path_to_repository
+scm:git:file://[hostname]/path_to_repository
+-------
+
+ * Examples
+
+-------
+scm:git:git://github.com/path_to_repository
+scm:git:http://github.com/path_to_repository
+scm:git:https://github.com/path_to_repository
+scm:git:ssh://github.com/path_to_repository
+scm:git:file://localhost/path_to_repository
+-------
+
+* Different Fetch and Push URLs
+
+ In some cases a different URL has to be used for read and write operations. This can happen if e.g. fetch is performed via the http protocol, but writing to the repository is only possible via ssh. In this case both URLs may be written into the <developerConnection> tag. The fetch URL has to be prefixed with <<<[fetch=]>>> and the push URL with <<<[push=]>>>
+
+ * Example:
+
+-------
+<developerConnection>scm:git:[fetch=]http://mywebserver.org/path_to_repository[push=]ssh://username@otherserver:8898/~/repopath.git</developerConnection>
+-------
+
+* Working with branches
+
+ Since version 1.3, we assume that the name of the branch in the upstream repo is the same as the name of the current local branch. So whenever you invoke a maven-scm action which has to access the upstream repository, e.g. start a release, you should be on that very branch.
+
+ In other words: If no branch is specified manually, every git-fetch, git-pull, git-push, etc will always work on the branch in the upstream repository which has the same branch name as your current local branch
+
+-------
+git push pushUrl currentBranch:currentBranch
+-------
+
+
+* Provider Configuration
+
+ The provider configuration is defined in <<<${user.home}/.scm/git-settings.xml>>>.
+
+-------
+<git-settings>
+ <!-- will had the option --no-verify to the commit command can be helpfull to ignore trailing spaces issues with cygwin and the release plugin -->
+ <commitNoVerify>false</commitNoVerify>
+</git-settings>
+-------
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 2d59407..488dc0c 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -1,42 +1,42 @@
- ------
- Home
- ------
- Wim Deblauwe
- ------
- 2013-10-27
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Maven SCM
-
- Maven SCM supports Maven 2.x plugins (e.g.
- {{{http://maven.apache.org/plugins/maven-release-plugin/}maven-release-plugin}})
- and other tools (e.g. {{{http://continuum.apache.org/}Continuum}})
- by providing them with {{{./maven-scm-api/apidocs}a common API}} for doing SCM operations. You can look at
- {{{./scms-overview.html}the list of SCM's}} for more information on using
- Maven SCM with your favorite SCM tool.
-
- In addition, Maven SCM provides 2 tools to directly use it:
-
- * {{{./maven-scm-plugin}<<<maven-scm-plugin>>>}}: a Maven plugin, where each SCM command is implemented as a plugin goal,
-
- * {{{./maven-scm-client}<<<maven-scm-client>>>}}: a simple SCM command line tool.
+ ------
+ Home
+ ------
+ Wim Deblauwe
+ ------
+ 2013-10-27
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Maven SCM
+
+ Maven SCM supports Maven 2.x plugins (e.g.
+ {{{http://maven.apache.org/plugins/maven-release-plugin/}maven-release-plugin}})
+ and other tools (e.g. {{{http://continuum.apache.org/}Continuum}})
+ by providing them with {{{./maven-scm-api/apidocs}a common API}} for doing SCM operations. You can look at
+ {{{./scms-overview.html}the list of SCMs}} for more information on using
+ Maven SCM with your favorite SCM tool.
+
+ In addition, Maven SCM provides 2 tools to directly use it:
+
+ * {{{./maven-scm-plugin}<<<maven-scm-plugin>>>}}: a Maven plugin, where each SCM command is implemented as a plugin goal,
+
+ * {{{./maven-scm-client}<<<maven-scm-client>>>}}: a simple SCM command line tool.
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/jazz.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/jazz.apt b/src/site/apt/jazz.apt
index d4e4995..ba4ed3d 100644
--- a/src/site/apt/jazz.apt
+++ b/src/site/apt/jazz.apt
@@ -1,197 +1,197 @@
- ------
- SCM Implementation: Jazz
- ------
- Chris Graham
- ------
- 2012-03-19
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: Jazz
-
-* General Info
-
- This SCM provider wrappers the underlying command line tool "scm" that is provided as part of Jazz SCM offering.
- As such, this provider is subject to the capabilities provided by the scm tool.
-
- The scm tool itself is documented at:
-
- *V2.0.0 {{http://publib.boulder.ibm.com/infocenter/rtc/v2r0m0/topic/com.ibm.team.scm.doc/topics/r_scm_cli_scm.html}}
-
- *V3.0 {{http://publib.boulder.ibm.com/infocenter/clmhelp/v3r0/topic/com.ibm.team.scm.doc/topics/r_scm_cli_scm.html}}
-
- * V3.0.1 {{http://publib.boulder.ibm.com/infocenter/clmhelp/v3r0m1/topic/com.ibm.team.scm.doc/topics/r_scm_cli_scm.html}}
-
- []
-
- Jazz is available from:
-
- Link: {{http://jazz.net/}}
-
- License: Free
-
- IBM Rational Team Concert is IBM commercial offering based upon the Jazz base platform. This provider may
- also be used with RTC.
-
- Link: {{http://www-01.ibm.com/software/rational/products/rtc/}}
-
- License: Commercial
-
-* Environment Configuration
-
- The Jazz SCM source control command line tools are installed in JazzInstallDir/scmtools/eclipse,
- which may not have been added to your default path. You must make sure that this path is available to maven when
- using this provider.
-
- Additionally, the user used to log onto the Jazz SCM server must be assigned a
- {{{http://publib.boulder.ibm.com/infocenter/clmhelp/v3r0m1/topic/com.ibm.jazz.repository.web.admin.doc/topics/c_license_mgmt_over.html}Developer Client Access License}}.
- 10 developer licenses are available for free from {{http://jazz.net/}}.
-
-* SCM URL
-
- <<<scm:jazz:[username[;password]@]http[s]://server_name[:port]/jazzPath:repositoryWorkspace>>>
-
- * <username;password> May be provided directly in the pom, or using the server_name:port to obtain
- the details from the user's settings.xml file.
-
- * http[s]://server_name:port/jazzPath Specify the jazz server and path to connect to.
-
- * <repositoryWorkspace> The name of the user's remote repository workspace used to checkin to, or load from.
-
- []
-
-+-------
-scm:jazz:[username[;password]@]http[s]://server_name[:port]/jazzPath:repositoryWorkspace
-+-------
-
-* Examples
-
--------
-scm:jazz:username;password@https://server.name:9443/jazz:Chris's Repository Workspace
--------
-
--------
-scm:jazz:https://server.name:9443/jazz:Chris's Repository Workspace
--------
-
--------
-scm:jazz:https://server.name:9443/ccm:GPDBBuildWorkspace
--------
-
-* Jazz SCM Concepts and Artefacts
-
- This provider only interacts with Jazz SCM, not all of the full capabilities of the full
- Jazz Server. This implementation is basically a wrapper for the Jazz SCM CLI tool, <<<scm>>>,
- and as such it is limited to the functionality provided by the underlying <<<scm>>> tool.
-
- There are many artifacts and concepts in Jazz SCM. Many of these artifacts and concepts are
- substantially different than how many other SCM providers work.
-
- We need some way to address these when we try to map the given maven-scm framework to Jazz SCM.
- Below is a list of these "artifacts / concepts" and roughly how they relate to the maven-scm framework.
-
- * Local Workspace
-
- * This corresponds to fileSet.getBasedir() and is the "baseDirectory" in which the SCM goals are performed against.
-
- * Url Path (ex: https://localhost)
-
- * This must be specified in the "SCM URL" of the pom.xml.
-
- * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
-
- * Port (ex: 9443)
-
- * This must be specified in the "SCM URL" of the pom.xml.
-
- * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
-
- * Jazz Path (ex: /jazz)
-
- * This must be specified in the "SCM URL" of the pom.xml.
-
- * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
-
- * Repository Workspace
-
- * This must be specified in the "SCM URL" of the pom.xml.
-
- * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
-
- * Username
-
- * This may be specified in the "SCM URL" of the pom.xml.
-
- * If not specified in the pom.xml, the username must be specified in a server entry of settings.xml.
-
- * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
-
- * Password
-
- * This may be specified in the "SCM URL" of the pom.xml.
-
- * If not specified in the pom.xml, the username must be specified in a server entry of settings.xml.
-
- * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java
-
- * Components
-
- * There is currently no concept of individual components in our implementation, or specifying them,
- they are implicitly obtained from the repository workspace.
-
- * Scm goals are currently assumed to be against all components in the repository workspace.
-
- * Baselines
-
- * Since we don't distinguish components, we do not use the concept of baselines.
-
- * Snapshots
-
- * We can use snapshots because we have a repository workspace defined in the SCM URL.
-
- * We assume that ScmVersion.getName() will correspond to a snapshot name.
-
- * Streams
-
- * We currently do not support the concept of streams in our provider.
-
- * Project Areas
-
- * We currently do not support the concept of project areas in our provider.
-
- * Team Areas
-
- * We currently do not support the concept of team areas in our provider.
-
- * Multiple Outgoing Change Sets
-
- * The SCM add operation performs a checkin, but it does not create a new change set.
-
- * The SCM checkin operation creates a new changeset, with the given comment and then checks the files in.
-
- * Delivering Change Sets
-
- * Changes are delivered/promoted as controlled by the <<<pushChanges>>> flag when we have a valid flow target.
-
- * Discarding Change Sets
-
- * We currently do not support the concept of discarding change sets in our provider.
+ ------
+ SCM Implementation: Jazz
+ ------
+ Chris Graham
+ ------
+ 2012-03-19
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: Jazz
+
+* General Info
+
+ This SCM provider wrappers the underlying command line tool "scm" that is provided as part of Jazz SCM offering.
+ As such, this provider is subject to the capabilities provided by the scm tool.
+
+ The scm tool itself is documented at:
+
+ *V2.0.0 {{http://publib.boulder.ibm.com/infocenter/rtc/v2r0m0/topic/com.ibm.team.scm.doc/topics/r_scm_cli_scm.html}}
+
+ *V3.0 {{http://publib.boulder.ibm.com/infocenter/clmhelp/v3r0/topic/com.ibm.team.scm.doc/topics/r_scm_cli_scm.html}}
+
+ * V3.0.1 {{http://publib.boulder.ibm.com/infocenter/clmhelp/v3r0m1/topic/com.ibm.team.scm.doc/topics/r_scm_cli_scm.html}}
+
+ []
+
+ Jazz is available from:
+
+ Link: {{http://jazz.net/}}
+
+ License: Free
+
+ IBM Rational Team Concert is IBM commercial offering based upon the Jazz base platform. This provider may
+ also be used with RTC.
+
+ Link: {{http://www-01.ibm.com/software/rational/products/rtc/}}
+
+ License: Commercial
+
+* Environment Configuration
+
+ The Jazz SCM source control command line tools are installed in JazzInstallDir/scmtools/eclipse,
+ which may not have been added to your default path. You must make sure that this path is available to maven when
+ using this provider.
+
+ Additionally, the user used to log onto the Jazz SCM server must be assigned a
+ {{{http://publib.boulder.ibm.com/infocenter/clmhelp/v3r0m1/topic/com.ibm.jazz.repository.web.admin.doc/topics/c_license_mgmt_over.html}Developer Client Access License}}.
+ 10 developer licenses are available for free from {{http://jazz.net/}}.
+
+* SCM URL
+
+ <<<scm:jazz:[username[;password]@]http[s]://server_name[:port]/jazzPath:repositoryWorkspace>>>
+
+ * <username;password> May be provided directly in the pom, or using the server_name:port to obtain
+ the details from the user's settings.xml file.
+
+ * http[s]://server_name:port/jazzPath Specify the jazz server and path to connect to.
+
+ * <repositoryWorkspace> The name of the user's remote repository workspace used to checkin to, or load from.
+
+ []
+
++-------
+scm:jazz:[username[;password]@]http[s]://server_name[:port]/jazzPath:repositoryWorkspace
++-------
+
+* Examples
+
+-------
+scm:jazz:username;password@https://server.name:9443/jazz:Chris's Repository Workspace
+-------
+
+-------
+scm:jazz:https://server.name:9443/jazz:Chris's Repository Workspace
+-------
+
+-------
+scm:jazz:https://server.name:9443/ccm:GPDBBuildWorkspace
+-------
+
+* Jazz SCM Concepts and Artefacts
+
+ This provider only interacts with Jazz SCM, not all of the full capabilities of the full
+ Jazz Server. This implementation is basically a wrapper for the Jazz SCM CLI tool, <<<scm>>>,
+ and as such it is limited to the functionality provided by the underlying <<<scm>>> tool.
+
+ There are many artifacts and concepts in Jazz SCM. Many of these artifacts and concepts are
+ substantially different than how many other SCM providers work.
+
+ We need some way to address these when we try to map the given maven-scm framework to Jazz SCM.
+ Below is a list of these "artifacts / concepts" and roughly how they relate to the maven-scm framework.
+
+ * Local Workspace
+
+ * This corresponds to fileSet.getBasedir() and is the "baseDirectory" in which the SCM goals are performed against.
+
+ * URL Path (ex: https://localhost)
+
+ * This must be specified in the "SCM URL" of the pom.xml.
+
+ * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
+
+ * Port (ex: 9443)
+
+ * This must be specified in the "SCM URL" of the pom.xml.
+
+ * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
+
+ * Jazz Path (ex: /jazz)
+
+ * This must be specified in the "SCM URL" of the pom.xml.
+
+ * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
+
+ * Repository Workspace
+
+ * This must be specified in the "SCM URL" of the pom.xml.
+
+ * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
+
+ * Username
+
+ * This may be specified in the "SCM URL" of the pom.xml.
+
+ * If not specified in the pom.xml, the username must be specified in a server entry of settings.xml.
+
+ * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java.
+
+ * Password
+
+ * This may be specified in the "SCM URL" of the pom.xml.
+
+ * If not specified in the pom.xml, the username must be specified in a server entry of settings.xml.
+
+ * It's value will be stored in our implementation of the ScmProviderRepositoryWithHost.java
+
+ * Components
+
+ * There is currently no concept of individual components in our implementation, or specifying them,
+ they are implicitly obtained from the repository workspace.
+
+ * Scm goals are currently assumed to be against all components in the repository workspace.
+
+ * Baselines
+
+ * Since we don't distinguish components, we do not use the concept of baselines.
+
+ * Snapshots
+
+ * We can use snapshots because we have a repository workspace defined in the SCM URL.
+
+ * We assume that ScmVersion.getName() will correspond to a snapshot name.
+
+ * Streams
+
+ * We currently do not support the concept of streams in our provider.
+
+ * Project Areas
+
+ * We currently do not support the concept of project areas in our provider.
+
+ * Team Areas
+
+ * We currently do not support the concept of team areas in our provider.
+
+ * Multiple Outgoing Change Sets
+
+ * The SCM add operation performs a checkin, but it does not create a new change set.
+
+ * The SCM checkin operation creates a new changeset, with the given comment and then checks the files in.
+
+ * Delivering Change Sets
+
+ * Changes are delivered/promoted as controlled by the <<<pushChanges>>> flag when we have a valid flow target.
+
+ * Discarding Change Sets
+
+ * We currently do not support the concept of discarding change sets in our provider.
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/local.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/local.apt b/src/site/apt/local.apt
index b9dacac..ede57e8 100644
--- a/src/site/apt/local.apt
+++ b/src/site/apt/local.apt
@@ -1,55 +1,55 @@
- ------
- SCM Implementation: File System
- ------
- Wim Deblauwe
- ------
- 2005-12-01
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: File System
-
-* General Info
-
- Link: -
-
- License: -
-
-* SCM Url
-
- For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
-
--------
-scm:local<delimiter>path_to_repository<delimiter>module_name
--------
-
- <path_to_repository>: The absolute or relative path to the parent directory of your pom.xml
-
- <module_name>: The name of the directory that contains your pom.xml
-
-
-* Examples
-
--------
-scm:local:/usr/modules:my_module
-scm:local|C:/javaprojects|my_module
--------
+ ------
+ SCM Implementation: File System
+ ------
+ Wim Deblauwe
+ ------
+ 2005-12-01
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: File System
+
+* General Info
+
+ Link: -
+
+ License: -
+
+* SCM URL
+
+ For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
+
+-------
+scm:local<delimiter>path_to_repository<delimiter>module_name
+-------
+
+ <path_to_repository>: The absolute or relative path to the parent directory of your pom.xml
+
+ <module_name>: The name of the directory that contains your pom.xml
+
+
+* Examples
+
+-------
+scm:local:/usr/modules:my_module
+scm:local|C:/javaprojects|my_module
+-------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/mercurial.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/mercurial.apt b/src/site/apt/mercurial.apt
index ededb94..e25ffdb 100644
--- a/src/site/apt/mercurial.apt
+++ b/src/site/apt/mercurial.apt
@@ -1,57 +1,57 @@
- ------
- SCM Implementation: Mercurial (hg)
- ------
- Ryan Daum
- ------
- 2007-04-12
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: Mercurial
-
-* General Info
-
- Link: {{http://www.selenic.com/mercurial/wiki/}}
-
- License: GNU General Public License
-
- "Mercurial: a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects."
-
- This provider supports version 0.9.2 and greater of Mercurial.
-
-* SCM Url
-
- Path or url to the branch location.
- Supported protocols: HTTP, HTTPS, FILE, and local path.
-
--------
-scm:hg:url_to_repository/local_repository_directory
--------
-
-* Examples
-
--------
-scm:hg:http://host/v3
-scm:hg:file://C:/dev/project/v3 (windows drive)
-scm:hg:file:///home/smorgrav/dev/project/v3 (linux drive)
-scm:hg:/home/smorgrav/dev/project/v3 (local directory)
--------
+ ------
+ SCM Implementation: Mercurial (hg)
+ ------
+ Ryan Daum
+ ------
+ 2007-04-12
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: Mercurial
+
+* General Info
+
+ Link: {{http://www.selenic.com/mercurial/wiki/}}
+
+ License: GNU General Public License
+
+ "Mercurial: a fast, lightweight Source Control Management system designed for efficient handling of very large distributed projects."
+
+ This provider supports version 0.9.2 and greater of Mercurial.
+
+* SCM URL
+
+ Path or url to the branch location.
+ Supported protocols: HTTP, HTTPS, FILE, and local path.
+
+-------
+scm:hg:url_to_repository/local_repository_directory
+-------
+
+* Examples
+
+-------
+scm:hg:http://host/v3
+scm:hg:file://C:/dev/project/v3 (windows drive)
+scm:hg:file:///home/smorgrav/dev/project/v3 (linux drive)
+scm:hg:/home/smorgrav/dev/project/v3 (local directory)
+-------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/perforce.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/perforce.apt b/src/site/apt/perforce.apt
index feb4add..6d89cc9 100644
--- a/src/site/apt/perforce.apt
+++ b/src/site/apt/perforce.apt
@@ -1,65 +1,65 @@
- ------
- SCM Implementation: Perforce
- ------
- Wim Deblauwe
- ------
- 2005-12-01
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: Perforce
-
-* General Info
-
- Link: {{http://www.perforce.com/}}
-
- License: Commercial (It is licensed at no charge for use on open source projects.)
-
-* SCM Url
-
- For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
-
--------
-scm:perforce:[username@]path_to_repository
-scm:perforce:host:[port:][username@]path_to_repository (DEPRECATED)
-scm:perforce:[username@]host:[port:]path_to_repository
--------
-
-* Examples
-
--------
-scm:perforce://depot/modules/myproject
--------
-
-* Associating Jobs with checkin changelist
-
- Many Perforce installations have a 'require job' rule/trigger turned on.
- To allow checkin when such a rule is defined, the system property maven.scm.jobs
- can be set to specify a job that will be associated with the changelist on checkin.
- Handling of multiple jobs is currently not implemented.
- Sample: -Dmaven.scm.jobs=JOB1234
-
-*--------------------------------+----------+-------------------+------------------------------------------+
-| Key |location |Type | Description |
-*--------------------------------+----------+-------------------+------------------------------------------+
-| maven.scm.jobs |properties|word, The job name | Job name |
-*--------------------------------+----------+-------------------+------------------------------------------+
+ ------
+ SCM Implementation: Perforce
+ ------
+ Wim Deblauwe
+ ------
+ 2005-12-01
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: Perforce
+
+* General Info
+
+ Link: {{http://www.perforce.com/}}
+
+ License: Commercial (It is licensed at no charge for use on open source projects.)
+
+* SCM URL
+
+ For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
+
+-------
+scm:perforce:[username@]path_to_repository
+scm:perforce:host:[port:][username@]path_to_repository (DEPRECATED)
+scm:perforce:[username@]host:[port:]path_to_repository
+-------
+
+* Examples
+
+-------
+scm:perforce://depot/modules/myproject
+-------
+
+* Associating Jobs with checkin changelist
+
+ Many Perforce installations have a 'require job' rule/trigger turned on.
+ To allow checkin when such a rule is defined, the system property maven.scm.jobs
+ can be set to specify a job that will be associated with the changelist on checkin.
+ Handling of multiple jobs is currently not implemented.
+ Sample: -Dmaven.scm.jobs=JOB1234
+
+*--------------------------------+----------+-------------------+------------------------------------------+
+| Key |location |Type | Description |
+*--------------------------------+----------+-------------------+------------------------------------------+
+| maven.scm.jobs |properties|word, The job name | Job name |
+*--------------------------------+----------+-------------------+------------------------------------------+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/scm-url-format.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/scm-url-format.apt b/src/site/apt/scm-url-format.apt
index bc8ae61..c2aabe6 100644
--- a/src/site/apt/scm-url-format.apt
+++ b/src/site/apt/scm-url-format.apt
@@ -1,43 +1,43 @@
- ------
- SCM URL format
- ------
- Emmanuel Venisse
- ------
- 2005-06-05
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM URL Format
-
-* SCM Url
-
- The general format for a SCM Url is
-
--------
-scm:<scm_provider><delimiter><provider_specific_part>
--------
-
- As delimiter you can use either colon ':' or, if you use a colon for one
- of the variables (e.g. a windows path), you can use a pipe '|'.
-
- For information about the provider specific part, see the appropriate
- {{{./scms-overview.html}SCM implementation}}.
+ ------
+ SCM URL format
+ ------
+ Emmanuel Venisse
+ ------
+ 2005-06-05
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM URL Format
+
+* SCM URL
+
+ The general format for a SCM URRL is
+
+-------
+scm:<scm_provider><delimiter><provider_specific_part>
+-------
+
+ As delimiter you can use either colon ':' or, if you use a colon for one
+ of the variables (e.g. a windows path), you can use a pipe '|'.
+
+ For information about the provider specific part, see the appropriate
+ {{{./scms-overview.html}SCM implementation}}.
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/scms-overview.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/scms-overview.apt b/src/site/apt/scms-overview.apt
index b152d09..0197b00 100644
--- a/src/site/apt/scms-overview.apt
+++ b/src/site/apt/scms-overview.apt
@@ -1,93 +1,93 @@
- ------
- Overview of SCM's
- ------
- Wim Deblauwe
- ------
- 2005-12-01
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Overview of SCM's
-
- Maven SCM supports many SCM's. This is a list of all currently known SCM's:
-
-* Fully implemented SCM's
-
- * {{{./bazaar.html}Bazaar}}
-
- * {{{./cvs.html}CVS}}
-
- * {{{./git.html}Git}}
-
- * {{{./jazz.html}Jazz}}
-
- * {{{./mercurial.html}Mercurial}}
-
- * {{{./perforce.html}Perforce}}
-
- * {{{./starteam.html}StarTeam}}
-
- * {{{./subversion.html}Subversion}}
-
- * {{{./synergy.html}CM Synergy}}
-
-* Partially implemented SCM's
-
- * {{{./accurev.html}Accurev}}
-
- * {{{./clearcase.html}ClearCase}}
-
- * {{{./local.html}File system}}
-
- * {{{./vss.html}Visual Source Safe}}
-
- * {{{./tfs.html}Team Foundation Server}}
-
-* Not implemented SCM's
-
- This is a list of all the known SCM's that are not implemented currently.
-
- * Aegis
-
- * Arch
-
- * BitKeeper
-
- * ClearCase Multisite
-
- * Code Co-op
-
- * Darcs
-
- * Monotone
-
- * OpenCM
-
- * PureCM
-
- * Serena PVCS / Dimension
-
- * Starteam Enterprise
-
- * Svk
-
- * Vesta
+ ------
+ Overview of SCMs
+ ------
+ Wim Deblauwe
+ ------
+ 2005-12-01
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Overview of SCMs
+
+ Maven SCM supports many SCMs. This is a list of all currently known SCMs:
+
+* Fully implemented SCMs
+
+ * {{{./bazaar.html}Bazaar}}
+
+ * {{{./cvs.html}CVS}}
+
+ * {{{./git.html}Git}}
+
+ * {{{./jazz.html}Jazz}}
+
+ * {{{./mercurial.html}Mercurial}}
+
+ * {{{./perforce.html}Perforce}}
+
+ * {{{./starteam.html}StarTeam}}
+
+ * {{{./subversion.html}Subversion}}
+
+ * {{{./synergy.html}CM Synergy}}
+
+* Partially implemented SCMs
+
+ * {{{./accurev.html}Accurev}}
+
+ * {{{./clearcase.html}ClearCase}}
+
+ * {{{./local.html}File system}}
+
+ * {{{./vss.html}Visual Source Safe}}
+
+ * {{{./tfs.html}Team Foundation Server}}
+
+* Not implemented SCMs
+
+ This is a list of all the known SCMs that are not implemented currently.
+
+ * Aegis
+
+ * Arch
+
+ * BitKeeper
+
+ * ClearCase Multisite
+
+ * Code Co-op
+
+ * Darcs
+
+ * Monotone
+
+ * OpenCM
+
+ * PureCM
+
+ * Serena PVCS/Dimension
+
+ * Starteam Enterprise
+
+ * Svk
+
+ * Vesta
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/starteam.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/starteam.apt b/src/site/apt/starteam.apt
index 28190d9..a82f7f5 100644
--- a/src/site/apt/starteam.apt
+++ b/src/site/apt/starteam.apt
@@ -1,73 +1,73 @@
- ------
- SCM Implementation: StarTeam
- ------
- Wim Deblauwe
- ------
- 2005-12-01
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: StarTeam
-
-* General Info
-
- Link: {{http://www.borland.com/us/products/starteam/index.html}}
-
- License: Commercial
-
-* SCM Url
-
- For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
-
--------
-scm:starteam:[username[:password]@]host:port/projectName/[viewName/][folderHiearchy/] (DEPRECATED)
-scm:starteam:[username[:password]@]host:port:/projectName/[viewName/][folderHiearchy/]
--------
-
-* Examples
-
--------
-scm:starteam:username:password@hostname:23456/project/view/folder1/folder2
-scm:starteam:username@hostname:23456/project/view/folder
-scm:starteam:hostname:23456/project/view/folder
--------
-
-* Hidden Features
-
- Starteam provider has a few hidden features that currently not accessible thru maven-scm-api.
- Hidden features can be activated via system properties settings ( ie -Dkey=value ) or
- ${user.home}/.scm/starteam-settings.xml
-
-*--------------------------------+----------+-------------------+------------------------------------------+
-| Key |location |Type | Description |
-*--------------------------------+----------+-------------------+------------------------------------------+
-| compressionEnable |settings |boolean | Add "-cmp" option to all stcmd executions|
-*--------------------------------+----------+-------------------+------------------------------------------+
-| maven.scm.starteam.deleteLocal |properties|boolean | Issue stdcmd delete-local command after an update.|
-| | | | This feature is activated by Continuum by default|
-*--------------------------------+----------+-------------------+------------------------------------------+
-| maven.scm.issue.type |properties|cr,req,task,active | Additional comment type during checkin |
-*--------------------------------+----------+-------------------+------------------------------------------+
-| maven.scm.issue.value |properties|issue type value | Full path to the issue type value, if required|
-*--------------------------------+----------+-------------------+------------------------------------------+
-
-
+ ------
+ SCM Implementation: StarTeam
+ ------
+ Wim Deblauwe
+ ------
+ 2005-12-01
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: StarTeam
+
+* General Info
+
+ Link: {{http://www.borland.com/us/products/starteam/index.html}}
+
+ License: Commercial
+
+* SCM URL
+
+ For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
+
+-------
+scm:starteam:[username[:password]@]host:port/projectName/[viewName/][folderHiearchy/] (DEPRECATED)
+scm:starteam:[username[:password]@]host:port:/projectName/[viewName/][folderHiearchy/]
+-------
+
+* Examples
+
+-------
+scm:starteam:username:password@hostname:23456/project/view/folder1/folder2
+scm:starteam:username@hostname:23456/project/view/folder
+scm:starteam:hostname:23456/project/view/folder
+-------
+
+* Hidden Features
+
+ Starteam provider has a few hidden features that currently not accessible thru maven-scm-api.
+ Hidden features can be activated via system properties settings ( ie -Dkey=value ) or
+ ${user.home}/.scm/starteam-settings.xml
+
+*--------------------------------+----------+-------------------+------------------------------------------+
+| Key |location |Type | Description |
+*--------------------------------+----------+-------------------+------------------------------------------+
+| compressionEnable |settings |boolean | Add "-cmp" option to all stcmd executions|
+*--------------------------------+----------+-------------------+------------------------------------------+
+| maven.scm.starteam.deleteLocal |properties|boolean | Issue stdcmd delete-local command after an update.|
+| | | | This feature is activated by Continuum by default|
+*--------------------------------+----------+-------------------+------------------------------------------+
+| maven.scm.issue.type |properties|cr,req,task,active | Additional comment type during checkin |
+*--------------------------------+----------+-------------------+------------------------------------------+
+| maven.scm.issue.value |properties|issue type value | Full path to the issue type value, if required|
+*--------------------------------+----------+-------------------+------------------------------------------+
+
+
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/7436d740/src/site/apt/subversion.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/subversion.apt b/src/site/apt/subversion.apt
index 085259b..14d5c00 100644
--- a/src/site/apt/subversion.apt
+++ b/src/site/apt/subversion.apt
@@ -1,87 +1,87 @@
- ------
- SCM Implementation: Subversion
- ------
- Wim Deblauwe
- Olivier Lamy
- ------
- 2011-05-15
- ------
-
-~~ 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
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
-
-SCM Implementation: Subversion
-
-* General Info
-
- Link: {{http://subversion.apache.org/}}
-
- License: Apache License, Version 2.0
-
-* SCM Url
-
- For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
-
--------
-scm:svn:svn://[username[:password]@]server_name[:port]/path_to_repository
-scm:svn:svn+ssh://[username@]server_name[:port]/path_to_repository
-scm:svn:file://[hostname]/path_to_repository
-scm:svn:http://[username[:password]@]server_name[:port]/path_to_repository
-scm:svn:https://[username[:password]@]server_name[:port]/path_to_repository
--------
-
-* Examples
-
--------
-scm:svn:file:///svn/root/module
-scm:svn:file://localhost/path_to_repository
-scm:svn:file://my_server/path_to_repository
-scm:svn:http://svn.apache.org/svn/root/module
-scm:svn:https://username@svn.apache.org/svn/root/module
-scm:svn:https://username:password@svn.apache.org/svn/root/module
--------
-
-* Provider Configuration
-
- The provider configuration is defined in <<<${user.home}/.scm/svn-settings.xml>>>.
-
- Here is an example of what a configuration file might look like:
-
--------
-<svn-settings>
- <configDirectory>your_configuration_directory</configDirectory>
- <useCygwinPath>true in order to use cygwin path /cygdrive/c</useCygwinPath>
- <cygwinMountPath>the mount path to use default is /cygwin</cygwinMountPath>
- <useNonInteractive>if false --non-interactive will not be used in the svn command line</useNonInteractive>
- <useAuthCache>if true --no-auth-cache will not be used in the svn command line</useAuthCache>
- <trustServerCert>if true --trust-server-cert will be used in the cli</trustServerCert>
-</svn-settings>
--------
-
- For more info see the
- {{{./maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/svn-settings.html}reference guide}}.
-
-** Configuration directory
-
- You can define the subversion configuration directory ('--config-dir' svn global option) in the provider configuration file or with 'maven.scm.svn.config_directory' command line parameter.
-
--------
-mvn -Dmaven.scm.svn.config_directory=your_configuration_directory scm:update
--------
+ ------
+ SCM Implementation: Subversion
+ ------
+ Wim Deblauwe
+ Olivier Lamy
+ ------
+ 2011-05-15
+ ------
+
+~~ 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
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+SCM Implementation: Subversion
+
+* General Info
+
+ Link: {{http://subversion.apache.org/}}
+
+ License: Apache License, Version 2.0
+
+* SCM URL
+
+ For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator.
+
+-------
+scm:svn:svn://[username[:password]@]server_name[:port]/path_to_repository
+scm:svn:svn+ssh://[username@]server_name[:port]/path_to_repository
+scm:svn:file://[hostname]/path_to_repository
+scm:svn:http://[username[:password]@]server_name[:port]/path_to_repository
+scm:svn:https://[username[:password]@]server_name[:port]/path_to_repository
+-------
+
+* Examples
+
+-------
+scm:svn:file:///svn/root/module
+scm:svn:file://localhost/path_to_repository
+scm:svn:file://my_server/path_to_repository
+scm:svn:http://svn.apache.org/svn/root/module
+scm:svn:https://username@svn.apache.org/svn/root/module
+scm:svn:https://username:password@svn.apache.org/svn/root/module
+-------
+
+* Provider Configuration
+
+ The provider configuration is defined in <<<${user.home}/.scm/svn-settings.xml>>>.
+
+ Here is an example of what a configuration file might look like:
+
+-------
+<svn-settings>
+ <configDirectory>your_configuration_directory</configDirectory>
+ <useCygwinPath>true in order to use cygwin path /cygdrive/c</useCygwinPath>
+ <cygwinMountPath>the mount path to use default is /cygwin</cygwinMountPath>
+ <useNonInteractive>if false --non-interactive will not be used in the svn command line</useNonInteractive>
+ <useAuthCache>if true --no-auth-cache will not be used in the svn command line</useAuthCache>
+ <trustServerCert>if true --trust-server-cert will be used in the cli</trustServerCert>
+</svn-settings>
+-------
+
+ For more info see the
+ {{{./maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/svn-settings.html}reference guide}}.
+
+** Configuration directory
+
+ You can define the subversion configuration directory ('--config-dir' svn global option) in the provider configuration file or with 'maven.scm.svn.config_directory' command line parameter.
+
+-------
+mvn -Dmaven.scm.svn.config_directory=your_configuration_directory scm:update
+-------