This commit is contained in:
reivilibre 2024-09-17 14:24:09 +00:00
parent 23fc3f5097
commit ad22206180
5 changed files with 14 additions and 12 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.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.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.98.0 v1.105.0</td><td>v1.96.0</td></tr>
<tr><td>v1.105.1 v1.114.0</td><td>v1.100.0</td></tr> <tr><td>v1.105.1 v1.115.0</td><td>v1.100.0</td></tr>
</tbody></table> </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> <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 <p>You need to read all of the upgrade notes for each version between your current
@ -4236,7 +4236,8 @@ Also make sure that <code>metrics</code> is not included in <code>resources</cod
<p>Valid resource names are:</p> <p>Valid resource names are:</p>
<ul> <ul>
<li> <li>
<p><code>client</code>: the client-server API (/_matrix/client), and the synapse admin API (/_synapse/admin). Also implies <code>media</code> and <code>static</code>.</p> <p><code>client</code>: the client-server API (/_matrix/client). Also implies <code>media</code> and <code>static</code>.
If configuring the main process, the Synapse Admin API (/_synapse/admin) is also implied.</p>
</li> </li>
<li> <li>
<p><code>consent</code>: user consent forms (/_matrix/consent). See <a href="usage/configuration/../../consent_tracking.html">here</a> for more.</p> <p><code>consent</code>: user consent forms (/_matrix/consent). See <a href="usage/configuration/../../consent_tracking.html">here</a> for more.</p>
@ -6548,8 +6549,8 @@ the IdP to use an ACS location of
contact_person: contact_person:
- given_name: Bob - given_name: Bob
sur_name: &quot;the Sysadmin&quot; sur_name: &quot;the Sysadmin&quot;
email_address&quot;: [&quot;admin@example.com&quot;] email_address: [&quot;admin@example.com&quot;]
contact_type&quot;: technical contact_type: technical
saml_session_lifetime: 5m saml_session_lifetime: 5m

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.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.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.98.0 v1.105.0</td><td>v1.96.0</td></tr>
<tr><td>v1.105.1 v1.114.0</td><td>v1.100.0</td></tr> <tr><td>v1.105.1 v1.115.0</td><td>v1.100.0</td></tr>
</tbody></table> </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> <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 <p>You need to read all of the upgrade notes for each version between your current

View file

@ -576,7 +576,8 @@ Also make sure that <code>metrics</code> is not included in <code>resources</cod
<p>Valid resource names are:</p> <p>Valid resource names are:</p>
<ul> <ul>
<li> <li>
<p><code>client</code>: the client-server API (/_matrix/client), and the synapse admin API (/_synapse/admin). Also implies <code>media</code> and <code>static</code>.</p> <p><code>client</code>: the client-server API (/_matrix/client). Also implies <code>media</code> and <code>static</code>.
If configuring the main process, the Synapse Admin API (/_synapse/admin) is also implied.</p>
</li> </li>
<li> <li>
<p><code>consent</code>: user consent forms (/_matrix/consent). See <a href="../../consent_tracking.html">here</a> for more.</p> <p><code>consent</code>: user consent forms (/_matrix/consent). See <a href="../../consent_tracking.html">here</a> for more.</p>
@ -2888,8 +2889,8 @@ the IdP to use an ACS location of
contact_person: contact_person:
- given_name: Bob - given_name: Bob
sur_name: &quot;the Sysadmin&quot; sur_name: &quot;the Sysadmin&quot;
email_address&quot;: [&quot;admin@example.com&quot;] email_address: [&quot;admin@example.com&quot;]
contact_type&quot;: technical contact_type: technical
saml_session_lifetime: 5m saml_session_lifetime: 5m