diff --git a/.subversion/config b/.subversion/config
index b7f6f49ab1c76afa7d0d352a43ebe45f16763000..6703cb916fbab02b257c53e4c638539a0216127d 100644
--- a/.subversion/config
+++ b/.subversion/config
@@ -5,22 +5,37 @@
### Section for authentication and authorization customizations.
[auth]
-### Set store-passwords to 'no' to avoid storing passwords in the
-### auth/ area of your config directory. It defaults to 'yes'.
-### Note that this option only prevents saving of *new* passwords;
-### it doesn't invalidate existing passwords. (To do that, remove
-### the cache files by hand as described in the Subversion book.)
+### Set password stores used by Subversion. They should be
+### delimited by spaces or commas. The order of values determines
+### the order in which password stores are used.
+### Valid password stores:
+### gnome-keyring (Unix-like systems)
+### kwallet (Unix-like systems)
+### keychain (Mac OS X)
+### windows-cryptoapi (Windows)
+password-stores = gnome-keyring,kwallet,keychain,windows-cryptoapi
+### To disable all password stores, use an empty list:
+# password-stores =
+###
+### Set KWallet wallet used by Subversion. If empty or unset,
+### then the default network wallet will be used.
+# kwallet-wallet =
+###
+### Include PID (Process ID) in Subversion application name when
+### using KWallet. It defaults to 'no'.
+# kwallet-svn-application-name-with-pid = yes
+###
+### The rest of the [auth] section in this file has been deprecated.
+### Both 'store-passwords' and 'store-auth-creds' can now be
+### specified in the 'servers' file in your config directory
+### and are documented there. Anything specified in this section
+### is overridden by settings specified in the 'servers' file.
# store-passwords = no
-### Set store-auth-creds to 'no' to avoid storing any subversion
-### credentials in the auth/ area of your config directory.
-### It defaults to 'yes'. Note that this option only prevents
-### saving of *new* credentials; it doesn't invalidate existing
-### caches. (To do that, remove the cache files by hand.)
# store-auth-creds = no
### Section for configuring external helper applications.
[helpers]
-### Set editor to the command used to invoke your text editor.
+### Set editor-cmd to the command used to invoke your text editor.
### This will override the environment variables that Subversion
### examines by default to find this information ($EDITOR,
### et al).
@@ -29,13 +44,21 @@
### This will override the compile-time default, which is to use
### Subversion's internal diff implementation.
# diff-cmd = diff_program (diff, gdiff, etc.)
+### Diff-extensions are arguments passed to an external diff
+### program or to Subversion's internal diff implementation.
+### Set diff-extensions to override the default arguments ('-u').
+# diff-extensions = -u -p
### Set diff3-cmd to the absolute path of your 'diff3' program.
### This will override the compile-time default, which is to use
### Subversion's internal diff3 implementation.
# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
-### Set diff3-has-program-arg to 'true' or 'yes' if your 'diff3'
-### program accepts the '--diff-program' option.
-# diff3-has-program-arg = [true | false]
+### Set diff3-has-program-arg to 'yes' if your 'diff3' program
+### accepts the '--diff-program' option.
+# diff3-has-program-arg = [yes | no]
+### Set merge-tool-cmd to the command used to invoke your external
+### merging tool of choice. Subversion will pass 5 arguments to
+### the specified command: base theirs mine merged wcfile
+# merge-tool-cmd = merge_command
### Section for configuring tunnel agents.
[tunnels]
@@ -52,7 +75,7 @@
### passed to the tunnel agent as <user>@<hostname>.) If the
### built-in ssh scheme were not predefined, it could be defined
### as:
-# ssh = $SVN_SSH ssh
+# ssh = $SVN_SSH ssh -q -o ControlMaster=no
### If you wanted to define a new 'rsh' scheme, to be used with
### 'svn+rsh:' URLs, you could do so as follows:
# rsh = rsh
@@ -66,14 +89,11 @@
### Section for configuring miscelleneous Subversion options.
[miscellany]
### Set global-ignores to a set of whitespace-delimited globs
-### which Subversion will ignore in its 'status' output.
-global-ignores = *~ *.log *.private *.result *.tmp installed \
- aclocal.m4 autom4te.cache boot.md5 boot.md5-check \
- build config.guess config.h.in config.sub configure \
- depcomp install-sh libtool.m4 ltmain.sh lt~obsolete.m4 \
- ltoptions.m4 ltsugar.m4 ltversion.m4 Makefile.in missing \
- *.pyc
-
+### which Subversion will ignore in its 'status' output, and
+### while importing or adding files and directories.
+### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'.
+# global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo
+# *.rej *~ #*# .#* .*.swp .DS_Store
### Set log-encoding to the default encoding for log messages
# log-encoding = latin1
### Set use-commit-times to make checkout/update/switch/revert
@@ -82,19 +102,37 @@ global-ignores = *~ *.log *.private *.result *.tmp installed \
### Set no-unlock to prevent 'svn commit' from automatically
### releasing locks on files.
# no-unlock = yes
+### Set mime-types-file to a MIME type registry file, used to
+### provide hints to Subversion's MIME type auto-detection
+### algorithm.
+# mime-types-file = /path/to/mime.types
+### Set preserved-conflict-file-exts to a whitespace-delimited
+### list of patterns matching file extensions which should be
+### preserved in generated conflict file names. By default,
+### conflict files use custom extensions.
+# preserved-conflict-file-exts = doc ppt xls od?
### Set enable-auto-props to 'yes' to enable automatic properties
### for 'svn add' and 'svn import', it defaults to 'no'.
### Automatic properties are defined in the section 'auto-props'.
enable-auto-props = yes
+### Set interactive-conflicts to 'no' to disable interactive
+### conflict resolution prompting. It defaults to 'yes'.
+# interactive-conflicts = no
+### Set memory-cache-size to define the size of the memory cache
+### used by the client when accessing a FSFS repository via
+### ra_local (the file:// scheme). The value represents the number
+### of MB used by the cache.
+# memory-cache-size = 16
### Section for configuring automatic properties.
[auto-props]
### The format of the entries is:
### file-name-pattern = propname[=value][;propname[=value]...]
### The file-name-pattern can contain wildcards (such as '*' and
-### '?'). All entries which match will be applied to the file.
-### Note that auto-props functionality must be enabled, which
-### is typically done by setting the 'enable-auto-props' option.
+### '?'). All entries which match (case-insensitively) will be
+### applied to the file. Note that auto-props functionality
+### must be enabled, which is typically done by setting the
+### 'enable-auto-props' option.
*.am = svn:eol-style=native;svn:keywords=Author Date Id Revision
*.bat = svn:eol-style=CRLF;svn:keywords=Author Date Id Revision
*.bib = svn:eol-style=native