Marian Beermann
0971fdce8d
docs: changes: fix two rST warnings
2017-02-12 18:51:41 +01:00
Marian Beermann
847797b477
update development.rst for docs changes
2017-02-12 18:51:41 +01:00
Marian Beermann
95b69a433c
docs: usage: remove not-updated-anymore debug* files.
2017-02-12 18:51:41 +01:00
Marian Beermann
96fa1e8414
docs: define "ours" merge strategy for auto-generated files
2017-02-12 18:51:40 +01:00
Marian Beermann
1d9378f12c
man pages: generate page for subparsers, eg. borg-key(1)
...
Conflicts:
docs/man/borg-key.1
2017-02-12 15:28:59 +01:00
Marian Beermann
fa24e1f38f
man pages: add borg(1) master/intro page
2017-02-12 15:28:59 +01:00
Marian Beermann
15dfaae223
docs: create: move --exclude note to main doc
2017-02-12 15:28:59 +01:00
Marian Beermann
0710bbd40e
docs: create: move item flags to main doc
2017-02-12 15:28:58 +01:00
Marian Beermann
1d91d2699c
commit man pages
2017-02-05 15:46:46 +01:00
Marian Beermann
d6a26ca26d
docs: fix examples using borg init without -e/--encryption
2017-02-05 15:46:46 +01:00
Marian Beermann
4e0422cdf0
Move change-passphrase to the "key" group (but leave old name, too)
2017-02-04 15:10:45 +01:00
Marian Beermann
5fe32866e6
Move migrate-to-repokey to the "key" command group
2017-02-04 15:10:45 +01:00
TW
c6ea34be96
Merge pull request #2111 from ThomasWaldmann/merge-1.0-maint
...
Merge 1.0-maint
2017-02-01 12:13:37 +01:00
Leo Antunes
dd6b90fe6c
change dir_is_tagged to use os.path.exists()
...
Add --keep-exclude-tags option as alias to --keep-tag-files and
deprecate the later. Also make tagging accept directories as tags,
allowing things like `--exclude-if-present .git`.
fixes #1999
2017-01-29 18:13:51 +01:00
Thomas Waldmann
e19537ff6f
ran build_usage
2017-01-29 05:54:25 +01:00
Thomas Waldmann
c0dc644ef6
Merge branch '1.0-maint' into merge-1.0-maint
...
# Conflicts:
# MANIFEST.in
# Vagrantfile
# docs/changes.rst
# docs/usage/mount.rst.inc
# src/borg/archiver.py
# src/borg/fuse.py
# src/borg/repository.py
2017-01-29 05:49:53 +01:00
Thomas Waldmann
e6c1931d47
ran build_usage
2017-01-28 23:36:56 +01:00
Thomas Waldmann
dc3492642d
update CHANGES (1.0-maint)
2017-01-28 23:26:25 +01:00
Marian Beermann
fbaefc98c9
docs: add CVE numbers for issues fixed in 1.0.9
...
https://www.cvedetails.com/product/35461/Borg-Borg.html?vendor_id=16008
2017-01-27 11:58:08 +01:00
Thomas Waldmann
e32503b84c
ran setup.py build_usage
2017-01-15 02:10:55 +01:00
Thomas Waldmann
1845074b2e
update CHANGES (master)
2017-01-15 02:10:55 +01:00
Thomas Waldmann
740312f725
Merge branch '1.0-maint' into merge-1.0-maint
...
# Conflicts:
# requirements.d/development.txt
# tox.ini
2017-01-15 01:15:04 +01:00
Thomas Waldmann
9e8af73d7f
update CHANGES (1.0-maint)
2017-01-15 01:05:40 +01:00
Thomas Waldmann
70cc201377
Merge branch '1.0-maint' into merge-1.0-maint
2017-01-14 16:53:38 +01:00
Thomas Waldmann
85b3625bca
update CHANGES (1.0-maint)
2017-01-14 16:51:08 +01:00
Marian Beermann
ecad0ed53a
Merge branch '1.0-maint' into merge/1.0-maint
...
# Conflicts: ... everywhere ...
# .travis.yml
# Vagrantfile
# borg/testsuite/key.py
# docs/changes.rst
# docs/quickstart.rst
# docs/usage.rst
# docs/usage/upgrade.rst.inc
# src/borg/archive.py
# src/borg/archiver.py
# src/borg/crypto.pyx
# src/borg/helpers.py
# src/borg/key.py
# src/borg/remote.py
# src/borg/repository.py
# src/borg/testsuite/archive.py
# src/borg/testsuite/archiver.py
# src/borg/testsuite/crypto.py
# src/borg/testsuite/helpers.py
# src/borg/testsuite/repository.py
# src/borg/upgrader.py
# tox.ini
2017-01-12 15:01:41 +01:00
Thomas Waldmann
6603133344
update CHANGES (1.0-maint)
2017-01-12 03:37:52 +01:00
Marian Beermann
10f48dbd0b
Update 1.1.0b3 CHANGES
2017-01-12 02:44:04 +01:00
TW
b206aa771c
Merge pull request #2016 from ThomasWaldmann/fix-typos
...
fix typos
2017-01-12 02:27:13 +01:00
Thomas Waldmann
01090d2d40
fix typos
...
taken from debian package, thanks to danny edel and lintian for finding these.
2017-01-12 02:25:41 +01:00
enkore
53aaee3519
Merge pull request #2000 from enkore/issue/1997
...
check: fail if single archive does not exist
2017-01-12 02:08:38 +01:00
TW
1c1a289c8a
Merge pull request #2008 from ThomasWaldmann/update-1.0-changes
...
update CHANGES (1.0-maint)
2017-01-12 01:31:26 +01:00
sherbang
33be583920
Update faq.rst
2017-01-07 18:48:48 -05:00
Thomas Waldmann
69b816fe76
update CHANGES (1.0-maint)
2017-01-07 23:12:27 +01:00
Marian Beermann
be8e0c89b3
check: fail if single archive does not exist
2017-01-04 19:25:03 +01:00
Marian Beermann
7519bf8100
fix change-passphrase crashing if repository is not encrypted
2017-01-03 17:15:59 +01:00
Marian Beermann
6a5b3018c1
fix upgrade --tam crashing if repository is not encrypted
2017-01-03 17:15:32 +01:00
Marian Beermann
3e04fa972a
xattr: only skip file on BufferTooSmallError
...
redefine __str__ to get a proper error message, not ''
2017-01-03 14:25:55 +01:00
Marian Beermann
85e79f96a1
xattr: ignore empty names returned by llistxattr(2) et al
2017-01-03 12:47:42 +01:00
enkore
cf19db466d
Merge pull request #1989 from Abogical/master
...
Happy new year!
2017-01-01 01:14:08 +01:00
Abogical
f043b966da
It's 2017
2016-12-31 16:53:30 +02:00
Marian Beermann
a0abc3eb75
CHANGES: move 1.1.0b3 to correct position
2016-12-20 23:26:22 +01:00
Marian Beermann
e0e5bc4aa4
ran build_usage
2016-12-20 23:09:28 +01:00
Thomas Waldmann
c9cc97e05b
CHANGES: fix 1.0.9 release date
2016-12-20 23:06:15 +01:00
Marian Beermann
85cebd0419
Merge branch 'partial-1.0-maint' into merge/1.0-maint
2016-12-20 23:05:44 +01:00
Thomas Waldmann
880578da06
quickstart: use prune with --list
...
so people are better aware of what's happening, avoiding pitfalls
with wrong or missing --prefix.
2016-12-20 23:03:32 +01:00
Marian Beermann
d15fb241bd
check: handle duplicate archive items neatly
...
# Conflicts:
# src/borg/archive.py
2016-12-20 22:53:55 +01:00
Marian Beermann
5e1cb9d899
Add tertiary authentication for metadata (TAM)
2016-12-20 22:53:53 +01:00
Thomas Waldmann
c54a9121ae
CHANGES: fix 1.0.9 release date
2016-12-20 00:49:24 +01:00
Thomas Waldmann
3362ec319e
quickstart: use prune with --list
...
so people are better aware of what's happening, avoiding pitfalls
with wrong or missing --prefix.
2016-12-19 16:06:54 +01:00
Thomas Waldmann
580599cf32
ran build_usage
2016-12-19 04:21:13 +01:00
Thomas Waldmann
1c55930840
ran build_usage
2016-12-17 20:06:41 +01:00
Marian Beermann
f2f50efc28
check: handle duplicate archive items neatly
...
Signed-off-by: Thomas Waldmann <tw@waldmann-edv.de>
2016-12-17 20:06:41 +01:00
Marian Beermann
28ad779a6f
Add tertiary authentication for metadata (TAM)
...
Signed-off-by: Thomas Waldmann <tw@waldmann-edv.de>
2016-12-17 20:06:41 +01:00
Marian Beermann
a9db2a2e55
Merge branch '1.0-maint' into master
...
# Conflicts:
# src/borg/archive.py
# src/borg/archiver.py
# src/borg/helpers.py
2016-12-17 13:26:28 +01:00
enkore
49c05719d8
Merge pull request #1941 from enkore/issue/1936
...
Fix some clock problems
2016-12-17 13:20:56 +01:00
Marian Beermann
445365b3ff
update changes
2016-12-17 12:00:25 +01:00
Thomas Waldmann
6b6ddecd93
document windows 10 linux subsystem install
...
also add note about remote repos being broken on cygwin.
2016-12-17 00:25:49 +01:00
Thomas Waldmann
82cd1fd392
run setup.py build_usage
2016-12-14 03:42:38 +01:00
Thomas Waldmann
c855c687eb
Merge branch '1.0-maint'
2016-12-14 03:33:53 +01:00
TW
60bbd7a944
update CHANGES (1.0-maint) ( #1954 )
2016-12-14 01:29:43 +01:00
Marian Beermann
9147c7038b
update 1.1 beta CHANGES
2016-12-11 15:18:52 +01:00
Thomas Waldmann
09b1079b18
update CHANGES (master / 1.1 beta)
2016-12-11 06:20:10 +01:00
Thomas Waldmann
bd8b4a4489
update CHANGES (1.0-maint)
2016-12-09 04:42:23 +01:00
Marian Beermann
288cac788c
setup.py: build_usage: don't generate includes for debug commands
2016-12-02 13:28:49 +01:00
Thomas Waldmann
a100fb67eb
Merge branch '1.0-maint' into merge-1.0-maint
...
# Conflicts:
# AUTHORS
# src/borg/archive.py
# src/borg/key.py
2016-11-30 05:38:04 +01:00
Thomas Waldmann
d6d3f275df
docs: add python3-devel as a dependency for cygwin-based installation
2016-11-30 02:50:20 +01:00
Marian Beermann
c3a2dc5f55
Rename BORG_NONCES_DIR to BORG_SECURITY_DIR
2016-11-29 17:43:06 +01:00
Thomas Waldmann
4746d20534
ran build_usage
...
had merge conflicts in the usage files, decided to just recreate them afterwards.
2016-11-28 02:25:56 +01:00
Thomas Waldmann
c83a124e65
Merge branch '1.0-maint' (into master)
2016-11-28 02:23:32 +01:00
TW
2780a83452
Merge pull request #1885 from jcrben/patch-1
...
Clarify extract is relative to current directory
2016-11-27 20:41:39 +01:00
Ben Creasy
a49fc6faf5
Clarify extract is relative to current directory
...
I'm still hoping that a destination switch can be added (requested long ago in https://github.com/jborg/attic/issues/195 ), but in the meantime this may help. I'm guessing this clobbers any existing files.
2016-11-27 11:35:36 -08:00
Marian Beermann
bf3a1f0c33
docs/usage: fix literal/emph without end-string (two instances)
2016-11-27 20:18:27 +01:00
Marian Beermann
a2505517ee
FAQ: fix link to changelog
2016-11-27 20:15:05 +01:00
Thomas Waldmann
5de31f57e5
ran build_usage
2016-11-27 02:33:57 +01:00
Thomas Waldmann
91fa568d5e
add note about issue #1837
2016-11-27 02:22:33 +01:00
Thomas Waldmann
bd0e14040e
move "important notes" to own section
2016-11-27 02:22:28 +01:00
Thomas Waldmann
cc15806766
update CHANGES (1.0-maint)
2016-11-27 02:21:14 +01:00
Thomas Waldmann
30d1e21e53
fixup: fixes, clarify
2016-11-26 20:49:39 +01:00
Thomas Waldmann
76c5f1a258
add more details about resource usage
2016-11-26 04:34:01 +01:00
Thomas Waldmann
0a0b913739
implement BORG_NEW_PASSPHRASE, fixes #1768
2016-11-24 23:43:27 +01:00
Thomas Waldmann
c8b58e0fd8
improve cache / index docs, esp. files cache docs, fixes #1825
2016-11-24 01:53:23 +01:00
Thomas Waldmann
5fe5b6b339
docs: different pattern matching for --exclude, fixes #1779
2016-11-19 22:26:07 +01:00
Thomas Waldmann
d8e806aac1
docs: datetime formatting examples for {now} placeholder, fixes #1822
2016-11-19 22:04:13 +01:00
Thomas Waldmann
3d174aef35
docs: clarify passphrase mode attic repo upgrade, fixes #1854
2016-11-19 21:52:11 +01:00
Thomas Waldmann
d7284a92f0
docs: clarify --umask usage, fixes #1859
2016-11-19 21:38:13 +01:00
Thomas Waldmann
afab1cc9b0
Merge branch '1.0-maint'
...
# Conflicts:
# borg/platform.py
# src/borg/archiver.py
# src/borg/helpers.py
# src/borg/platform/darwin.pyx
# src/borg/platform/freebsd.pyx
# src/borg/platform/linux.pyx
# src/borg/testsuite/__init__.py
2016-11-17 23:56:34 +01:00
Thomas Waldmann
e17fe2b295
borg umount, fixes #1855
...
this refactors umount code we already used for the testsuite into the platform module's namespace.
also, it exposes that functionality via the cli api, so users can use it via "borg umount <mountpoint>",
which is more consistent than using borg to mount and fusermount -u (or umount) to un-mount.
2016-11-17 20:16:28 +01:00
Abdel-Rahman
9cf4846c27
Typo
2016-11-15 00:11:32 +02:00
Thomas Waldmann
c81f861ba6
developers docs: clarify how to choose PR target branch
2016-11-14 03:26:39 +01:00
Marian Beermann
c2eb2539b9
Document maintenance merge command
2016-11-13 16:07:06 +01:00
enkore
223f7890fe
Merge pull request #1819 from enkore/issue/1800
...
Add BLAKE2b key types
2016-11-11 03:11:38 +01:00
Marian Beermann
a31ca4f022
crypto: link against system libb2, if possible
2016-11-11 03:08:11 +01:00
Marian Beermann
05a52ec8ec
Merge branch '1.0-maint' into merge/1.0-maint
2016-11-09 23:56:54 +01:00
TW
94ff4959ee
Merge pull request #1808 from anarcat/restore-size
...
restore normal size
2016-11-05 02:37:43 +01:00
Antoine Beaupré
adfd66d636
restore normal size
...
otherwise code examples overflow
2016-11-04 21:27:21 -04:00
Antoine Beaupré
057ad07d4b
fix a heading that was incorrectly set
2016-11-04 21:16:41 -04:00
Antoine Beaupré
ec0ef2eaca
remove third level headings, too verbose
2016-11-04 21:15:31 -04:00
Antoine Beaupré
af23eea39d
fix levels in authors section
...
that way in the TOC, it doesn't look like borg authors are attic
2016-11-04 21:14:59 -04:00
Antoine Beaupré
19ae2a7870
add FAQ about security
2016-11-04 20:58:27 -04:00
Antoine Beaupré
b4d0388785
move security verification to support section
...
the rationale is to simplify the README file to the bare
minimum. security researchers will be able to find the contact
information if they look minimally and people installing the software
will find a link where relevant (in binary releases only, since all
the others have other trust paths)
2016-11-04 20:58:27 -04:00
Antoine Beaupré
aeb10d1a85
show URLs in PDF, better font
2016-11-04 16:01:18 -04:00
Antoine Beaupré
5def2350d0
fix PDF rendering structure
...
without those changes, all of the toctree document headings do not
show up. they are considered to be "below" the last heading of the
README file.
we also remove the "Notes" section from the readme as there is only
one note, regarding the fork.
we introduce a stub "introduction" element in the toctree, otherwise
it is impossible for the PDF rendered to render the README correctly.
this is to workaround a bug in the PDF renderer.
2016-11-04 16:01:18 -04:00
Antoine Beaupré
18f3d64e4c
PDF docs: add logo and fix authors
...
the PDF documentation looks much better with those
2016-11-04 15:59:55 -04:00
Antoine Beaupré
7f9a147e46
move fork differences to FAQ
...
it seems now that the fork is more of historical value than a current
thing. people interested in the differences between borg and attic can
look in the FAQ, but I do not see why this is present in the README.
a new section regarding compatibility is created to keep that warning
in place.
2016-11-04 12:34:41 -04:00
Antoine Beaupré
c8c0495724
faster quickstart
...
move the note about free space after the step by step example. it is
unlikely that users will hit out of space conditions on their first
run, and at the end of the example, they will see the not anyways.
this is to make the documentation less scary for new users and easier
to use.
2016-11-03 14:17:55 -04:00
Thomas Waldmann
8a15916284
Merge branch '1.0-maint' into merge-1.0-maint
...
# Conflicts:
# docs/changes.rst
# docs/usage/help.rst.inc
# src/borg/cache.py
# src/borg/remote.py
# src/borg/testsuite/__init__.py
# src/borg/testsuite/archiver.py
2016-10-31 18:24:13 +01:00
Thomas Waldmann
84637322f2
ran build_usage
2016-10-29 01:58:21 +02:00
TW
89c31d6b44
Merge pull request #1763 from ThomasWaldmann/update-1.0-changes
...
update CHANGES (1.0-maint)
2016-10-29 01:44:39 +02:00
Thomas Waldmann
20f4a1f478
update CHANGES (1.0-maint)
2016-10-29 01:18:55 +02:00
Thomas Waldmann
a16c7d8e16
mention file://
2016-10-28 05:04:23 +02:00
Thomas Waldmann
11e9780393
quickstart: add a comment about other (remote) filesystems
2016-10-28 04:57:15 +02:00
Thomas Waldmann
e0298b2932
simplify quickstart
...
only give one possible ssh url syntax, all others are documented in usage chapter.
2016-10-28 04:51:46 +02:00
Thomas Waldmann
ca15cc80e5
document repo URLs / archive location
2016-10-28 04:43:33 +02:00
Thomas Waldmann
9b9179312d
ssh: repo url docs - fix typo
2016-10-28 03:32:37 +02:00
Thomas Waldmann
09e74af7bf
Merge branch '1.0-maint'
2016-10-24 21:41:20 +02:00
Florian Klink
88f7f8673d
docs/deployment.rst: do not use bare variables in ansible snippet
...
The current snippet throws deprecation warnings:
```
[DEPRECATION WARNING]: Using bare variables is deprecated. Update your
playbooks so that the environment value uses the full variable syntax
('{{auth_users}}').
This feature will be removed in a future
release. Deprecation warnings can be disabled by setting
deprecation_warnings=False in ansible.cfg.
```
2016-10-24 02:34:28 +02:00
Thomas Waldmann
d363907b5a
document BORG_NONCES_DIR, fixes #1592
2016-10-21 04:15:33 +02:00
Thomas Waldmann
c000eb8083
add clarification about append-only mode, fixes #1689
2016-10-19 02:31:39 +02:00
Thomas Waldmann
3550b24ed9
ran build_usage
2016-10-17 03:59:47 +02:00
Thomas Waldmann
b3133f6394
update api.rst
2016-10-17 03:58:22 +02:00
Thomas Waldmann
4d7af95ad2
update 1.0 CHANGES
2016-10-17 03:50:47 +02:00
Thomas Waldmann
b0cc4fd74a
Merge branch '1.0-maint' into merge-1.0-maint
2016-10-13 19:10:04 +02:00
Thomas Waldmann
b88e82d99d
remove debug-xxx commands, fixes #1627
...
we use "debug xxx" subcommands now. docs updated.
also makes "borg help" shorter as not all debug-xxx commands
show up, but just 1 main "debug" command.
2016-10-10 00:22:01 +02:00
Marian Beermann
573cb616d3
deployment: synthesize alternative --restrict-to-path example
2016-10-06 01:00:07 +02:00
Simon Heath
cf1c73b4f9
Added docs explaining multiple --restrict-to-path flags, with example (take 2)
2016-10-03 09:25:48 +02:00
enkore
ce72d24825
Clarify FAQ regarding backup of virtual machines ( #1672 )
2016-10-02 20:11:34 +02:00
Thomas Waldmann
e6241cce12
update CHANGES
2016-10-01 18:45:52 +02:00
Thomas Waldmann
f57feb121d
fix module names in api.rst
2016-10-01 18:29:45 +02:00
Thomas Waldmann
0411512750
ran build_usage
2016-10-01 18:23:36 +02:00
Thomas Waldmann
4c01857461
Merge branch '1.0-maint' into merge-1.0-maint
2016-09-30 23:42:48 +02:00
Thomas Waldmann
a65707beb8
add more specific warning about write-access debug commands
2016-09-30 21:09:02 +02:00
Thomas Waldmann
f47f7cec89
update CHANGES (master / 1.1)
2016-09-30 15:21:23 +02:00
Thomas Waldmann
e124f3c67b
update CHANGES
2016-09-29 17:16:57 +02:00
Thomas Waldmann
2a864be84f
Merge branch '1.0-maint' into merge-1.0-maint
...
# Conflicts:
# setup.py
# src/borg/archiver.py
# src/borg/helpers.py
2016-09-27 21:31:41 +02:00
textshell
b84014e7d9
archiver: Add documentation for "key export" and "key import" commands. ( #1641 )
...
archiver: Add documentation for "key export" and "key import" commands
2016-09-27 15:24:31 +02:00
Martin Hostettler
4f9f25db02
development.rst: Add sphinx_rtd_theme to the sphinx install command
...
It’s used by default, so install it as well.
2016-09-25 21:45:15 +02:00
Thomas Waldmann
28c57f98c9
Merge branch '1.0-maint'
...
# Conflicts:
# src/borg/archive.py
# src/borg/archiver.py
# src/borg/helpers.py
# src/borg/testsuite/archiver.py
2016-09-25 17:30:55 +02:00
Stefano Probst
deadc81729
Fix inconsistency in FAQ
...
The script in the FAQ is named pv-wrapper. But in the variable export pv-wrapper.sh was used.
2016-09-17 09:14:01 +02:00
Thomas Waldmann
2aa06533a3
fixup: typo in development.rst
2016-09-14 02:59:52 +02:00
Thomas Waldmann
1287d1ae92
Merge branch '1.0-maint' into merge-1.0-maint
...
# Conflicts:
# docs/development.rst
# src/borg/archive.py
# src/borg/archiver.py
# src/borg/hashindex.pyx
# src/borg/testsuite/hashindex.py
2016-09-14 02:53:41 +02:00
Thomas Waldmann
b2e389e0a0
docs: add contribution guidelines
2016-09-08 19:40:32 +02:00
Thomas Waldmann
f70008238a
link reference docs and faq about BORG_FILES_CACHE_TTL, fixes #1561
2016-09-03 19:23:59 +02:00
Thomas Waldmann
83c99943c3
ran build_usage
2016-08-28 00:17:24 +02:00
Thomas Waldmann
6dd29cfb1e
ran build_api, reorder as in 1.0
2016-08-28 00:16:19 +02:00
Thomas Waldmann
3f159ba18a
update CHANGES
2016-08-28 00:03:16 +02:00
Thomas Waldmann
1f04820d9d
fuse: implement versions view
...
all archives, all items are read to build a unified view.
files are represented by a same-name directory with the versions of the file.
A filename suffix computed by adler32(chunkids) is used to disambiguate the versions.
also: refactor code a little, create methods for leaves, inner nodes.
2016-08-27 23:17:57 +02:00
Marian Beermann
e0b9aede29
update changes (1.1.0b1)
2016-08-27 22:43:41 +02:00
Thomas Waldmann
1974824595
Merge branch '1.0-maint'
2016-08-26 20:47:23 +02:00
sven
248ccf0149
Update borg.css
2016-08-23 15:01:39 +02:00
