diff --git a/doc/smarty3-templates.md b/doc/smarty3-templates.md index f3f7c3e60..4d50eb7d4 100644 --- a/doc/smarty3-templates.md +++ b/doc/smarty3-templates.md @@ -37,7 +37,7 @@ Form Templates To guarantee a consistent look and feel for input forms, i.e. in the settings sections, there are templates for the basic form fields. They are initialized with an array of data, depending on the tyle of the field. -All of these take an array holding the values, e.g. for a one line text input field, which is required and should be used to type email addesses use something along the lines of: +All of these take an array holding the values, e.g. for a one line text input field, which is required and should be used to type email addresses use something along the lines of: '$adminmail' => array('adminmail', DI::l10n()->t('Site administrator email address'), $adminmail, DI::l10n()->t('Your account email address must match this in order to use the web admin panel.'), 'required', '', 'email'), diff --git a/spec/zot.txt b/spec/zot.txt index e1e4640c9..af82b0b36 100644 --- a/spec/zot.txt +++ b/spec/zot.txt @@ -127,7 +127,7 @@ MUST be present. Z-To: zot:bob@example.com, zot:alice@example.com, mailto:dave@example.com Z-Bcc: zot:https://example.com/profile/richard -are valid entries. Adresses are comma separated and individual entries MUST NOT +are valid entries. Addresses are comma separated and individual entries MUST NOT contain commas. There MAY be any number of ASCII space characters between entries for legibility. Header lines are terminated with a linefeed character (ASCII 0x0A). diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php index 028a7885b..dda7ddbdc 100644 --- a/src/Protocol/Relay.php +++ b/src/Protocol/Relay.php @@ -302,7 +302,7 @@ class Relay DBA::close($tagserver); } - // All adresses with the given id + // All addresses with the given id if (!empty($tagserverlist)) { $servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]); while ($server = DBA::fetch($servers)) { diff --git a/static/defaults.config.php b/static/defaults.config.php index 4fb96cfce..0b8ed0a6f 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -106,7 +106,7 @@ return [ 'always_show_preview' => false, // ap_always_bcc (Boolean) - // Adresses non-mentioned ActivityPub receivers by BCC instead of CC. Increases privacy, decreases performance. + // Addresses non-mentioned ActivityPub receivers by BCC instead of CC. Increases privacy, decreases performance. 'ap_always_bcc' => false, // archival_days (Integer)