Update email addresses for new .org domain (#7845)

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at <hello@wagtail.io>. All
+reported by contacting the project team at <hello@wagtail.org>. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

README.md

@@ -80,9 +80,9 @@ Wagtail is sponsored by [Torchbox](https://torchbox.com/). If you need help impl
 
 ### Security
 
-We take the security of Wagtail, and related packages we maintain, seriously. If you have found a security issue with any of our projects please email us at [security@wagtail.io](mailto:security@wagtail.io) so we can work together to find and patch the issue. We appreciate responsible disclosure with any security related issues, so please contact us first before creating a Github issue.
+We take the security of Wagtail, and related packages we maintain, seriously. If you have found a security issue with any of our projects please email us at [security@wagtail.org](mailto:security@wagtail.org) so we can work together to find and patch the issue. We appreciate responsible disclosure with any security related issues, so please contact us first before creating a Github issue.
 
-If you want to send an encrypted email (optional), the public key ID for security@wagtail.io is 0x6ba1e1a86e0f8ce8, and this public key is available from most commonly-used keyservers.
+If you want to send an encrypted email (optional), the public key ID for security@wagtail.org is 0x6ba1e1a86e0f8ce8, and this public key is available from most commonly-used keyservers.
 
 ### Release schedule
 

SECURITY.md

@@ -1,4 +1,4 @@
 # Security
-We take the security of Wagtail, and related packages we maintain, seriously. If you have found a security issue with any of our projects please email us at security@wagtail.io so we can work together to find and patch the issue. We appreciate responsible disclosure with any security related issues, so please contact us first before creating a Github issue.
+We take the security of Wagtail, and related packages we maintain, seriously. If you have found a security issue with any of our projects please email us at security@wagtail.org so we can work together to find and patch the issue. We appreciate responsible disclosure with any security related issues, so please contact us first before creating a Github issue.
 
-If you want to send an encrypted email (optional), the public key ID for security@wagtail.io is 0x6ba1e1a86e0f8ce8, and this public key is available from most commonly-used keyservers.
+If you want to send an encrypted email (optional), the public key ID for security@wagtail.org is 0x6ba1e1a86e0f8ce8, and this public key is available from most commonly-used keyservers.

docs/contributing/index.rst

@@ -16,7 +16,7 @@ If your bug report is a security issue, **do not** report it with an issue. Plea
 Pull requests
 ~~~~~~~~~~~~~
 
-If you're a Python or Django developer, `fork it <https://github.com/wagtail/wagtail/>`_ and read the :ref:`developing docs <developing>` to get stuck in! We welcome all contributions, whether they solve problems which are specific to you or they address existing issues. If you're stuck for ideas, pick something from the `issue list <https://github.com/wagtail/wagtail/issues?state=open>`_, or email us directly on `hello@wagtail.io <mailto:hello@wagtail.io>`_ if you'd like us to suggest something!
+If you're a Python or Django developer, `fork it <https://github.com/wagtail/wagtail/>`_ and read the :ref:`developing docs <developing>` to get stuck in! We welcome all contributions, whether they solve problems which are specific to you or they address existing issues. If you're stuck for ideas, pick something from the `issue list <https://github.com/wagtail/wagtail/issues?state=open>`_, or email us directly on `hello@wagtail.org <mailto:hello@wagtail.org>`_ if you'd like us to suggest something!
 
 For large-scale changes, we'd generally recommend breaking them down into smaller pull requests that achieve a single well-defined task and can be reviewed individually. If this isn't possible, we recommend opening a pull request on the `Wagtail RFCs <https://github.com/wagtail/rfcs/>`_ repository, so that there's a chance for the community to discuss the change before it gets implemented.
 
@@ -38,7 +38,7 @@ Translation work should be submitted through `Transifex <https://www.transifex.c
 Other contributions
 ~~~~~~~~~~~~~~~~~~~
 
-We welcome contributions to all aspects of Wagtail. If you would like to improve the design of the user interface, or extend the documentation, please submit a pull request as above. If you're not familiar with Github or pull requests, `contact us directly <mailto:hello@wagtail.io>`_ and we'll work something out.
+We welcome contributions to all aspects of Wagtail. If you would like to improve the design of the user interface, or extend the documentation, please submit a pull request as above. If you're not familiar with Github or pull requests, `contact us directly <mailto:hello@wagtail.org>`_ and we'll work something out.
 
 
 

docs/contributing/security.md

@@ -2,17 +2,17 @@
 
 ```eval_rst
 .. note::
-   Please report security issues **only** to `security@wagtail.io <mailto:security@wagtail.io>`_.
+   Please report security issues **only** to `security@wagtail.org <mailto:security@wagtail.org>`_.
 ```
 
 Most normal bugs in Wagtail are reported as [GitHub issues](https://github.com/wagtail/wagtail/issues), but due to the sensitive nature of security issues, we ask that they not be publicly reported in this fashion.
 
-Instead, if you believe you've found something in Wagtail which has security implications, please send a description of the issue via email to <security@wagtail.io>.
+Instead, if you believe you've found something in Wagtail which has security implications, please send a description of the issue via email to <security@wagtail.org>.
 Mail sent to that address reaches a subset of the core team, who can forward security issues to other core team members for broader discussion if needed.
 
 Once you've submitted an issue via email, you should receive an acknowledgement from a member of the security team within 48 hours, and depending on the action to be taken, you may receive further followup emails.
 
-If you want to send an encrypted email (optional), the public key ID for <security@wagtail.io> is `0x6ba1e1a86e0f8ce8`, and this public key is available from most commonly-used keyservers.
+If you want to send an encrypted email (optional), the public key ID for <security@wagtail.org> is `0x6ba1e1a86e0f8ce8`, and this public key is available from most commonly-used keyservers.
 
 Django security issues should be reported directly to the Django Project, following [Django\'s security policies](https://docs.djangoproject.com/en/dev/internals/security/) (upon which Wagtail\'s own policies are based).
 

docs/extending/rich_text_internals.rst

@@ -111,7 +111,7 @@ You can create custom rewrite handlers to support your own new ``linktype`` and
 
         If left undefined, a default implementation of this method will query the ``id`` model field on the class returned by ``get_model`` using the provided ``id`` attribute; this can be overridden in your own handlers should you want to use some other model field.
 
-Below is an example custom rewrite handler that implements these methods to add support for rich text linking to user email addresses. It supports the conversion of rich text tags like ``<a linktype="user" username="wagtail">`` to valid HTML like ``<a href="mailto:hello@wagtail.io">``. This example assumes that equivalent front-end functionality has been added to allow users to insert these kinds of links into their rich text editor.
+Below is an example custom rewrite handler that implements these methods to add support for rich text linking to user email addresses. It supports the conversion of rich text tags like ``<a linktype="user" username="wagtail">`` to valid HTML like ``<a href="mailto:hello@wagtail.org">``. This example assumes that equivalent front-end functionality has been added to allow users to insert these kinds of links into their rich text editor.
 
 .. code-block:: python
 

docs/support.rst

@@ -42,4 +42,4 @@ If your bug report is a security issue, **do not** report it with an issue. Plea
 Torchbox
 ~~~~~~~~
 
-Finally, if you have a query which isn't relevant for any of the above forums, feel free to contact the Wagtail team at Torchbox directly, on `hello@wagtail.io <mailto:hello@wagtail.io>`_ or `@wagtailcms <https://twitter.com/wagtailcms>`_.
+Finally, if you have a query which isn't relevant for any of the above forums, feel free to contact the Wagtail team at Torchbox directly, on `hello@wagtail.org <mailto:hello@wagtail.org>`_ or `@wagtailcms <https://twitter.com/wagtailcms>`_.

setup.py

@@ -86,7 +86,7 @@ setup(
     version=__version__,
     description='A Django content management system.',
     author='Wagtail core team + contributors',
-    author_email='hello@wagtail.io',  # For support queries, please see https://docs.wagtail.org/en/stable/support.html
+    author_email='hello@wagtail.org',  # For support queries, please see https://docs.wagtail.org/en/stable/support.html
     url='https://wagtail.org/',
     packages=find_packages(),
     include_package_data=True,

wagtail/core/tests/test_rich_text.py

@@ -158,8 +158,8 @@ class TestLinkRewriterTagReplacing(TestCase):
         # link types (email, external, anchor) even if no rules is provided
         external_type_link = rewriter('<a href="https://wagtail.org/">')
         self.assertEqual(external_type_link, '<a href="https://wagtail.org/">')
-        email_type_link = rewriter('<a href="mailto:test@wagtail.io">')
-        self.assertEqual(email_type_link, '<a href="mailto:test@wagtail.io">')
+        email_type_link = rewriter('<a href="mailto:test@wagtail.org">')
+        self.assertEqual(email_type_link, '<a href="mailto:test@wagtail.org">')
         anchor_type_link = rewriter('<a href="#test">')
         self.assertEqual(anchor_type_link, '<a href="#test">')
 
@@ -193,8 +193,8 @@ class TestLinkRewriterTagReplacing(TestCase):
         self.assertEqual(external_type_link, '<a rel="nofollow" href="https://wagtail.org/">')
         external_type_link_http = rewriter('<a href="http://wagtail.org/">')
         self.assertEqual(external_type_link_http, '<a rel="nofollow" href="http://wagtail.org/">')
-        email_type_link = rewriter('<a href="mailto:test@wagtail.io">')
-        self.assertEqual(email_type_link, '<a data-email="true" href="mailto:test@wagtail.io">')
+        email_type_link = rewriter('<a href="mailto:test@wagtail.org">')
+        self.assertEqual(email_type_link, '<a data-email="true" href="mailto:test@wagtail.org">')
         anchor_type_link = rewriter('<a href="#test">')
         self.assertEqual(anchor_type_link, '<a data-anchor="true" href="#test">')