From fd2d5b8a49f1ef2a25a813ab951fe3cb81b3a573 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 10 May 2022 08:59:54 -0600 Subject: [PATCH] Fix a few more instances of matrix-doc being used; Fix changelog support for repo split (#1051) * Use spec-proposals repo for links in spec text and current changelog * Make the changelog repo-aware * Changelog --- changelogs/client_server/newsfragments/1002.feature | 2 +- changelogs/client_server/newsfragments/1051.clarification | 1 + content/client-server-api/_index.md | 2 +- content/client-server-api/modules/instant_messaging.md | 2 +- content/client-server-api/modules/moderation_policies.md | 6 +++--- layouts/shortcodes/changelog/changelog-changes.html | 7 ++++++- 6 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 changelogs/client_server/newsfragments/1051.clarification diff --git a/changelogs/client_server/newsfragments/1002.feature b/changelogs/client_server/newsfragments/1002.feature index fed2d59b..e1c93816 100644 --- a/changelogs/client_server/newsfragments/1002.feature +++ b/changelogs/client_server/newsfragments/1002.feature @@ -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). diff --git a/changelogs/client_server/newsfragments/1051.clarification b/changelogs/client_server/newsfragments/1051.clarification new file mode 100644 index 00000000..ca5f3aea --- /dev/null +++ b/changelogs/client_server/newsfragments/1051.clarification @@ -0,0 +1 @@ +Fix various typos throughout the specification. \ No newline at end of file diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index 679358a0..3edb5b16 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -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 %}} diff --git a/content/client-server-api/modules/instant_messaging.md b/content/client-server-api/modules/instant_messaging.md index f7f4d8ca..e2138e0b 100644 --- a/content/client-server-api/modules/instant_messaging.md +++ b/content/client-server-api/modules/instant_messaging.md @@ -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 %}} diff --git a/content/client-server-api/modules/moderation_policies.md b/content/client-server-api/modules/moderation_policies.md index ee649e03..911d1a1c 100644 --- a/content/client-server-api/modules/moderation_policies.md +++ b/content/client-server-api/modules/moderation_policies.md @@ -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 @@ -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. diff --git a/layouts/shortcodes/changelog/changelog-changes.html b/layouts/shortcodes/changelog/changelog-changes.html index 9b0e71a9..bea371ec 100644 --- a/layouts/shortcodes/changelog/changelog-changes.html +++ b/layouts/shortcodes/changelog/changelog-changes.html @@ -25,7 +25,7 @@ {{ if ne $status "unstable" }} - +
Git commithttps://github.com/matrix-org/matrix-doc/tree/{{ $release_tag }}
Git commithttps://github.com/matrix-org/matrix-spec/tree/{{ $release_tag }}
Release date{{ .Site.Params.version.release_date }}
{{ end }} @@ -79,7 +79,12 @@
  • {{.name | safeHTML}}