From 5a7c02729674811e2bee634794fd906ad8c6fefe Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 24 Apr 2016 02:25:04 +0200 Subject: [PATCH 1/3] vagrant: OS X update osxfuse / fix lzma, fixes #933 --- Vagrantfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index cecd8341c..59ce9f5bb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -54,14 +54,15 @@ def packages_darwin # install all the (security and other) updates sudo softwareupdate --install --all # get osxfuse 3.0.x pre-release code from github: - curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.0.9/osxfuse-3.0.9.dmg >osxfuse.dmg + curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.2.0/osxfuse-3.2.0.dmg >osxfuse.dmg MOUNTDIR=$(echo `hdiutil mount osxfuse.dmg | tail -1 | awk '{$1="" ; print $0}'` | xargs -0 echo) \ - && sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for OS X 3.0.9.pkg" -target / + && sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for OS X 3.2.0.pkg" -target / sudo chown -R vagrant /usr/local # brew must be able to create stuff here ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew update brew install openssl brew install lz4 + brew install xz # required for python lzma module brew install fakeroot brew install git brew install pkgconfig From 4b73ebc613b10f2a5ed6f15dd5d99ba89d6c2f20 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 29 Apr 2016 03:19:27 +0200 Subject: [PATCH 2/3] update readthedocs urls, fixes #991 --- README.rst | 2 +- docs/resources.rst | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index c0eed00ce..2417b24d5 100644 --- a/README.rst +++ b/README.rst @@ -107,7 +107,7 @@ Now doing another backup, just to show off the great deduplication:: ----------------------------------------------------------------------------- -For a graphical frontend refer to our complementary project `BorgWeb `_. +For a graphical frontend refer to our complementary project `BorgWeb `_. Links ===== diff --git a/docs/resources.rst b/docs/resources.rst index 4113c11d4..59fa0310a 100644 --- a/docs/resources.rst +++ b/docs/resources.rst @@ -36,6 +36,6 @@ Some of them refer to attic, but you can do the same stuff (and more) with borgb Software -------- -- `BorgWeb - a very simple web UI for BorgBackup `_ +- `BorgWeb - a very simple web UI for BorgBackup `_ - some other stuff found at the `BorgBackup Github organisation `_ - `atticmatic `_ (includes borgmatic) diff --git a/setup.py b/setup.py index 23d8b7cda..ff9899da5 100644 --- a/setup.py +++ b/setup.py @@ -236,7 +236,7 @@ setup( }, author='The Borg Collective (see AUTHORS file)', author_email='borgbackup@python.org', - url='https://borgbackup.readthedocs.org/', + url='https://borgbackup.readthedocs.io/', description='Deduplicated, encrypted, authenticated and compressed backups', long_description=long_description, license='BSD', From 700e715b23eda3ef57a60bc651cabbb82f46cbf5 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 30 Apr 2016 00:32:25 +0200 Subject: [PATCH 3/3] add missing docs for borg break-lock, fixes #992 --- docs/usage.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/usage.rst b/docs/usage.rst index a9e5bda75..e14f5dfff 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -540,6 +540,9 @@ Examples no key file found for repository +.. include:: usage/break-lock.rst.inc + + Miscellaneous Help ------------------