Merge remote-tracking branch 'origin/master' into slides/209-process_include_statements

Author: frank-at-adacore

contrib/sort_keywords.py

@@ -78,7 +78,7 @@ where :filename:`{filename}` can be a package spec or body
 
 * Package spec
 
-  * :toolname:`GNATstub` will generate a package body containing "dummy" bodies for subprograms defined not completed in the spec
+  * :toolname:`GNATstub` will generate a package body containing "dummy" bodies for subprograms defined but not completed in the spec
 
 * Package body
 
@@ -206,7 +206,11 @@ Other Common Switches
 
 :command:`--force`
 
+<<<<<<< HEAD
    Overwrite any existing file (without this, :toolname:`GNATstub` will flag as an error
+=======
+   Overwrite any existing file (without this, :toolname:`GNATstub` will flag as an error)
+>>>>>>> origin/master
 
 :command:`--output-dir=<directory>`
 
@@ -242,7 +246,11 @@ Improving on :toolname:`GNATstub`
     * Read sensors
     * Write to a console
 
+<<<<<<< HEAD
 * You can modify the generated stub(s) do implement all this
+=======
+* You can modify the generated stub(s) to implement all this
+>>>>>>> origin/master
 
 -----------------------------
 Beyond :toolname:`GNATstub`

courses/misc_tools/100_gnatstub.rst

@@ -2,7 +2,7 @@
 :toolname:`GNATstub` Lab
 --------------------------
 
-* We are going implement a simple math package that does addition and subtraction
+* We are going to implement a simple math package that does addition and subtraction
 
    * The exectuable takes 3 numbers on the command line - adds the first two, subtracts the third, and prints the result