X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=doc%2Finstall.rst;h=5d6802b0ae25bf7b4d16fc34f60982347caec507;hb=11cdf11960823bae2e68dcfcb355e222ccda5af7;hp=d1e1325b7cd1639a974a286c57b61e80a84787a1;hpb=68a25098792fe4291486e2ba5726f8062565cfad;p=pyderasn.git

diff --git a/doc/install.rst b/doc/install.rst
index d1e1325..5d6802b 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -2,23 +2,29 @@ Install
 =======
 
 Preferable way is to :ref:`download <download>` tarball with the
-signature from `official website <http://pyderasn.cypherpunks.ru/>`__::
+signature from `official website <http://www.pyderasn.cypherpunks.ru/>`__::
 
-    % wget http://pyderasn.cypherpunks.ru/pyderasn-1.0.tar.xz
-    % wget http://pyderasn.cypherpunks.ru/pyderasn-1.0.tar.xz.sig
-    % gpg --verify pyderasn-1.0.tar.xz.sig pyderasn-1.0.tar.xz
-    % xz -d < pyderasn-1.0.tar.xz | tar xf -
-    % cd pyderasn-1.0
-    % python setup.py install
-    # or copy pyderasn.py (+six.py) to your PYTHONPATH
+    $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/download/pyderasn-8.4.tar.xz
+    $ [fetch|wget] http://www.pyderasn.cypherpunks.ru/download/pyderasn-8.4.tar.xz.sig
+    $ gpg --verify pyderasn-8.4.tar.xz.sig pyderasn-8.4.tar.xz
+    $ xz --decompress --stdout pyderasn-8.4.tar.xz | tar xf -
+    $ cd pyderasn-8.4
+    $ python setup.py install
+    # or copy pyderasn.py (+six.py, possibly termcolor.py) to your PYTHONPATH
 
-PyDERASN depends on `six <https://pypi.python.org/pypi/six>`__ package
+PyDERASN depends on `six <https://pypi.org/project/six/>`__ package
 for keeping compatibility with Py27/Py35. It is included in the tarball.
 You can also find it mirrored on :ref:`download <download>` page.
+``termcolor`` is an optional dependency used for output colourizing.
+``urwid`` is an optional dependency used for :ref:`interactive browser <browser>`.
 
-You could use PIP (**no** authentication is performed!)::
+You could use pip (**no** OpenPGP authentication is performed!) with PyPI::
 
-    % pip install pyderasn
+    $ cat > requirements.txt <<EOF
+    pyderasn==8.4 --hash=sha256:TO-BE-FILLED
+    six==1.15.0 --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259
+    EOF
+    $ pip install --requirement requirements.txt
 
 You have to verify downloaded tarballs integrity and authenticity to be
 sure that you retrieved trusted and untampered software. `GNU Privacy
@@ -34,9 +40,7 @@ resources.
           2ED6 C846 3051 02DF 5B4E  0383 04A9 33D1 BA20 327A
     uid   PyDERASN releases <pyderasn@cypherpunks.ru>
 
-    % gpg --keyserver hkp://keys.gnupg.net/ --recv-keys 0x04A933D1BA20327A
-    % gpg --auto-key-locate dane --locate-keys pyderasn at cypherpunks dot ru
-    % gpg --auto-key-locate wkd --locate-keys pyderasn at cypherpunks dot ru
-    % gpg --auto-key-locate pka --locate-keys pyderasn at cypherpunks dot ru
+    $ gpg --auto-key-locate dane --locate-keys pyderasn at cypherpunks dot ru
+    $ gpg --auto-key-locate wkd --locate-keys pyderasn at cypherpunks dot ru
 
 .. literalinclude:: ../PUBKEY.asc