From b5731c55b77e4e73438ceaa9098ec760c6a2a469 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 23 Mar 2023 03:14:27 +0000 Subject: [PATCH] web: Save two 301 redirects from /privacy to /privacy/ to /policies/privacy. --- help/gdpr-compliance.md | 2 +- templates/corporate/policies/terms-before-2022.md | 2 +- .../documentation_crawler/spiders/check_help_documentation.py | 4 ++-- zerver/tests/test_docs.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/help/gdpr-compliance.md b/help/gdpr-compliance.md index 6c8fd997c5..3a94e6a593 100644 --- a/help/gdpr-compliance.md +++ b/help/gdpr-compliance.md @@ -2,7 +2,7 @@ This page covers how Zulip interacts with the EU's landmark GDPR legislation; you can read the -[Zulip Cloud privacy policy](https://zulip.com/privacy) for our +[Zulip Cloud privacy policy](https://zulip.com/policies/privacy) for our general privacy policies. ## What is GDPR? diff --git a/templates/corporate/policies/terms-before-2022.md b/templates/corporate/policies/terms-before-2022.md index 61a9fe4aa3..bd87007389 100644 --- a/templates/corporate/policies/terms-before-2022.md +++ b/templates/corporate/policies/terms-before-2022.md @@ -60,7 +60,7 @@ If you learn of any unauthorized use of your password or account, contact ### Privacy and Copyright Protection -The Kandra Labs [privacy policy](/privacy) explains how we treat your +The Kandra Labs [privacy policy](/policies/privacy) explains how we treat your personal data and protect your privacy when you use our Services. By using our Services, you agree that Kandra Labs can use such data in accordance with our privacy policy. diff --git a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py index ec976151c8..5d47853686 100644 --- a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py +++ b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py @@ -43,7 +43,7 @@ class HelpDocumentationSpider(UnusedImagesLinterSpider): name = "help_documentation_crawler" start_urls = ["http://localhost:9981/help"] deny_domains: List[str] = [] - deny = ["/privacy"] + deny = ["/policies/privacy"] images_path = "static/images/help" @@ -71,7 +71,7 @@ class PorticoDocumentationSpider(BaseDocumentationSpider): "http://localhost:9981/apps/", "http://localhost:9981/integrations/", "http://localhost:9981/policies/terms", - "http://localhost:9981/privacy", + "http://localhost:9981/policies/privacy", "http://localhost:9981/features", "http://localhost:9981/why-zulip", "http://localhost:9981/for/open-source", diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py index 0f59a95100..f8823db9cf 100644 --- a/zerver/tests/test_docs.py +++ b/zerver/tests/test_docs.py @@ -636,7 +636,7 @@ class PrivacyTermsTest(ZulipTestCase): self.assert_in_success_response(["Kandra Labs"], result) def test_no_nav(self) -> None: - # Test that our ?nav=0 feature of /privacy and /policies/terms, + # Test that our ?nav=0 feature of /policies/privacy and /policies/terms, # designed to comply with the Apple App Store draconian # policies that ToS/Privacy pages linked from an iOS app have # no links to the rest of the site if there's pricing