From 5bda90f8219a2b03d18f4762a2fd7e77ab91007c Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Thu, 23 Sep 2021 16:36:20 +1000
Subject: Update deploying docs to require Python 3.6+.

---
 docs/source/siteadmin/deploying.rst | 9 +++++----
 docs/source/siteadmin/relnotes.rst  | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 7f391660..37033efc 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -56,11 +56,12 @@ Dependencies
 
 MediaGoblin has the following core dependencies:
 
-- Python 3.4+
-- `python3-lxml <http://lxml.de/>`_
+- Python 3.6+
+- `lxml <http://lxml.de/>`_
 - `git <http://git-scm.com/>`_
-- `SQLite <http://www.sqlite.org/>`_/`PostgreSQL <http://www.postgresql.org/>`_
-- `Python Imaging Library <http://www.pythonware.com/products/pil/>`_  (PIL)
+- `SQLite <http://www.sqlite.org/>`_ or `PostgreSQL <http://www.postgresql.org/>`_
+- `Python Imaging Library <http://www.pythonware.com/products/pil/>`_
+  (PIL or Pillow)
 - `virtualenv <http://www.virtualenv.org/>`_
 - `Node.js <https://nodejs.org>`_
 
diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index ff7f9699..09513740 100644
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -33,6 +33,7 @@ This chapter has important information about our current and previous releases.
 - Fix incorrect setuptools install location for db/migrations/env.py (Elisei Roca)
 - Set videos to preload="metadata" to prevent upfront download [trac#5625] (Michael McMahon)
 - Add a "Troubleshooting" page to the documentation (Ben Sturmfels)
+- Add Ubuntu 20.04 CI build and reinstate Debian 10 CI build (Ben Sturmfels)
 
 
 0.12.0
-- 
cgit v1.2.3