瀏覽代碼

Merge pull request #4371 from ThomasWaldmann/rel1013

WIP: release 1.0.13
TW 6 年之前
父節點
當前提交
b9d834409c
共有 4 個文件被更改,包括 13 次插入10 次删除
  1. 1 1
      LICENSE
  2. 6 6
      docs/changes.rst
  3. 1 1
      docs/conf.py
  4. 5 2
      docs/usage/mount.rst.inc

+ 1 - 1
LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015-2018 The Borg Collective (see AUTHORS file)
+Copyright (C) 2015-2019 The Borg Collective (see AUTHORS file)
 Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
 All rights reserved.
 

+ 6 - 6
docs/changes.rst

@@ -128,26 +128,26 @@ The best check that everything is ok is to run a dry-run extraction::
 Changelog
 =========
 
-Version 1.0.13 (not released yet)
----------------------------------
+Version 1.0.13 (2019-02-15)
+---------------------------
 
 Please note: this is very likely the last 1.0.x release, please upgrade to 1.1.x.
 
 Bug fixes:
 
-- security fix: configure FUSE with "default_permissions", fixes #3903
+- security fix: configure FUSE with "default_permissions", #3903.
   "default_permissions" is now enforced by borg by default to let the
   kernel check uid/gid/mode based permissions.
   "ignore_permissions" can be given to not enforce "default_permissions".
-- xattrs: fix borg exception handling on ENOSPC error, #3808
+- xattrs: fix borg exception handling on ENOSPC error, #3808.
 
 New features:
 
-- read a passphrase from a file descriptor
-  Read a passphrase from a file descriptor specified in the
+- Read a passphrase from a file descriptor specified in the
   BORG_PASSPHRASE_FD environment variable.
 
 Other changes:
+
 - acl platform code: fix acl set return type
 - xattr:
 

+ 1 - 1
docs/conf.py

@@ -44,7 +44,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Borg - Deduplicating Archiver'
-copyright = '2010-2014 Jonas Borgström, 2015-2018 The Borg Collective (see AUTHORS file)'
+copyright = '2010-2014 Jonas Borgström, 2015-2019 The Borg Collective (see AUTHORS file)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

+ 5 - 2
docs/usage/mount.rst.inc

@@ -49,12 +49,15 @@ to tweak the performance. It sets the number of cached data chunks; additional
 memory usage can be up to ~8 MiB times this number. The default is the number
 of CPU cores.
 
-For mount options, see the fuse(8) manual page. Additional mount options
-supported by borg:
+For FUSE configuration and mount options, see the mount.fuse(8) manual page.
 
+Additional mount options supported by borg:
 - allow_damaged_files: by default damaged files (where missing chunks were
   replaced with runs of zeros by borg check --repair) are not readable and
   return EIO (I/O error). Set this option to read such files.
+- ignore_permissions: for security reasons the "default_permissions" mount
+  option is internally enforced by borg. "ignore_permissions" can be given
+  to not enforce "default_permissions".
 
 When the daemonized process receives a signal or crashes, it does not unmount.
 Unmounting in these cases could cause an active rsync or similar process