Merge 3.16 (after 3.16.2-rc1) into 7.0

2018-10-26 17:04:53 -05:00
parent c08b1ef5d1 94ebd0fe48
commit 2efe56c6d1
157 changed files with 5520 additions and 1623 deletions
--- a/documentation/ReleaseChecklist.html
+++ b/documentation/ReleaseChecklist.html
@ -133,7 +133,7 @@ made.</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>R7.1.1-pre<i>n</i></tt>
@ -143,7 +143,7 @@ made.</p>
            <tt>R7.1.1-rc<i>n</i></tt>
            &mdash; release candidate tag
            </li>
-        </ul>
+          </ul>
        <blockquote><tt>
          cd base-7.1<br />
          git tag -m 'ANJ: Tagged for 7.1.1-rc1' R7.1.1-rc1