summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2012-12-03 15:27:23 -0500
committerJason Kincl <kincljc@ornl.gov>2012-12-03 15:27:23 -0500
commit648c8f6e313e684d5fadc1fdbc97e08d83eb2b16 (patch)
tree9f438113697ea7f6b91a533c8ace8bf0075b943e
parentb97fbb64ae7e79e96ddf150b577954149a0240c6 (diff)
downloadbcfg2-648c8f6e313e684d5fadc1fdbc97e08d83eb2b16.tar.gz
bcfg2-648c8f6e313e684d5fadc1fdbc97e08d83eb2b16.tar.bz2
bcfg2-648c8f6e313e684d5fadc1fdbc97e08d83eb2b16.zip
Added documentation
* added doc link for where information about svn resolution actions can be found
-rw-r--r--doc/server/plugins/version/svn.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt
index 748dce7c6..f7739bd51 100644
--- a/doc/server/plugins/version/svn.txt
+++ b/doc/server/plugins/version/svn.txt
@@ -44,10 +44,12 @@ adding to ``/etc/bcfg2.conf``::
conflict_resolution =
+-----------------+
-| Attribute |
+| Actions |
+=================+
| base |
+-----------------+
+| postpone |
++-----------------+
| mine-conflict |
+-----------------+
| theirs-conflict |
@@ -57,3 +59,9 @@ adding to ``/etc/bcfg2.conf``::
| theirs-full |
+-----------------+
+Descriptions of each action can be found in the `Version Control with
+Subversion`_ book.
+
+.. _Version Control with Subversion:
+http://svnbook.red-bean.com/en/1.7/svn.ref.svn.html#svn.ref.svn.sw.accept
+