diff --git a/release/release_notes/bug_fixes_per_major_release.py b/release/release_notes/bug_fixes_per_major_release.py index 5ac30a5ba05..c01b9639a8f 100644 --- a/release/release_notes/bug_fixes_per_major_release.py +++ b/release/release_notes/bug_fixes_per_major_release.py @@ -426,8 +426,15 @@ class CommitInfo: formatted_string = ( f" * {title} [[{self.hash[:11]}](https://projects.blender.org/blender/blender/commit/{self.hash})]" ) + if len(self.backport_list) > 0: - formatted_string += f" - Backported to {' & '.join(self.backport_list)}" + formatted_string += f" - Backported to " + if len(self.backport_list) > 2: + # In case of three or more backports, create a list that looks like: + # "Backported to 3.6, 4.2, and 4.3" + formatted_string += f"{', '.join(self.backport_list[:-1])}, and {self.backport_list[-1]}" + else: + formatted_string += " and ".join(self.backport_list) formatted_string += "\n" return formatted_string