summary refs log tree commit diff
path: root/develop/development/contributing_guide.html
diff options
context:
space:
mode:
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