From 673d6b10b3b796c23f847b7826df11b7cb815e35 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 24 Oct 2015 13:20:26 +0000 Subject: [PATCH 1/4] Revert old install warning (fixes #1044) --- docs/using.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/using.rst b/docs/using.rst index 879ea49c4..bcbbc20d8 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -35,9 +35,13 @@ To install and run the client you just need to type: ``letsencrypt``. ``letsencrypt-auto`` is a wrapper which installs virtualized dependencies and provides automated updates during the beta program) -.. warning:: Please do **not** use ``python setup.py install`` or ``sudo pip install`. - Those mode of operation might corrupt your operating system and is - **not supported** by the Let's Encrypt team! +.. warning:: Please do **not** use ``python setup.py install``. Please + do **not** attempt the installation commands as + superuser/root and/or without Virtualenv_, e.g. ``sudo + python setup.py install``, ``sudo pip install``, ``sudo + ./venv/bin/...``. These modes of operation might corrupt + your operating system and are **not supported** by the + Let's Encrypt team! The ``letsencrypt`` commandline tool has a builtin help: From 0a6c61551ccfd51b2d082cdcdf3e4a5102d49f16 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 24 Oct 2015 13:22:46 +0000 Subject: [PATCH 2/4] Warn against pip install, rewrap. --- docs/using.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/using.rst b/docs/using.rst index bcbbc20d8..995a4c83a 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -35,13 +35,13 @@ To install and run the client you just need to type: ``letsencrypt``. ``letsencrypt-auto`` is a wrapper which installs virtualized dependencies and provides automated updates during the beta program) -.. warning:: Please do **not** use ``python setup.py install``. Please - do **not** attempt the installation commands as - superuser/root and/or without Virtualenv_, e.g. ``sudo - python setup.py install``, ``sudo pip install``, ``sudo - ./venv/bin/...``. These modes of operation might corrupt - your operating system and are **not supported** by the - Let's Encrypt team! +.. warning:: Please do **not** use ``python setup.py install`` or + ``python pip install .``. Please do **not** attempt the + installation commands as superuser/root and/or without Virtualenv_, + e.g. ``sudo python setup.py install``, ``sudo pip install``, ``sudo + ./venv/bin/...``. These modes of operation might corrupt your + operating system and are **not supported** by the Let's Encrypt + team! The ``letsencrypt`` commandline tool has a builtin help: From b021b28bca086b71cc225bf52c85ae3fff1ae720 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 24 Oct 2015 13:23:23 +0000 Subject: [PATCH 3/4] Remove link for Virtualenv --- docs/using.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/using.rst b/docs/using.rst index 995a4c83a..1e94ab21e 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -37,11 +37,11 @@ dependencies and provides automated updates during the beta program) .. warning:: Please do **not** use ``python setup.py install`` or ``python pip install .``. Please do **not** attempt the - installation commands as superuser/root and/or without Virtualenv_, - e.g. ``sudo python setup.py install``, ``sudo pip install``, ``sudo - ./venv/bin/...``. These modes of operation might corrupt your - operating system and are **not supported** by the Let's Encrypt - team! + installation commands as superuser/root and/or without virtual + environment, e.g. ``sudo python setup.py install``, ``sudo pip + install``, ``sudo ./venv/bin/...``. These modes of operation might + corrupt your operating system and are **not supported** by the + Let's Encrypt team! The ``letsencrypt`` commandline tool has a builtin help: From 0fb8cb5074c8ab0fef510f97402ce20ea68fd142 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Sat, 24 Oct 2015 13:24:44 +0000 Subject: [PATCH 4/4] Move install warns to section bottom --- docs/using.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/using.rst b/docs/using.rst index 1e94ab21e..fe3a26edf 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -35,6 +35,12 @@ To install and run the client you just need to type: ``letsencrypt``. ``letsencrypt-auto`` is a wrapper which installs virtualized dependencies and provides automated updates during the beta program) +The ``letsencrypt`` commandline tool has a builtin help: + +.. code-block:: shell + + ./letsencrypt-auto --help + .. warning:: Please do **not** use ``python setup.py install`` or ``python pip install .``. Please do **not** attempt the installation commands as superuser/root and/or without virtual @@ -43,12 +49,6 @@ dependencies and provides automated updates during the beta program) corrupt your operating system and are **not supported** by the Let's Encrypt team! -The ``letsencrypt`` commandline tool has a builtin help: - -.. code-block:: shell - - ./letsencrypt-auto --help - Configuration file ------------------