diff --git a/templates/corporate/privacy.html b/templates/corporate/privacy.html deleted file mode 100644 index b144df0b65..0000000000 --- a/templates/corporate/privacy.html +++ /dev/null @@ -1,266 +0,0 @@ -{% extends "zerver/portico.html" %} - -{# Privacy policy. #} - -{% block portico_content %} - -

Privacy Policy

- -

As you use our services, we want you to be clear how we’re using -information.

- -

Our Privacy Policy explains:

- - - -

Information we collect

- -

We collect information to provide better services to all of our users.

- -

We collect information in two ways:

- - - - -

How we use information we collect

- -

We use the information we collect from all of our services to provide, -maintain, protect and improve them, to develop new ones, and to protect Zulip -and our users.

- -

We may use the name you provide for your Zulip Account across all of the -services we offer that require a Zulip Account. In addition, we may replace -past names associated with your Zulip Account so that you are represented -consistently across all our services. We may show other users your publicly -visible Zulip Account information, such as your name.

- -

When you contact Zulip, we may keep a record of your communication to help -solve any issues you might be facing. We may use your email address to inform -you about our services, such as letting you know about upcoming changes or -improvements.

- -

We use information collected from cookies and other technologies to improve -your user experience and the overall quality of our services.

- -

We may combine personal information from one service with information, -including personal information, from other Zulip services.

- -

Zulip processes personal information on our servers in many countries -around the world. We may process your personal information on a server located -outside the country where you live.

- - -

Accessing and updating your personal information

- -

Whenever you use our services, we aim to provide you with access to your -personal information. If that information is wrong, we strive to give you ways -to update it quickly or to delete it – unless we have to keep that information -for legitimate business or legal purposes. When updating your personal -information, we may ask you to verify your identity before we can act on your -request.

- -

We may reject requests that are unreasonably repetitive, require -disproportionate technical effort (for example, developing a new system or -fundamentally changing an existing practice), risk the privacy of others, or -would be extremely impractical (for instance, requests concerning information -residing on backup tapes).

- -

Where we can provide information access and correction, we will do so for -free, except where it would require a disproportionate effort. We aim to -maintain our services in a manner that protects information from accidental or -malicious destruction. Because of this, after you delete information from our -services, we may not immediately delete residual copies from our active servers -and may not remove information from our backup systems.

- - -

Information we share

- -

We do not share personal information with companies, organizations and -individuals outside of Zulip unless one of the following circumstances -apply:

- - - -

We may share aggregated, non-personally identifiable information publicly -and with our partners. For example, we may share information publicly to show -trends about the general use of our services.

- -

We may share personal information in connection with an acquisition, merger, -or sale of all or a substantial portion of our business, with or to another -company. In any such event, you will receive notice if your data is transferred -and becomes subject to a substantially different privacy policy.

- - -

Application

- -

Our Privacy Policy applies to all of the services offered by Zulip, Inc. -and its affiliates, including services offered on other sites, but excludes -services that have separate privacy policies that do not incorporate this -Privacy Policy.

- -

Our Privacy Policy does not apply to services offered by other companies or -individuals, sites that may include Zulip services, or other sites linked from -our services. Our Privacy Policy does not cover the information practices of -other companies and organizations who advertise our services, and who may use -cookies, pixel tags and other technologies to serve and offer relevant ads.

- - -

Changes

- -

Our Privacy Policy may change from time to time. We will post the latest -version of our privacy policy on this page.

- -
- -

Last modified: July 15, 2013

- -{% endblock %} diff --git a/tools/check-templates b/tools/check-templates index 1fd0357021..58b0a18c56 100755 --- a/tools/check-templates +++ b/tools/check-templates @@ -101,7 +101,6 @@ def check_html_templates(templates, all_dups): 'templates/500.html', 'templates/confirmation/confirm.html', 'templates/corporate/mit.html', - 'templates/corporate/privacy.html', 'templates/corporate/zephyr-mirror.html', 'templates/corporate/zephyr.html', 'templates/zerver/accounts_home.html', @@ -157,7 +156,6 @@ def check_html_templates(templates, all_dups): 'templates/confirmation/emailchangestatus_confirmation_email.html', 'templates/confirmation/invite_email.html', 'templates/confirmation/preregistrationuser_confirmation_email.html', - 'templates/corporate/privacy.html', 'templates/corporate/zephyr-mirror.html', 'templates/corporate/zephyr.html', 'templates/zerver/api.html', diff --git a/zerver/tests/test_templates.py b/zerver/tests/test_templates.py index 57155ca205..232f5c8f62 100644 --- a/zerver/tests/test_templates.py +++ b/zerver/tests/test_templates.py @@ -92,7 +92,6 @@ class TemplateTestCase(ZulipTestCase): 'confirmation/emailchangestatus_confirmation_email.txt', 'confirmation/notify_change_in_email_subject.txt', 'corporate/mit.html', - 'corporate/privacy.html', 'corporate/zephyr.html', 'corporate/zephyr-mirror.html', 'pipeline/css.jinja',