diff --git a/server/views/resources/code-of-conduct.jade b/server/views/resources/code-of-conduct.jade
index 2b3efed609..06873d224f 100644
--- a/server/views/resources/code-of-conduct.jade
+++ b/server/views/resources/code-of-conduct.jade
@@ -3,23 +3,18 @@ block content
.col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3
h1.text-center Code of Conduct
hr
- p
- | Free Code Camp is a friendly place to learn to code. We’re committed to keeping it that way.
- p
- | All campers are required to agree to and follow this code of conduct.
- p
- | In short: Be nice. No harassment, Trolling, or Spamming.
+ p Free Code Camp is a friendly place to learn to code. We’re committed to keeping it that way.
+ p By using Free Code Camp, you agree that you'll follow this code of conduct.
+ p In short: Be nice. No harassment, trolling, or spamming.
ul
- li Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel and any malicious hacking or social engineering. Free Code Camp should be a harassment-free experience for everyone,regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof).
- li Trolling includes posting inflamitory comments to provoke an emotional response or disrupt discussions.
- li Spamming includes posting off-topic messages to disrupt discussions or promote a product.
- p
- | If you see someone harass, troll, or spam anywhere on Free Code Camp's online media (Gitter, YouTube, Facebook, etc.), notify us in our
+ li Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel and any malicious hacking or social engineering. Free Code Camp should be a harassment-free experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof).
+ li Trolling includes posting inflamitory comments to provoke an emotional response or disrupt discussions.
+ li Spamming includes posting off-topic messages to disrupt discussions or promote a product.
+ p If you see someone harass, troll, or spam anywhere on Free Code Camp's online media (Gitter, YouTube, Facebook, etc.), notify us in our
a(href='https://gitter.im/freecodecamp/admin' target='_blank') Admin room in Gitter
| - preferably with a screen shot of the offense. Our team will take any action we deem appropriate, up to and including banning the offender from Free Code Camp.
- p
- | Also, no bots are allowed in any of our Official Chat Rooms without prior written permission from the
+ p Also, no bots are allowed in our chat rooms or on our forum without prior written permission from
a(href='https://gitter.im/FreeCodeCamp/CoreTeam' target="_blank") Free Code Camp's Core Team.
- p
- | If you have questions about this code of conduct, email us at
+ p If you have questions about this code of conduct, email us at
a(href='mailto:team@freecodecamp.com') team@freecodecamp.com
+ | .