Merge branch 'st3-develop' into st4-develop

Author: deathaxe

make.cmd

@@ -52,16 +52,23 @@ goto :usage
 
 :RELEASE
     if "%2"== "" goto :usage
-    if not exist "messages/release-%2.md" (
-        echo Missing release-%2.md
+    set st3_changelog=release-st3-%2.md
+    set st4_changelog=release-st4-%2.md
+
+    if not exist "messages/%st3_changelog%" (
+        echo Missing %st3_changelog%
+        exit /b 1
+    )
+    if not exist "messages/%st4_changelog%" (
+        echo Missing %st4_changelog%
         exit /b 1
     )
-    git checkout st3176 --autostash && git merge st3-develop --no-ff
+    git checkout st3176 && git merge st3-develop --no-ff
     if not errorlevel 0 (
         echo Unable to merge st3-develop into st3176!
         exit /b 1
     )
-    git checkout master --autostash && git merge st4-develop --no-ff
+    git checkout master && git merge st4-develop --no-ff
     if not errorlevel 0 (
         echo Unable to merge st4-develop into master!
         exit /b 1
@@ -81,9 +88,9 @@ goto :usage
     echo Hit any key to publish release!
     pause
     : create release for ST3
-    gh release create --target st3176 -t "MarkdownEditing %2 (ST3176+)" -F "messages/release-%2.md" "3176-%2"
+    gh release create --target st3176 -t "MarkdownEditing %2 (ST3176+)" -F "messages/%st3_changelog%" "3176-%2"
     : create release for ST3
-    gh release create --target master -t "MarkdownEditing %2 (ST4107+)" -F "messages/release-%2.md" "4107-%2"
+    gh release create --target master -t "MarkdownEditing %2 (ST4107+)" -F "messages/%st4_changelog%" "4107-%2"
     git fetch
     goto :eof
 

messages/3.1.4.md

@@ -14,7 +14,7 @@ feedback you can use [GitHub issues][issues].
 
 ## Changes
 
-* Use lower case check mark completed gfm tasks `- [x] task` (#696)
+* Use lower case `x` for completed gfm tasks `- [x] task` (#696)
 * Improve accuracy of (incomplete) inline MathJAX ($1+\srqt{b$) expressions
 * Improve incomplete/standalone/inline math blocks highlighting