summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-12-13 14:55:25 +0000
committerErik Johnston <erik@matrix.org>2023-12-13 15:02:08 +0000
commit230decd5b8deea78674f92b2c0c11bd41090470a (patch)
tree70b2dd47f1a2b9be8b18707253cf5a79c17b0602
parentUpdate README.rst (diff)
downloadsynapse-230decd5b8deea78674f92b2c0c11bd41090470a.tar.xz
Revert changes to README
-rw-r--r--README.rst17
-rw-r--r--synapse/__init__.py12
2 files changed, 4 insertions, 25 deletions
diff --git a/README.rst b/README.rst
index e1fe2fdc18..4a90429647 100644
--- a/README.rst
+++ b/README.rst
@@ -2,19 +2,10 @@
 Synapse |support| |development| |documentation| |license| |pypi| |python|
 =========================================================================
 
-Synapse is now actively maintained at `element-hq/synapse <https://github.com/element-hq/synapse>`_
-=================================================================================================
-
-Synapse is an open-source `Matrix <https://matrix.org/>`_ homeserver developed
-from 2019 through 2023 as part of the Matrix.org Foundation. The Matrix.org
-Foundation is not able to resource maintenance of Synapse and it
-`continues to be developed by Element <https://github.com/element-hq/synapse>`_;
-additionally you have the choice of `other Matrix homeservers <https://matrix.org/ecosystem/servers/>`_.
-
-See `The future of Synapse and Dendrite <https://matrix.org/blog/2023/11/06/future-of-synapse-dendrite/>`_
-blog post for more information.
-
-=========================================================================
+Synapse is an open-source `Matrix <https://matrix.org/>`_ homeserver written and
+maintained by the Matrix.org Foundation. We began rapid development in 2014,
+reaching v1.0.0 in 2019. Development on Synapse and the Matrix protocol itself continues
+in earnest today.
 
 Briefly, Matrix is an open standard for communications on the internet, supporting
 federation, encryption and VoIP. Matrix.org has more to say about the `goals of the
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e21ba6e186..4a9bbc4d57 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -29,18 +29,6 @@ from synapse.util.stringutils import strtobool
 # Allow truncated JPEG images to be thumbnailed.
 ImageFile.LOAD_TRUNCATED_IMAGES = True
 
-# Update your remotes folks.
-announcement = """
-Synapse is no longer being developed under the matrix-org organization. See the
-README.rst for more details.
-
-Please update your git remote to pull from element-hq/synapse:
-
-   git remote set-url origin git@github.com:element-hq/synapse.git
-"""
-print(announcement)
-sys.exit(1)
-
 # Check that we're not running on an unsupported Python version.
 #
 # Note that we use an (unneeded) variable here so that pyupgrade doesn't nuke the