summary refs log tree commit diff
path: root/develop/development/contributing_guide.html
diff options
context:
space:
mode:
authorerikjohnston <erikjohnston@users.noreply.github.com>2024-07-04 16:22:55 +0000
committererikjohnston <erikjohnston@users.noreply.github.com>2024-07-04 16:22:55 +0000
commit0357051e92f1f61416283a978a1e3cc12e19e60d (patch)
tree68b1fbe5fef2a0137d52143f53d3c35aa8e6271d /develop/development/contributing_guide.html
parentdeploy: 75b788f49f005bbc70b459d30913f1f7abf847cb (diff)
downloadsynapse-0357051e92f1f61416283a978a1e3cc12e19e60d.tar.xz
deploy: a9d2e40ea4533e3f5fd369e817319e34f2a7dde9
Diffstat (limited to 'develop/development/contributing_guide.html')
-rw-r--r--develop/development/contributing_guide.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/develop/development/contributing_guide.html b/develop/development/contributing_guide.html

index 9aab3befe1..800aefdea3 100644 --- a/develop/development/contributing_guide.html +++ b/develop/development/contributing_guide.html
@@ -464,9 +464,9 @@ contributions and would like to have you shouted out in the release notes!</p> <p>The security levels of Florbs are now validated when received via the <code>/federation/florb</code> endpoint. Contributed by Jane Matrix.</p> </blockquote> -<p>If there are multiple pull requests involved in a single bugfix/feature/etc, -then the content for each <code>changelog.d</code> file should be the same. Towncrier will -merge the matching files together into a single changelog entry when we come to +<p>If there are multiple pull requests involved in a single bugfix/feature/etc, then the +content for each <code>changelog.d</code> file and file extension should be the same. Towncrier +will merge the matching files together into a single changelog entry when we come to release.</p> <h3 id="how-do-i-know-what-to-call-the-changelog-file-before-i-create-the-pr"><a class="header" href="#how-do-i-know-what-to-call-the-changelog-file-before-i-create-the-pr">How do I know what to call the changelog file before I create the PR?</a></h3> <p>Obviously, you don't know if you should call your newsfile