Skip to content

Commit

Permalink
Fix a few more instances of matrix-doc being used; Fix changelog supp…
Browse files Browse the repository at this point in the history
…ort for repo split (#1051)

* Use spec-proposals repo for links in spec text and current changelog

* Make the changelog repo-aware

* Changelog
  • Loading branch information
turt2live committed May 10, 2022
1 parent 8a5955e commit fd2d5b8
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion changelogs/client_server/newsfragments/1002.feature
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Make `from` optional on `GET /_matrix/client/v3/messages` to allow requesting events from the start or end of the room history, as per [MSC3567](https://github.com/matrix-org/matrix-doc/pull/3567).
Make `from` optional on `GET /_matrix/client/v3/messages` to allow requesting events from the start or end of the room history, as per [MSC3567](https://github.com/matrix-org/matrix-spec-proposals/pull/3567).
1 change: 1 addition & 0 deletions changelogs/client_server/newsfragments/1051.clarification
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix various typos throughout the specification.
2 changes: 1 addition & 1 deletion content/client-server-api/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ before using the contents verbatim.
**It is not safe to assume that an event body will have all the expected
fields of the expected types.**

See [MSC2801](https://github.com/matrix-org/matrix-doc/pull/2801) for more
See [MSC2801](https://github.com/matrix-org/matrix-spec-proposals/pull/2801) for more
detail on why this assumption is unsafe.
{{% /boxes/warning %}}

Expand Down
2 changes: 1 addition & 1 deletion content/client-server-api/modules/instant_messaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ the tag entirely.
{{% boxes/note %}}
A future iteration of the specification will support more powerful and
extensible message formatting options, such as the proposal
[MSC1767](https://github.com/matrix-org/matrix-doc/pull/1767).
[MSC1767](https://github.com/matrix-org/matrix-spec-proposals/pull/1767).
{{% /boxes/note %}}

{{% msgtypes %}}
Expand Down
6 changes: 3 additions & 3 deletions content/client-server-api/modules/moderation_policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ follows:
- Is a `room` rule...
- Applied to a user: The user should leave the room and not join
it
([MSC2270](https://github.com/matrix-org/matrix-doc/pull/2270)-style
([MSC2270](https://github.com/matrix-org/matrix-spec-proposals/pull/2270)-style
ignore).
- Applied to a room: No-op because a room cannot ban itself.
- Applied to a server: The server should prevent users from
Expand Down Expand Up @@ -120,6 +120,6 @@ Depending on how implementations handle subscriptions, user IDs may be
linked to policy lists and therefore expose the views of that user. For
example, a client implementation which joins the user to the policy room
would expose the user's ID to observers of the policy room. In future,
[MSC1228](https://github.com/matrix-org/matrix-doc/pulls/1228) and
[MSC1777](https://github.com/matrix-org/matrix-doc/pulls/1777) (or
[MSC1228](https://github.com/matrix-org/matrix-spec-proposals/pulls/1228) and
[MSC1777](https://github.com/matrix-org/matrix-spec-proposals/pulls/1777) (or
similar) could help solve this concern.
7 changes: 6 additions & 1 deletion layouts/shortcodes/changelog/changelog-changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

{{ if ne $status "unstable" }}
<table class="release-info">
<tr><th>Git commit</th><td><a href="https://github.com/matrix-org/matrix-doc/tree/{{ $release_tag }}">https://github.com/matrix-org/matrix-doc/tree/{{ $release_tag }}</a></td>
<tr><th>Git commit</th><td><a href="https://github.com/matrix-org/matrix-spec/tree/{{ $release_tag }}">https://github.com/matrix-org/matrix-spec/tree/{{ $release_tag }}</a></td>
<tr><th>Release date</th><td>{{ .Site.Params.version.release_date }}</td>
</table>
{{ end }}
Expand Down Expand Up @@ -79,7 +79,12 @@ <h3 id="{{.id}}">{{ .title }}</h3>
<li>{{.name | safeHTML}}
<p><ul>
{{ range $changes_of_type }}
<!-- TODO: TravisR: Remove after v1.3 release and just use matrix-spec links -->
{{ if gt .ticket 3000 }}
<li><a href="https://github.com/matrix-org/matrix-doc/issues/{{.ticket}}"><strong>{{ .ticket }}: </strong></a>{{ .description | markdownify }}</li>
{{ else }}
<li><a href="https://github.com/matrix-org/matrix-spec/issues/{{.ticket}}"><strong>{{ .ticket }}: </strong></a>{{ .description | markdownify }}</li>
{{ end }}
{{ end }}
</ul></p>
</li>
Expand Down

0 comments on commit fd2d5b8

Please sign in to comment.