From dc05a3b9a798e426a569c5d91f6e4bbf19b9a758 Mon Sep 17 00:00:00 2001 From: Spitap Date: Tue, 17 Oct 2023 12:23:06 +0200 Subject: [PATCH] doc --- doc/installation.rst | 4 +++- doc/upgrade.rst | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index 1bb981222..15b07506e 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -49,8 +49,10 @@ if you get this warning - '/usr/bin/env: ‘python’: No such file or directory .. sourcecode:: bash - > sudo apt-get install python-virtualenv python-pip + > sudo apt-get install python3-virtualenv python3-pip +For the sake of simplicity, you can also install the ``python-is-python3`` package. +It allows you to use ``python`` command. Wait a few minutes and you're done \o/ diff --git a/doc/upgrade.rst b/doc/upgrade.rst index cbd719b57..1b9bc598f 100644 --- a/doc/upgrade.rst +++ b/doc/upgrade.rst @@ -17,8 +17,8 @@ Modoboa Most of the time, upgrading your installation to a newer Modoboa version only requires a few actions. In every case, you will need to -apply the general procedure first and then check if the version you -are installing requires specific actions. +apply the specific actions if the version you are installing requires it, +and then apply the general ones. In case you use a dedicated user and/or a virtualenv, do not forget to use them: @@ -144,15 +144,17 @@ Specific instructions * Support for Python 3.7 has been dropped, minimum Python version is now 3.8 * Support for Postgres 11 has been dropped, minimum Postgres version is now 12 -You need to change the first line in ``urls.py`` in -(``/srv/modoboa/instance/instance/urls.py`` by default): +You need to change the first line in ``urls.py`` and replace `url` with `path` (in +``/srv/modoboa/instance/instance/urls.py`` by default): .. sourcecode:: python # from django.conf.urls import include, url from django.urls import include, path -And replace `url` with `path` in the file. + urlpatterns = [ + path(r'', include('modoboa.urls')), + ] If you use Postgresql, you need to install pyscopg3+: