Browse Source

Merge pull request #4011 from ThomasWaldmann/remove-zeromq

remove zeromq or python 3.5 references
TW 7 years ago
parent
commit
d66c0d9eb0
2 changed files with 5 additions and 6 deletions
  1. 0 1
      docs/global.rst.inc
  2. 5 5
      docs/installation.rst

+ 0 - 1
docs/global.rst.inc

@@ -16,7 +16,6 @@
 .. _liblz4: https://github.com/Cyan4973/lz4
 .. _liblz4: https://github.com/Cyan4973/lz4
 .. _libzstd: https://github.com/facebook/zstd
 .. _libzstd: https://github.com/facebook/zstd
 .. _libb2: https://github.com/BLAKE2/libb2
 .. _libb2: https://github.com/BLAKE2/libb2
-.. _ZeroMQ: http://zeromq.org/
 .. _OpenSSL: https://www.openssl.org/
 .. _OpenSSL: https://www.openssl.org/
 .. _`Python 3`: https://www.python.org/
 .. _`Python 3`: https://www.python.org/
 .. _Buzhash: https://en.wikipedia.org/wiki/Buzhash
 .. _Buzhash: https://en.wikipedia.org/wiki/Buzhash

+ 5 - 5
docs/installation.rst

@@ -185,7 +185,7 @@ group, log out and log in again.
 Fedora / Korora
 Fedora / Korora
 +++++++++++++++
 +++++++++++++++
 
 
-.. todo:: Add zeromq, use python 3.5 or 3.6
+.. todo:: use python 3.6
 
 
 Install the dependencies with development headers::
 Install the dependencies with development headers::
 
 
@@ -199,7 +199,7 @@ Install the dependencies with development headers::
 openSUSE Tumbleweed / Leap
 openSUSE Tumbleweed / Leap
 ++++++++++++++++++++++++++
 ++++++++++++++++++++++++++
 
 
-.. todo:: Add zeromq, use python 3.5 or 3.6
+.. todo:: use python 3.6
 
 
 Install the dependencies automatically using zypper::
 Install the dependencies automatically using zypper::
 
 
@@ -216,7 +216,7 @@ Alternatively, you can enumerate all build dependencies in the command line::
 Mac OS X
 Mac OS X
 ++++++++
 ++++++++
 
 
-.. todo:: Add zeromq, use python 3.5 or 3.6
+.. todo:: use python 3.6
 
 
 Assuming you have installed homebrew_, the following steps will install all the
 Assuming you have installed homebrew_, the following steps will install all the
 dependencies::
 dependencies::
@@ -236,7 +236,7 @@ FUSE for OS X, which is available via github_, or via homebrew::
 FreeBSD
 FreeBSD
 ++++++++
 ++++++++
 
 
-.. todo:: Add zeromq, use python 3.5 or 3.6
+.. todo:: use python 3.6
 
 
 Listed below are packages you will need to install Borg, its dependencies,
 Listed below are packages you will need to install Borg, its dependencies,
 and commands to make FUSE work for using the mount command.
 and commands to make FUSE work for using the mount command.
@@ -268,7 +268,7 @@ Cygwin
 .. note::
 .. note::
     Running under Cygwin is experimental and has not been tested much yet.
     Running under Cygwin is experimental and has not been tested much yet.
 
 
-.. todo:: Add zeromq, use python 3.5 or 3.6
+.. todo:: use python 3.6
 
 
 Use the Cygwin installer to install the dependencies::
 Use the Cygwin installer to install the dependencies::