diff --git a/content/contributing/core-team/contents.lr b/content/contributing/core-team/contents.lr
index bce1ddb12f..c9db2a88db 100644
--- a/content/contributing/core-team/contents.lr
+++ b/content/contributing/core-team/contents.lr
@@ -43,12 +43,12 @@ Senior Apiarists:
responsibility to oversee the project as a whole. They are able to make
architectural decisions, but ultimately answer to the BDFN.
-Founding Apiarist: `Russell Keith-Magee <https://twitter.com/freakboy3742>`_
+Founding Apiarist: `Russell Keith-Magee <https://cloudisland.nz/@freakboy3742>`_
- The man that first stood on a hill and spied a yak that needed shaving
- This role never changes, and continues ad infinitum
- This role is different to the BDFN role
-Bee-nevolent Dictator for Now (BDFN): `Russell Keith-Magee <https://twitter.com/freakboy3742>`_
+Bee-nevolent Dictator for Now (BDFN): `Russell Keith-Magee <https://cloudisland.nz/@freakboy3742>`_
- A take on `Benevolent Dictator for Life
<https://en.wikipedia.org/wiki/Benevolent_dictator_for_life>`_,
responsibility for the direction and decisions of the project ultimately
@@ -58,7 +58,6 @@ Bee-nevolent Dictator for Now (BDFN): `Russell Keith-Magee <https://twitter.com/
outside open source, and code/life balance and general well-being
is a very important thing to keep in mind.
-
Guidelines (not actual rules)
------------------------------
@@ -66,40 +65,43 @@ As with any project with more than one person with commit rights, there are a
number of general guidelines that the team should follow:
- * **Be a good representation of the project to the wider community**
+* **Be a good representation of the project to the wider community**
+
+* **Treat every enquiry and contribution to any BeeWare project with respect**
+
+* Assume everyone has good intentions, even if they haven't chosen their
+ words well
+
+* Assume that if someone has done something the "wrong" way, it's because
+ we've failed in communicating process
+
+* Assume any expression of anger or frustration comes from a genuine place of
+ wanting to use a BeeWare tool/library
- * **Treat every enquiry and contribution to any BeeWare project with respect.**
+* Encourage other members of the community to reflect these ideals in their
+ own communications, both inside and outside the BeeWare community
- * **Assume everyone has good intentions, even if they haven't chosen their
- words well**
+* No Apiarist should commit their own code
- * **Assume that if someone has done something the "wrong" way, it's because
- we've failed in communicating process**
+ * Exception: "Something is very broken and needs to be fixed now"
- * **Assume any expression of anger or frustration comes from a genuine place of
- wanting to use a BeeWare tool/library**
+ * Exception: BDFN (this may change in the future)
- * **Encourage other members of the community to reflect these ideals in their
- own communications, both inside and outside the BeeWare community**
+* All code submitted for review by a core team member should be reviewed by another team member
- * No Apiarist should commit their own code
- - Exception: "Something is very broken and needs to be fixed now"
- - Exception: BDFN (this may change in the future)
+ * Exception: BDFN (this may change in the future)
- * All code submitted for review by a core team member should be reviewed by another team member
- - Exception: BDFN (this may change in the future)
+* All code should pass Continuous Integration tests before being merged
- * All code should pass Continuous Integration tests before being merged
- - Exception: code that is known to be broken and needs to be committed for other reasons
- - Exception: code in a repo with insufficient CI tests
- - Exception: Working and committed is better than perfect and not
+ * Exception: code that is known to be broken and needs to be committed for other reasons
- * Acceptance processes should be automated wherever possible
- - This means tests, linting, spell checking, coverage, and more.
- - This is a `work in progress <http://pybee.org/project/projects/tools/beefore/>`_
+ * Exception: code in a repo with insufficient CI tests
+ * Exception: Working and committed is better than perfect and not
+* Acceptance processes should be automated wherever possible
+ * This means tests, linting, spell checking, coverage, and more
Becoming an Apiarist
---------------------
@@ -115,7 +117,7 @@ may ask to be given permission to commit to the project.
All new apiarists will be 'inducted' (for lack of a better word) in the core
values and guidelines of the project. A summary of the core values can be found
-`on the about page <http://pybee.org/project/about/>`_. Anyone who joins the
+`on the about page </project/about/>`_. Anyone who joins the
team will be expected to uphold those values, and contribute to discussions
about evolving those values over time.