From 7ee974729b4fdb58786e4b6fa1efbe27b8476729 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 29 Jul 2020 17:09:05 -0700 Subject: [PATCH] docs: Replace Digital Ocean with DigitalOcean. Signed-off-by: Anders Kaseorg --- README.md | 2 +- docs/development/request-remote.md | 2 +- docs/production/install.md | 2 +- requirements/dev.in | 2 +- templates/zerver/help/gdpr-compliance.md | 2 +- tools/droplets/README.md | 18 +++++++++--------- tools/droplets/add_mentor.py | 2 +- tools/droplets/create.py | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index aa0f84c123..12cf65bdcd 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ You might be interested in: [companies](https://zulip.com/for/companies/), or Zulip for [working groups and part time communities](https://zulip.com/for/working-groups-and-communities/). -* **Running a Zulip server**. Use a preconfigured [Digital Ocean droplet](https://marketplace.digitalocean.com/apps/zulip), +* **Running a Zulip server**. Use a preconfigured [DigitalOcean droplet](https://marketplace.digitalocean.com/apps/zulip), [install Zulip](https://zulip.readthedocs.io/en/stable/production/install.html) directly, or use Zulip's experimental [Docker image](https://zulip.readthedocs.io/en/latest/production/deployment.html#zulip-in-docker). diff --git a/docs/development/request-remote.md b/docs/development/request-remote.md index 120608d9d7..3f6750cdf4 100644 --- a/docs/development/request-remote.md +++ b/docs/development/request-remote.md @@ -9,7 +9,7 @@ Google Code-in, Zulip can provide you with a virtual machine with the development environment already set up. The machines (droplets) are being generously provided by -[Digital Ocean](https://www.digitalocean.com/). Thank you Digital Ocean! +[DigitalOcean](https://www.digitalocean.com/). Thank you DigitalOcean! ## Step 1: Join GitHub and create SSH Keys diff --git a/docs/production/install.md b/docs/production/install.md index bd0dd0b367..54955cccc0 100644 --- a/docs/production/install.md +++ b/docs/production/install.md @@ -3,7 +3,7 @@ You'll need an Ubuntu or Debian system that satisfies [the installation requirements](../production/requirements.md). Alternatively, you can use a preconfigured -[Digital Ocean droplet](https://marketplace.digitalocean.com/apps/zulip), or +[DigitalOcean droplet](https://marketplace.digitalocean.com/apps/zulip), or Zulip's [experimental Docker image](../production/deployment.html#zulip-in-docker). diff --git a/requirements/dev.in b/requirements/dev.in index 4e0d5b578b..915f8d2942 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -47,7 +47,7 @@ gitlint # Needed for visualising cprofile reports snakeviz -# Needed for creating digital ocean droplets +# Needed for creating DigitalOcean droplets python-digitalocean # Needed for updating the locked pip dependencies diff --git a/templates/zerver/help/gdpr-compliance.md b/templates/zerver/help/gdpr-compliance.md index 0d601e1876..62dfb2d8cb 100644 --- a/templates/zerver/help/gdpr-compliance.md +++ b/templates/zerver/help/gdpr-compliance.md @@ -82,7 +82,7 @@ our Services: * [Amazon Web Services, Inc.](https://aws.amazon.com/compliance/gdpr-center/) for cloud infrastructure. -* [Digital Ocean, Inc.](https://www.digitalocean.com/security/gdpr/) +* [DigitalOcean, Inc.](https://www.digitalocean.com/security/gdpr/) for cloud infrastructure. * [Front, Inc.](https://community.frontapp.com/t/x1p4mw/is-front-compliant-with-gdpr) for customer support. diff --git a/tools/droplets/README.md b/tools/droplets/README.md index a513d1373a..312de11448 100644 --- a/tools/droplets/README.md +++ b/tools/droplets/README.md @@ -4,22 +4,22 @@ This guide is for mentors who want to help create remote Zulip dev servers for hackathon, GCI, or sprint participants. The machines (droplets) have been generously provided by -[Digital Ocean](https://www.digitalocean.com/) to help Zulip contributors -get up and running as easily as possible. Thank you Digital Ocean! +[DigitalOcean](https://www.digitalocean.com/) to help Zulip contributors +get up and running as easily as possible. Thank you DigitalOcean! -The `create.py` create uses the Digital Ocean API to quickly create new virtual +The `create.py` create uses the DigitalOcean API to quickly create new virtual machines (droplets) with the Zulip dev server already configured. -## Step 1: Join Zulip Digital Ocean team +## Step 1: Join Zulip DigitalOcean team -We have created a team on Digital Ocean for Zulip mentors. Ask Rishi or Tim -to be added. You need access to the team so you can create your Digital Ocean +We have created a team on DigitalOcean for Zulip mentors. Ask Rishi or Tim +to be added. You need access to the team so you can create your DigitalOcean API token. -## Step 2: Create your Digital Ocean API token +## Step 2: Create your DigitalOcean API token Once you've been added to the Zulip team, -[login](https://cloud.digitalocean.com/droplets) to the Digital Ocean control +[login](https://cloud.digitalocean.com/droplets) to the DigitalOcean control panel and [create your personal API token][do-create-api-token]. **Make sure you create your API token under the Zulip team.** (It should look something like [this][image-zulip-team]). @@ -155,7 +155,7 @@ Rough steps: 1. Get the `ssh` key for `base.zulipdev.org` from Tim, Vishnu or Rishi. 1. Log in to the Zulip organization view, rather than via your personal account. -1. Create a new droplet in Digital Ocean with 2GB RAM and `base.zulipdev.org` as the +1. Create a new droplet in DigitalOcean with 2GB RAM and `base.zulipdev.org` as the SSH authentication key. 1. Login to the droplet as root user. Make sure to point the SSH program to the private key of `base.zulipdev.org` during this step. diff --git a/tools/droplets/add_mentor.py b/tools/droplets/add_mentor.py index 75a977f973..5ab63bef36 100644 --- a/tools/droplets/add_mentor.py +++ b/tools/droplets/add_mentor.py @@ -1,4 +1,4 @@ -# Allows a mentor to ssh into a Digital Ocean droplet. This is designed to be +# Allows a mentor to ssh into a DigitalOcean droplet. This is designed to be # executed on the target machine. # # This script takes the username of the mentor as an argument: diff --git a/tools/droplets/create.py b/tools/droplets/create.py index 8428435b6e..6df020f47f 100644 --- a/tools/droplets/create.py +++ b/tools/droplets/create.py @@ -1,4 +1,4 @@ -# Creates a Droplet on Digital Ocean for remote Zulip development. +# Creates a Droplet on DigitalOcean for remote Zulip development. # Particularly useful for sprints/hackathons, interns, and other # situation where one wants to quickly onboard new contributors. # @@ -8,7 +8,7 @@ # Requires python-digitalocean library: # https://github.com/koalalorenzo/python-digitalocean # -# Also requires Digital Ocean team membership for Zulip and api token: +# Also requires DigitalOcean team membership for Zulip and api token: # https://cloud.digitalocean.com/settings/api/tokens # # Copy conf.ini-template to conf.ini and populate with your api token. @@ -27,7 +27,7 @@ from typing import Any, Dict, List import digitalocean # initiation argument parser -parser = argparse.ArgumentParser(description='Create a Zulip devopment VM Digital Ocean droplet.') +parser = argparse.ArgumentParser(description='Create a Zulip devopment VM DigitalOcean droplet.') parser.add_argument("username", help="Github username for whom you want to create a Zulip dev droplet") parser.add_argument('--tags', nargs='+', default=[]) parser.add_argument('-f', '--recreate', dest='recreate', action="store_true", default=False)