So, earlier I made a f25 branch and began working/updating the release
notes within that branch. However today I had a sudden feeling of maybe
this is not the best way to do this.
I did not see any new commits in the master branch for a few months so I
used the "ours" method to merge the F25 branch into master to save
myself from dealing with the list of merge conflicts.
I thought that this method was probably not the most advisable way to do
this, but since the release notes gets a lot of new replacement content
each time it is published, I did not think we wanted to keep anything
from the previous edition.
Please let me know if this causes a problem bigger then I realize.