This commit is contained in:
erikjohnston 2024-08-13 14:59:38 +00:00
parent 82e2e6c51d
commit b5945d5a56
5 changed files with 14 additions and 10 deletions

View file

@ -1874,7 +1874,7 @@ v1.61.0.</p>
<tr><td>v1.85.0 v1.91.2</td><td>v1.83.0</td></tr>
<tr><td>v1.92.0 v1.97.0</td><td>v1.90.0</td></tr>
<tr><td>v1.98.0 v1.105.0</td><td>v1.96.0</td></tr>
<tr><td>v1.105.1 v1.112.0</td><td>v1.100.0</td></tr>
<tr><td>v1.105.1 v1.113.0</td><td>v1.100.0</td></tr>
</tbody></table>
<h2 id="upgrading-from-a-very-old-version"><a class="header" href="#upgrading-from-a-very-old-version">Upgrading from a very old version</a></h2>
<p>You need to read all of the upgrade notes for each version between your current
@ -5827,7 +5827,7 @@ unless <a href="usage/configuration/config_documentation.html#enable_registratio
</code></pre>
<hr />
<h3 id="registrations_require_3pid"><a class="header" href="#registrations_require_3pid"><code>registrations_require_3pid</code></a></h3>
<p>If this is set, users must provide all of the specified types of 3PID when registering an account.</p>
<p>If this is set, users must provide all of the specified types of <a href="https://spec.matrix.org/latest/appendices/#3pid-types">3PID</a> when registering an account.</p>
<p>Note that <a href="usage/configuration/config_documentation.html#enable_registration"><code>enable_registration</code></a> must also be set to allow account registration.</p>
<p>Example configuration:</p>
<pre><code class="language-yaml">registrations_require_3pid:
@ -5844,7 +5844,9 @@ flow (overrides <code>registrations_require_3pid</code> if MSISDNs are set as re
<hr />
<h3 id="allowed_local_3pids"><a class="header" href="#allowed_local_3pids"><code>allowed_local_3pids</code></a></h3>
<p>Mandate that users are only allowed to associate certain formats of
3PIDs with accounts on this server, as specified by the <code>medium</code> and <code>pattern</code> sub-options.</p>
3PIDs with accounts on this server, as specified by the <code>medium</code> and <code>pattern</code> sub-options.
<code>pattern</code> is a <a href="https://docs.python.org/3/library/re.html#module-re">Perl-like regular expression</a>.</p>
<p>More information about 3PIDs, allowed <code>medium</code> types and their <code>address</code> syntax can be found <a href="https://spec.matrix.org/latest/appendices/#3pid-types">in the Matrix spec</a>.</p>
<p>Example configuration:</p>
<pre><code class="language-yaml">allowed_local_3pids:
- medium: email
@ -5852,7 +5854,7 @@ flow (overrides <code>registrations_require_3pid</code> if MSISDNs are set as re
- medium: email
pattern: '^[^@]+@vector\.im$'
- medium: msisdn
pattern: '\+44'
pattern: '^44\d{10}$'
</code></pre>
<hr />
<h3 id="enable_3pid_lookup"><a class="header" href="#enable_3pid_lookup"><code>enable_3pid_lookup</code></a></h3>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -267,7 +267,7 @@ v1.61.0.</p>
<tr><td>v1.85.0 v1.91.2</td><td>v1.83.0</td></tr>
<tr><td>v1.92.0 v1.97.0</td><td>v1.90.0</td></tr>
<tr><td>v1.98.0 v1.105.0</td><td>v1.96.0</td></tr>
<tr><td>v1.105.1 v1.112.0</td><td>v1.100.0</td></tr>
<tr><td>v1.105.1 v1.113.0</td><td>v1.100.0</td></tr>
</tbody></table>
<h2 id="upgrading-from-a-very-old-version"><a class="header" href="#upgrading-from-a-very-old-version">Upgrading from a very old version</a></h2>
<p>You need to read all of the upgrade notes for each version between your current

View file

@ -2167,7 +2167,7 @@ unless <a href="#enable_registration"><code>enable_registration</code></a> is al
</code></pre>
<hr />
<h3 id="registrations_require_3pid"><a class="header" href="#registrations_require_3pid"><code>registrations_require_3pid</code></a></h3>
<p>If this is set, users must provide all of the specified types of 3PID when registering an account.</p>
<p>If this is set, users must provide all of the specified types of <a href="https://spec.matrix.org/latest/appendices/#3pid-types">3PID</a> when registering an account.</p>
<p>Note that <a href="#enable_registration"><code>enable_registration</code></a> must also be set to allow account registration.</p>
<p>Example configuration:</p>
<pre><code class="language-yaml">registrations_require_3pid:
@ -2184,7 +2184,9 @@ flow (overrides <code>registrations_require_3pid</code> if MSISDNs are set as re
<hr />
<h3 id="allowed_local_3pids"><a class="header" href="#allowed_local_3pids"><code>allowed_local_3pids</code></a></h3>
<p>Mandate that users are only allowed to associate certain formats of
3PIDs with accounts on this server, as specified by the <code>medium</code> and <code>pattern</code> sub-options.</p>
3PIDs with accounts on this server, as specified by the <code>medium</code> and <code>pattern</code> sub-options.
<code>pattern</code> is a <a href="https://docs.python.org/3/library/re.html#module-re">Perl-like regular expression</a>.</p>
<p>More information about 3PIDs, allowed <code>medium</code> types and their <code>address</code> syntax can be found <a href="https://spec.matrix.org/latest/appendices/#3pid-types">in the Matrix spec</a>.</p>
<p>Example configuration:</p>
<pre><code class="language-yaml">allowed_local_3pids:
- medium: email
@ -2192,7 +2194,7 @@ flow (overrides <code>registrations_require_3pid</code> if MSISDNs are set as re
- medium: email
pattern: '^[^@]+@vector\.im$'
- medium: msisdn
pattern: '\+44'
pattern: '^44\d{10}$'
</code></pre>
<hr />
<h3 id="enable_3pid_lookup"><a class="header" href="#enable_3pid_lookup"><code>enable_3pid_lookup</code></a></h3>