From 48d514045cd3c57653acf72fc60997a40fbf8c7a Mon Sep 17 00:00:00 2001 From: a Date: Wed, 7 Dec 2022 15:43:04 -0600 Subject: [PATCH] fix typos (#1092) --- content/en/admin/backups.md | 2 +- content/en/admin/config.md | 2 +- content/en/admin/prerequisites.md | 4 ++-- content/en/admin/scaling.md | 2 +- content/en/entities/Account.md | 4 ++-- content/en/methods/oauth.md | 2 +- content/zh-cn/admin/scaling.md | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/en/admin/backups.md b/content/en/admin/backups.md index e750b027..4d79def4 100644 --- a/content/en/admin/backups.md +++ b/content/en/admin/backups.md @@ -38,7 +38,7 @@ Application secrets are the easiest to backup, since they never change. You only ## Backing up PostgreSQL {#postgresql} -PostgreSQL is at risk of data corruption from power cuts, hard disk drive failure, and botched schema migrations. For that reason, occassionally making a backup with `pg_dump` or `pg_dumpall` is recommended. +PostgreSQL is at risk of data corruption from power cuts, hard disk drive failure, and botched schema migrations. For that reason, occasionally making a backup with `pg_dump` or `pg_dumpall` is recommended. For high-availability setups, it is possible to use hot streaming replication to have a second PostgreSQL server with always up-to-date data, ready to be switched over to if the other server goes down. diff --git a/content/en/admin/config.md b/content/en/admin/config.md index 3f7c9c8c..4d21e542 100644 --- a/content/en/admin/config.md +++ b/content/en/admin/config.md @@ -23,7 +23,7 @@ This is the unique identifier of your server in the network. It cannot be safely `WEB_DOMAIN` is an optional environment variable allowing to install Mastodon on one domain, while having the users' handles on a different domain, e.g. addressing users as `@alice@example.com` but accessing Mastodon on `mastodon.example.com`. This may be useful if your domain name is already used for a different website but you still want to use it as a Mastodon identifier because it looks better or shorter. -As with `LOCAL_DOMAIN`, `WEB_DOMAIN` cannot be safely changed once set, as this will confuse remote servers that knew of your previous settings and may break communication with them or make it unreliable. As the issues lie with remote servers' understanding of your accounts, re-installing Mastodon from scratch will not fix the issue. Therefore, please be extremelly cautious when setting up `LOCAL_DOMAIN` and `WEB_DOMAIN`. +As with `LOCAL_DOMAIN`, `WEB_DOMAIN` cannot be safely changed once set, as this will confuse remote servers that knew of your previous settings and may break communication with them or make it unreliable. As the issues lie with remote servers' understanding of your accounts, re-installing Mastodon from scratch will not fix the issue. Therefore, please be extremely cautious when setting up `LOCAL_DOMAIN` and `WEB_DOMAIN`. To install Mastodon on `mastodon.example.com` in such a way it can serve `@alice@example.com`, set `LOCAL_DOMAIN` to `example.com` and `WEB_DOMAIN` to `mastodon.example.com`. This also requires additional configuration on the server hosting `example.com` to redirect or proxy requests to `https://example.com/.well-known/webfinger` to `https://mastodon.example.com/.well-known/webfinger`. For instance, with nginx, the configuration could look like the following: diff --git a/content/en/admin/prerequisites.md b/content/en/admin/prerequisites.md index cb9d4bfc..d2457599 100644 --- a/content/en/admin/prerequisites.md +++ b/content/en/admin/prerequisites.md @@ -88,7 +88,7 @@ Edit `/etc/iptables/rules.v4` and put this inside: # Allow ping -A INPUT -p icmp -m icmp --icmp-type 8 -j ACCEPT -# Allow destination unreachable messages, espacally code 4 (fragmentation required) is required or PMTUD breaks +# Allow destination unreachable messages, especially code 4 (fragmentation required) is required or PMTUD breaks -A INPUT -p icmp -m icmp --icmp-type 3 -j ACCEPT # Log iptables denied calls @@ -141,7 +141,7 @@ If your server is also reachable over IPv6, edit `/etc/iptables/rules.v6` and ad COMMIT ``` -Simmilar to the IPv4 rules, you can load it manually like this: +Similar to the IPv4 rules, you can load it manually like this: ```bash ip6tables-restore < /etc/iptables/rules.v6 ``` diff --git a/content/en/admin/scaling.md b/content/en/admin/scaling.md index 584f49c4..3494d69c 100644 --- a/content/en/admin/scaling.md +++ b/content/en/admin/scaling.md @@ -101,7 +101,7 @@ sudo apt install pgbouncer #### Setting a password {#pgbouncer-password} -First off, if your `mastodon` user in Postgres is set up wthout a password, you will need to set a password. +First off, if your `mastodon` user in Postgres is set up without a password, you will need to set a password. Here’s how you might reset the password: diff --git a/content/en/entities/Account.md b/content/en/entities/Account.md index a067e601..2098616f 100644 --- a/content/en/entities/Account.md +++ b/content/en/entities/Account.md @@ -211,7 +211,7 @@ aliases: [ ### `moved` {{%optional%}} {#moved} **Description:** Indicates that the profile is currently inactive and that its user has moved to a new account.\ -**Type:** {{}} [Account]({{< relref "entities/Account" >}}), or null if the profile is supended.\ +**Type:** {{}} [Account]({{< relref "entities/Account" >}}), or null if the profile is suspended.\ **Version history:**\ 2.1.0 - added @@ -224,7 +224,7 @@ aliases: [ ### `limited` {{%optional%}} {#limited} -**Description:** An extra attribute returned only when an account is silenced. If true, indicates that the account should be hidden behing a warning screen.\ +**Description:** An extra attribute returned only when an account is silenced. If true, indicates that the account should be hidden behind a warning screen.\ **Type:** Boolean\ **Version history:**\ 3.5.3 - added diff --git a/content/en/methods/oauth.md b/content/en/methods/oauth.md index 80e817bb..6b964e38 100644 --- a/content/en/methods/oauth.md +++ b/content/en/methods/oauth.md @@ -168,7 +168,7 @@ client_id : {{}} String. The client ID, obtained during app registration. client_secret -: {{}} String. The client secret, obtained durign app registration. +: {{}} String. The client secret, obtained during app registration. token : {{}} String. The previously obtained token, to be invalidated. diff --git a/content/zh-cn/admin/scaling.md b/content/zh-cn/admin/scaling.md index 7aeb6067..f1b977a8 100644 --- a/content/zh-cn/admin/scaling.md +++ b/content/zh-cn/admin/scaling.md @@ -101,7 +101,7 @@ sudo apt install pgbouncer #### 设置密码 {#pgbouncer-password} 首先，如果你的Postgres中`mastodon`帐户没有设置密码的话，你需要设置一个密码。 -First off, if your `mastodon` user in Postgres is set up wthout a password, you will need to set a password. +First off, if your `mastodon` user in Postgres is set up without a password, you will need to set a password. 下面是如何重置密码：