summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:39:39 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:39:39 -0700
commita684f57379ca4dea244cdc6020ecd02455878e94 (patch)
tree6ee653deae961a3bb735fba1e1c28377c1ab383a
parentMerge commit '68cd93582' into anoa/dinsic_release_1_18_x (diff)
parentReorder database docs to promote postgresql. (#7933) (diff)
downloadsynapse-a684f57379ca4dea244cdc6020ecd02455878e94.tar.xz
Merge commit 'ff22672fd' into anoa/dinsic_release_1_18_x
* commit 'ff22672fd':
  Reorder database docs to promote postgresql. (#7933)
-rw-r--r--README.rst10
-rw-r--r--changelog.d/7933.doc1
2 files changed, 6 insertions, 5 deletions
diff --git a/README.rst b/README.rst

index 38376e23c2..f7116b3480 100644 --- a/README.rst +++ b/README.rst
@@ -188,12 +188,8 @@ Using PostgreSQL ================ Synapse offers two database engines: - * `SQLite <https://sqlite.org/>`_ * `PostgreSQL <https://www.postgresql.org>`_ - -By default Synapse uses SQLite in and doing so trades performance for convenience. -SQLite is only recommended in Synapse for testing purposes or for servers with -light workloads. + * `SQLite <https://sqlite.org/>`_ Almost all installations should opt to use PostgreSQL. Advantages include: @@ -207,6 +203,10 @@ Almost all installations should opt to use PostgreSQL. Advantages include: For information on how to install and use PostgreSQL, please see `docs/postgres.md <docs/postgres.md>`_. +By default Synapse uses SQLite and in doing so trades performance for convenience. +SQLite is only recommended in Synapse for testing purposes or for servers with +light workloads. + .. _reverse-proxy: Using a reverse proxy with Synapse diff --git a/changelog.d/7933.doc b/changelog.d/7933.doc new file mode 100644
index 0000000000..7022fd578b --- /dev/null +++ b/changelog.d/7933.doc
@@ -0,0 +1 @@ +Reorder database paragraphs to promote postgres over sqlite.