From 2c3f3f1b07253371795a14d7674d1693d4355f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Sun, 15 Nov 2015 22:20:07 -0500 Subject: [PATCH 1/4] install docs: don't use "from" twice it always abstracts "pypi" and "github" away (technical words that are not necessary). pip remains. --- docs/installation.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 33816144f..7a3f40500 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -159,8 +159,8 @@ In case the creation of the virtual environment fails, try deleting this file:: .. _pip-installation: -From PyPi / using pip -~~~~~~~~~~~~~~~~~~~~~ +Using pip +~~~~~~~~~ Virtualenv_ can be used to build and install |project_name| without affecting the system Python or requiring root access. Using a virtual environment is @@ -189,8 +189,8 @@ activating your virtual environment:: .. _git-installation: -From Github / using git -~~~~~~~~~~~~~~~~~~~~~~~ +Using git +~~~~~~~~~ This uses latest, unreleased development code from git. While we try not to break master, there are no guarantees on anything. :: From d78d6d60b1de5db53b8972a6c9b70cb3dc6dac8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Sun, 15 Nov 2015 22:40:00 -0500 Subject: [PATCH 2/4] turn distro list into a table, adding Debian, Ubuntu, OSX --- docs/installation.rst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 7a3f40500..f2959c035 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -29,9 +29,19 @@ package which can be installed with the package manager. As |project_name| is still a young project, such a package might be not available for your system yet. -* On **Arch Linux**, there is a package available in the AUR_. +================ ===================== ======= +Operating system Source Command +================ ===================== ======= +Arch Linux AUR_ +Debian `unstable/sid`_ ``apt install borgbackup`` +Ubuntu `Xenial Xerus 15.04`_ ``apt install borgbackup`` +OS X `Brew cask`_ ``brew cask install borgbackup`` +================ ===================== ======= .. _AUR: https://aur.archlinux.org/packages/borgbackup/ +.. _unstable/sid: https://packages.debian.org/sid/borgbackup +.. _Xenial Xerus 15.04: https://launchpad.net/ubuntu/xenial/+source/borgbackup +.. _Brew cask: http://caskroom.io/ Please ask package maintainers to build a package or, if you can package / submit it yourself, please help us with that! See :issue:`105` on From 3bbd3319a441551e07b12ececba93cd6398a8e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Sun, 15 Nov 2015 22:42:49 -0500 Subject: [PATCH 3/4] use 'distribution' more consistently --- docs/installation.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index f2959c035..d7af18691 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -7,7 +7,7 @@ Installation There are different ways to install |project_name|: - :ref:`distribution-package` - easy and fast if a package is - available from your distribution / for your operating system. + available from your distribution. - :ref:`pyinstaller-binary` - easy and fast, we provide a ready-to-use binary file that comes bundled with all dependencies. - :ref:`source-install`, either: @@ -24,19 +24,19 @@ There are different ways to install |project_name|: Distribution Package -------------------- -Some Linux and BSD distributions might offer a ready-to-use ``borgbackup`` +Some distributions might offer a ready-to-use ``borgbackup`` package which can be installed with the package manager. As |project_name| is still a young project, such a package might be not available for your system yet. -================ ===================== ======= -Operating system Source Command -================ ===================== ======= -Arch Linux AUR_ -Debian `unstable/sid`_ ``apt install borgbackup`` -Ubuntu `Xenial Xerus 15.04`_ ``apt install borgbackup`` -OS X `Brew cask`_ ``brew cask install borgbackup`` -================ ===================== ======= +============ ===================== ======= +Distribution Source Command +============ ===================== ======= +Arch Linux AUR_ +Debian `unstable/sid`_ ``apt install borgbackup`` +Ubuntu `Xenial Xerus 15.04`_ ``apt install borgbackup`` +OS X `Brew cask`_ ``brew cask install borgbackup`` +============ ===================== ======= .. _AUR: https://aur.archlinux.org/packages/borgbackup/ .. _unstable/sid: https://packages.debian.org/sid/borgbackup From 917236231f452901cf00a278ff763a7cbe5a7977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Mon, 16 Nov 2015 09:07:59 -0500 Subject: [PATCH 4/4] correct ubuntu release number --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index d7af18691..c6eb149be 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -34,7 +34,7 @@ Distribution Source Command ============ ===================== ======= Arch Linux AUR_ Debian `unstable/sid`_ ``apt install borgbackup`` -Ubuntu `Xenial Xerus 15.04`_ ``apt install borgbackup`` +Ubuntu `Xenial Xerus 16.04`_ ``apt install borgbackup`` OS X `Brew cask`_ ``brew cask install borgbackup`` ============ ===================== =======