wholetrans/docs-mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

e-mail -> email in most documentation references. (#1365)

Browse source
This commit is contained in:
Andy Piper 2024-11-22 16:33:04 +00:00 • committed by GitHub
parent 9a8c9659b0
commit 09dc6a85cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
content/en/admin/config.md
View file

@ -725,7 +725,7 @@ Set to `auto` (default), `always`, or `never`.
#### `SMTP_SSL`
E-mail configuration is based on the *action_mailer* component of the *Ruby on Rails* framework that Mastodon is built on. Complete documentation on action_mailer is available [here](https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration). The client uses SMTP or derivatives: StartTLS + SMTP or SMTPS (SMTP over TLS).
Email configuration is based on the *action_mailer* component of the *Ruby on Rails* framework that Mastodon is built on. Complete documentation on action_mailer is available [here](https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration). The client uses SMTP or derivatives: StartTLS + SMTP or SMTPS (SMTP over TLS).
### Basic configuration {#basic}
@ -1047,14 +1047,14 @@ If set, registrations confirm page will display a captcha, see [Captcha](https:/
#### `EMAIL_DOMAIN_ALLOWLIST`
If set, registrations will not be possible with any e-mails **except** those from the specified domains. Pipe-separated values, e.g.: `foo.com|bar.com`
If set, registrations will not be possible with any emails **except** those from the specified domains. Pipe-separated values, e.g.: `foo.com|bar.com`
#### `EMAIL_DOMAIN_DENYLIST` {{%deprecated%}}
If set, registrations will not be possible with any e-mails from the specified domains. Pipe-separated values, e.g.: `foo.com|bar.com`
If set, registrations will not be possible with any emails from the specified domains. Pipe-separated values, e.g.: `foo.com|bar.com`
{{< hint style="warning" >}}
This option is deprecated. You can dynamically block e-mail domains from the admin interface or the `tootctl` command-line interface.
This option is deprecated. You can dynamically block email domains from the admin interface or the `tootctl` command-line interface.
{{</ hint >}}
### Sessions

4
content/en/admin/install.md
View file

@ -11,7 +11,7 @@ menu:
* A machine running **Ubuntu 24.04** or **Debian 12** that you have root access to
* A **domain name** (or a subdomain) for the Mastodon server, e.g. `example.com`
* An e-mail delivery service or other **SMTP server**
* An email delivery service or other **SMTP server**
We will be using `example.com` as the domain in the following example. Please remember to replace it with your own domain before running any commands.
@ -222,7 +222,7 @@ Copy the systemd service templates from the Mastodon directory:
cp /home/mastodon/live/dist/mastodon-*.service /etc/systemd/system/
```
If you deviated from the defaults at any point, check that the username and paths are correct:
If you deviated from the defaults at any point, check that the username and paths are correct:
```sh
$EDITOR /etc/systemd/system/mastodon-*.service

2
content/en/admin/setup.md
View file

@ -42,7 +42,7 @@ After logging in, navigate to the **Site settings** page (under **Preferences**
| Setting | Meaning |
| :--- | :--- |
| Contact username | Your username so people know who owns the server |
| Business e-mail | An e-mail address so people locked out of their accounts, or people without accounts, can contact you |
| Business email | An email address so people locked out of their accounts, or people without accounts, can contact you |
| Instance description | Why did you start this server? Who is it for? What makes it different? |
| Custom extended information | You can put all sorts of information in here but a **code of conduct** is recommended |

9
content/en/user/signup.md
View file

@ -9,7 +9,7 @@ menu:
## Choosing a website {#picker}
You have to choose a website to sign up on, like you would choose an e-mail provider, or a World of Warcraft realm for your new character. The website will be your service provider, hosting your account, your profile, and your home feed.
You have to choose a website to sign up on, like you would choose an email provider, or a World of Warcraft realm for your new character. The website will be your service provider, hosting your account, your profile, and your home feed.
{{< hint style="info" >}}
You can [browse a list of servers by categories and languages on joinmastodon.org](https://joinmastodon.org/#getting-started).
@ -42,7 +42,7 @@ Mastodon usernames actually consist of two parts:
* The local username, e.g. `alice`
* And the domain of the website, e.g. `example.com`
Just like an e-mail address. For convenience sake, Mastodon allows you to skip the second part when addressing people on the same server as you, but you have to keep in mind when sharing your username with other people, you need to include the domain or they won’t be able to find you as easily.
Just like an email address. For convenience sake, Mastodon allows you to skip the second part when addressing people on the same server as you, but you have to keep in mind when sharing your username with other people, you need to include the domain or they won’t be able to find you as easily.
| Sharing your username | |
| :--- | :--- |
@ -52,7 +52,4 @@ Just like an e-mail address. For convenience sake, Mastodon allows you to skip t
The search form in Mastodon will find people either with the above address form, or the link to the person’s profile, so you can share that instead if you prefer.
The same username _can_ be registered on different servers -- there is no way to claim all of them ahead of time. Just like with e-mail, you should not expect `alice@outlook.com` to be the same person as `alice@gmail.com` or `alice@yahoo.com`.
The same username _can_ be registered on different servers -- there is no way to claim all of them ahead of time. Just like with email, you should not expect `alice@outlook.com` to be the same person as `alice@gmail.com` or `alice@yahoo.com`.