Merge branch 'main' into dev

tnelson · Jan 31, 2024 · 5e58760 · 5e58760
2 parents 8af5305 + 69a13cf
commit 5e58760
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Forge also uses [Sterling](https://sterling-js.github.io/), an expanded and scri
 
 ## Documentation
 
-The [official Forge documentation](https://github.com/tnelson/Forge/wiki) can be found on the Wiki in this repo.
+The [Forge documentation page](https://csci1710.github.io/forge-documentation/) is the best resource for Forge syntax, etc.; the Wiki on this repo may not be up to date. 
 Note that the documentation is a living document and work in progress; we will be updating it live as students and other users ask questions.
 
 For broader historical context on Forge, the [Alloy documentation

diff --git a/forge/info.rkt b/forge/info.rkt
@@ -2,7 +2,7 @@
 
 (define collection "forge")
 
-(define version "2.10")
+(define version "2.11")
 
 (define implies '("froglet"))
 (define deps '("base"