Merge up changes from 3.15 branch into 3.16

2018-10-19 11:49:57 -05:00
parent e7e9e66651 eed208afaa
commit 531ab6fc36
62 changed files with 1679 additions and 1064 deletions
--- a/documentation/ReleaseChecklist.html
+++ b/documentation/ReleaseChecklist.html
@ -131,7 +131,7 @@ the final release version.</p>
    <tr>
      <td>&nbsp;</td>
      <td>Release Manager</td>
-      <td>Tag the module in Git using these tag conventions:
+      <td>Tag the module in Git, using these tag conventions:
        <ul>
          <li>
            <tt>R3.16.1-pre<i>n</i></tt>
@ -141,7 +141,7 @@ the final release version.</p>
            <tt>R3.16.1-rc<i>n</i></tt>
            &mdash; release candidate tag
            </li>
-        </ul>
+          </ul>
        <blockquote><tt>
          cd base-3.16<br />
          git tag -m 'ANJ: Tagged for 3.16.1-rc1' R3.16.1-rc1