Merge "website: Migrate ARM Linux Kernel page from old wiki"
diff --git a/README.md b/README.md
index c047356..b4f784a 100755
--- a/README.md
+++ b/README.md
@@ -34,13 +34,29 @@
The commit message must adhere to our style. The first line of the commit
is the "header". **The header line must not exceed 65 characters and adequately
-describe the change**.
+describe the change**. To be consistent with commits made to the gem5 gerrit,
+the header should start with a `website` tag followed by a colon.
After this, a more detailed description of the commit can be included. This is
inserted below the header, separated by an empty line. Including a description
is optional but strongly recommended for complex changes. The description may
span multiple lines, and multiple paragraphs. **No line in the description
-may exceed 75 characters**.
+may exceed 75 characters**. We also recommend adding reference to any relevant
+Jira issue (from the gem5 Jira: <https://gem5.atlassian.net>) so the context
+of a change can be more easily understood.
+
+Below is an example of how a gem5 website commit message should be formatted:
+
+```
+website: This is an example header
+
+This is a more detailed description of the commit. This can be as long as
+is necessary to adequately describe the change.
+
+A description may spawn multiple paragraphs if desired.
+
+Jira: https://gem5.atlassian.net/browse/GEM5-186
+```
## Submitting a contribution
diff --git a/_pages/mailing_list.md b/_pages/mailing_list.md
index 5a267b7..adf8dc0 100644
--- a/_pages/mailing_list.md
+++ b/_pages/mailing_list.md
@@ -6,11 +6,11 @@
There are two mailing lists for gem5:
-* gem5-dev ([subscribe](http://www.gem5.org/mailman/listinfo/gem5-dev)) ---
+* gem5-dev ([subscribe](http://m5sim.org/mailman/listinfo/gem5-dev)) ---
Discussions regarding gem5 development. Bug reports should be submitted to our
[Jira Issue Tracker](https://gem5.atlassian.net), though the gem5-dev mailing
list can be used to discuss bugs in greater detail.
-* gem5-users ([subscribe](http://www.gem5.org/mailman/listinfo/gem5-users)) ---
+* gem5-users ([subscribe](http://m5sim.org/mailman/listinfo/gem5-users)) ---
General discussions about gem5 and its use.
# Mail Archive
