Merge changes I3ed7c0c9,Ie8a04df3,Ie844f5ac
* changes:
website: Fixed typos and awkward phrasing in Contributing guide
website: Updated contributing notes to show CI unit tests
website: Updated documentation for master-as-stable setup
diff --git a/CNAME b/CNAME
index b1686d7..bc61c2d 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1 @@
-new.gem5.org
\ No newline at end of file
+www.gem5.org
diff --git a/_config.yml b/_config.yml
index e94f98a..4ddaaa5 100755
--- a/_config.yml
+++ b/_config.yml
@@ -1,7 +1,7 @@
# Site Settings
title: gem5
sourceurl: "https://gem5.googlesource.com/public/gem5-website/+/refs/heads/master/README.md"
-url: "https://new.gem5.org/"
+url: "https://www.gem5.org/"
defaults:
-
