diff --git a/.gitignore b/.gitignore index b3b6199..eec2ae4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ coverage dist .idea +_build diff --git a/src/postorius/doc/conf.py b/src/postorius/doc/conf.py index 68ee085..a86d8fd 100644 --- a/src/postorius/doc/conf.py +++ b/src/postorius/doc/conf.py @@ -101,7 +101,7 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = 'sphinx_rtd_theme' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/src/postorius/doc/deployment.rst b/src/postorius/doc/deployment.rst index d4923f0..8a8aff4 100644 --- a/src/postorius/doc/deployment.rst +++ b/src/postorius/doc/deployment.rst @@ -16,6 +16,7 @@ Below is an example uwsgi configuration file: :: + [uwsgi] chdir = /srv/django/mailman @@ -44,7 +45,7 @@ server { listen 80; # TODO Replace with your domain - server_name lists.example.com; + server_name lists.example.com; return 301 https://$server_name$request_uri; } @@ -74,7 +75,7 @@ location /static { # TODO Adjust to your static location - alias /srv/django/mailman/public/static; + alias /srv/django/mailman/public/static; } # Finally, send all non-media requests to the Django server. @@ -95,19 +96,19 @@ These settings need to be added to your Apache VirtualHost: -:: +:: Alias /static /srv/django/mailman/public/static Order deny,allow Allow from all - + WSGIScriptAlias / /srv/django/mailman/srv/postorius.wsgi Order deny,allow Allow from all - + The first Alias serves the static files (CSS, JS, Images, etc.). The WSGIScriptAlias serves the Django application. The paths need to be changed @@ -126,4 +127,4 @@ $ python manage.py compilemessages $ python manage.py collectstatic -After reloading the webserver Postorius should be running! +After reloading the webserver Postorius should be running! diff --git a/src/postorius/doc/development.rst b/src/postorius/doc/development.rst index 5dffa7f..41b4138 100644 --- a/src/postorius/doc/development.rst +++ b/src/postorius/doc/development.rst @@ -64,7 +64,7 @@ Mocking calls to Mailman's REST API ------------------------------------ +=================================== A lot of Postorius' code involves calls to Mailman's REST API (through the mailman.client library). Running these tests against a real instance @@ -154,4 +154,4 @@ For detailed information how to use mailmanclient, check out its documentation_. -.. _documentation: https://gitlab.com/mailman/mailmanclient/blob/master/src/mailmanclient/docs/using.rst +.. _documentation: http://docs.mailman3.org/projects/mailmanclient/en/latest/using.html diff --git a/src/postorius/doc/index.rst b/src/postorius/doc/index.rst index 1fa709a..74c062a 100644 --- a/src/postorius/doc/index.rst +++ b/src/postorius/doc/index.rst @@ -13,7 +13,7 @@ .. toctree:: :maxdepth: 1 - news.rst setup.rst development.rst deployment.rst + news.rst diff --git a/src/postorius/doc/news.rst b/src/postorius/doc/news.rst index 015823b..7abd555 100644 --- a/src/postorius/doc/news.rst +++ b/src/postorius/doc/news.rst @@ -2,8 +2,6 @@ News / Changelog ================ -Copyright (C) 2012-2015 by the Free Software Foundation, Inc. - The Postorius Django app provides a web user interface to access GNU Mailman.