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
..
_static
borg_theme/css
misc
usage	run setup.py build_usage	2016-12-14 03:42:38 +01:00
api.rst	Merge branch '1.0-maint'	2016-10-24 21:41:20 +02:00
authors.rst	fix levels in authors section	2016-11-04 21:14:59 -04:00
book.rst	remove third level headings, too verbose	2016-11-04 21:15:31 -04:00
changes.rst	Merge branch '1.0-maint' into master	2016-12-17 13:26:28 +01:00
conf.py	Merge branch '1.0-maint' into merge/1.0-maint	2016-11-09 23:56:54 +01:00
deployment.rst	Merge branch '1.0-maint'	2016-10-24 21:41:20 +02:00
development.rst	Merge branch '1.0-maint'	2016-11-17 23:56:34 +01:00
faq.rst	update 1.1 beta CHANGES	2016-12-11 15:18:52 +01:00
global.rst.inc	crypto: link against system libb2, if possible	2016-11-11 03:08:11 +01:00
index.rst	fix PDF rendering structure	2016-11-04 16:01:18 -04:00
installation.rst	Merge branch '1.0-maint' into master	2016-12-17 13:26:28 +01:00
internals.rst	add more details about resource usage	2016-11-26 04:34:01 +01:00
introduction.rst	fix PDF rendering structure	2016-11-04 16:01:18 -04:00
Makefile
quickstart.rst	Merge branch '1.0-maint' (into master)	2016-11-28 02:23:32 +01:00
resources.rst
support.rst	move security verification to support section	2016-11-04 20:58:27 -04:00
usage.rst	Rename BORG_NONCES_DIR to BORG_SECURITY_DIR	2016-11-29 17:43:06 +01:00