diff options
author | Niels van Adrichem <n.l.m.vanadrichem@tudelft.nl> | 2015-11-05 16:42:26 +0300 |
---|---|---|
committer | Niels van Adrichem <n.l.m.vanadrichem@tudelft.nl> | 2015-11-05 16:42:26 +0300 |
commit | 572d9bdf1af5fc95b10eb82e1f925fb97f971f71 (patch) | |
tree | aee4d1cae23d0342c99449a9986f7679bb031497 /doc | |
parent | 0bcb13f02ea5f504449acb328c8e64d725f5d640 (diff) | |
parent | dae724b21cd4aa267e199c7987ce71a60dd7523e (diff) |
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/gui/share.h
Diffstat (limited to 'doc')
-rw-r--r-- | doc/autoupdate.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/autoupdate.rst b/doc/autoupdate.rst index 1db842466..12226b8a6 100644 --- a/doc/autoupdate.rst +++ b/doc/autoupdate.rst @@ -89,7 +89,7 @@ To prevent automatic updates and disallow manual overrides: 1. Edit this Registry key: - HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud + ``HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud`` 2. Add the key ``skipUpdateCheck`` (of type DWORD). |