Merge branch '36-v1-0-0' into 'main'

Doc update for release v1.0.0 Closes #36 See merge request feng/training/labs_solar_system!24
AdaCore · Oct 5, 2023 · 6a90e91 · 6a90e91
2 parents 5b4b6fd + 4f65063
commit 6a90e91
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v1.0.0
+
+* Add back: 160 genericity and 170 multiple inheritance labs
+  - With that, porting from the old repo is complete
+* Code is automatically CI-tested
+* Review and fix all copyright notices
+* Fix "Interfacing with C" instructions
+* Sphinx Doc displays the package number
+* Sphinx index typo
+
 # v0.9.1
 
 * Define custom makefile targets

diff --git a/alire.toml b/alire.toml
@@ -1,6 +1,6 @@
 name = "labs_solar_system"
 description = "A set of SDL-based exercises to learn Ada"
-version = "0.9.1"
+version = "1.0.0"
 website = "https://public-training.adacore.com/doc/labs/solar_system/index.html"
 
 authors = ["Léo Germond"]
@@ -12,4 +12,4 @@ executables = ["getting_started_main"]
 tags = ["training", "labs", "graphics", "windowed"]
 
 [[depends-on]]
-mage = "~0.6.0"
+mage = "~0.6.1"
diff --git a/doc/index.rst b/doc/index.rst
@@ -26,7 +26,7 @@ In order to work on the labs you must first start gnat studio.
 
 ``make edit``
 
-On the scenario tab on the left (if it's not there click the View menu > Scenario), chose
+On the scenario tab on the left (if it's not there click the View menu > Scenario), choose
 the lab you want to work by setting the "Lab" scenario variable. Make sure that "Mode" is set
 to "Problem".