Remove the code of conduct, tweak the communication guidelines

The code of conduct has historically not been of much use, while the
communication guidelines are more tangible. The two are also just kind
of redundant.

public/style.css

@@ -7937,6 +7937,9 @@ pre {
   margin-top: 0.5em;
   margin-bottom: 0.5em; }
 
+.post-content li:not(:last-child) {
+  margin-bottom: 0.2em; }
+
 .post-content img {
   max-width: 100%; }
 

src/hmnurl/urls.go

@@ -143,13 +143,6 @@ func BuildAbout() string {
 	return Url("/about", nil)
 }
 
-var RegexCodeOfConduct = regexp.MustCompile("^/code-of-conduct$")
-
-func BuildCodeOfConduct() string {
-	defer CatchPanic()
-	return Url("/code-of-conduct", nil)
-}
-
 var RegexCommunicationGuidelines = regexp.MustCompile("^/communication-guidelines$")
 
 func BuildCommunicationGuidelines() string {

src/rawdata/scss/_content.scss

@@ -109,6 +109,10 @@ pre {
     margin-bottom: 0.5em;
   }
 
+  li:not(:last-child) {
+    margin-bottom: 0.2em;
+  }
+
   img {
     max-width: 100%;
   }

src/templates/src/code_of_conduct.html

@@ -1,49 +0,0 @@
-{{ template "base.html" . }}
-
-{{ define "content" }}
-<div class="center-layout mw7 mv3 ph3 ph0-ns post-content">
-	<h1>Handmade Code of Conduct v1.0</h1>
-	<p>The Handmade community is an international community of programmers, designers, artists, musicians, mathematicians, and other creatives dedicated to building and improving high quality software.</p>
-	<p>Outlined herein are the guidelines we pledge to uphold to maintain a healthy community, stay true to the ideas first explored in our <a href="/manifesto">Manifesto</a> and refined by valuable feedback, and ensure we mature into a functional, inclusive, and innovative network.</p>
-	<h2>COMMUNITY</h2>
-	<h3>OPEN-MINDED</h3>
-	<p>The Handmade community strives to be unprejudiced—we welcome unusual ideas, encourage different points of view, and consider their effectiveness in reality.</p>
-	<p>The Handmade community does not waste time and alienate others by engaging in flame-wars, drawing out pointless arguments, singling out developers, or making attacks on the hard work of others; instead, we learn from exercising the methods that we believe to be reasonable, and offer suggestions on how to improve ourselves and others.</p>
-	<h3>DOWN-TO-EARTH</h3>
-	<p>Handmade favors the languages and tools that first serve the users of our software by not wasting their time and resources, and second those who develop it by making meaningful abstractions oriented to the task at hand.</p>
-	<p>We try to minimize the emergent complexity of tightly coupled systems, avoid the over-complication by refusing to blindly apply accepted strategies without clear understanding of their costs, and we prefer that which is simple to that which is easy. When uncertain, we make measurements and follow the data.</p>
-	<h3>DIVERSE</h3>
-	<p>Handmade encourages participation by everyone. We will do everything in our power to ensure everyone feels accepted and respected in their interactions with our community.</p>
-	<p>If someone has been harmed or offended, it is our responsibility to listen carefully and respectfully, and do our best to right the wrong. We accept that jokes and trolling can be taken too far and are not valid excuses for the alienation of any person.</p>
-	<p>Although this list cannot be exhaustive, we explicitly honour diversity in age, culture, ethnicity, family background, gender identity or expression, language, national origin, neurotype, phenotype, political beliefs, profession, race, religion, sexual orientation, socio-economic status, membership in other communities, and technical ability.</p>
-	<p>Some of the ideas and wording for this statement were based on diversity statements from <a class="external" href="https://www.ubuntu.com/about/about-ubuntu/diversity">Ubuntu Diversity Page</a>, which is in turn based on the Python community and Dreamwidth Studios (CC-BY-SA 3.0).</p>
-	<p>To see how we encourage participation by everyone, see our <a href="/communication-guidelines">Handmade Guide to Community Interaction</a>.</p>
-	<h2>INDIVIDUAL</h2>
-	<h3>INQUISITIVE</h3>
-	<p>The Handmade developer strives to understand their creations on a technical level. They will take the time on their personal software projects to meet their goals to the best of their abilities, without taking shortcuts that diminish the value of their work.</p>
-	<p>They include technical understanding and user experience as important metrics for the quality of their creations, and minimize trade-offs which impact these negatively.</p>
-	<p>They will ask questions exhaustively, and always re-evaluate what they consider to be a “good solution” in light of new evidence. Their curiosity is one of the primary driving forces in their work.</p>
-	<h3>CONSIDERATE</h3>
-	<p>The developer practices empathy; they try to understand how those they interact with and those they create for see the world in order to better understand each other.</p>
-	<p>They realize that their actions in both professional and community contexts can have consequences for other people that they may not immediately understand, and will do their best to correct themselves when they make a mistake.</p>
-	<p>They will, to the best of their abilities, keep those who enjoy their ongoing personal software projects up to date on the state of development and be honest about their progress and achievement of their stated goals.</p>
-	<h3>WILLING TO SHARE</h3>
-	<p>Handmade community members share their knowledge and expertise unflinchingly. They will not hesitate to lend a hand if the opportunity to improve the software development space arises.</p>
-	<p>They realize that their fellow community member not knowing something is an opportunity rather than a character flaw. They also realize that their knowledge and experience, however deep and long-collected, is not absolute, and accept that the experiences of others may differ.</p>
-	<h2>LEADERS</h2>
-	<h3>TIGHT-KNIT</h3>
-	<p>The Handmade Dev Team acts as one unit.</p>
-	<p>The staff are open with each other, make decisions unanimously, and perform their roles admirably for the benefit of the community.</p>
-	<h3>RECEPTIVE</h3>
-	<p>The leaders are receptive to the state of the community.</p>
-	<p>They will listen to everyone's concerns and make careful, considered judgment calls to move forward or solve a problem.</p>
-	<p>They will never place personal benefit over the well-being of the community, and only act against the community's immediate short-term interests if it’s for the long-term benefit of everyone involved.</p>
-	<h3>SERIOUS</h3>
-	<p>The leaders are serious about their roles.</p>
-	<p>They will uphold the ideas explored in the <a href="/manifesto">Manifesto</a>, setting the prime example of Handmade values in their development, behavior, and character.</p>
-	<p>They agree to enforce the code of conduct as written and accepted by the community, understanding that there are times when enforcement involves consequences for those shown to be in repeated and flagrant violation thereof.</p>
-	<p>They also agree to ensure all future revisions to such are accepted by and in the best interest of the community.</p>
-	<p>This code of conduct is released under a <a class="external" href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 International License</a>.</p>
-	<p class="c--dim i">Written by Jeroen van Rijn</p>
-</div>
-{{ end }}

src/templates/src/communication_guidelines.html

@@ -2,25 +2,25 @@
 
 {{ define "content" }}
 <div class="center-layout mw7 mv3 ph3 ph0-ns post-content">
-	<h1>Handmade Guide to Community Interaction v1.0</h1>
+	<h1>Handmade Guide to Community Interaction</h1>
 	<h2>Our Philosophy</h2>
-	<p>The Handmade community strives to create an environment conducive to innovation, education, and constructive discussion. To that end, we expect members of the site to respect the following set of principles to maintain civil discourse and create an inclusive environment.</p>
+	<p>The Handmade community strives to create an environment conducive to innovation, education, and constructive discussion. To that end, we expect members of the community to respect the following set of principles to maintain civil discourse and create an inclusive environment.</p>
 	<h2>Discourse</h2>
 	<ul>
 		<li>The community is mostly business, with a bit of fun. Discussion should primarily be about software development, and in particular about the relevant project or topic at hand.</li>
 		<li>Support arguments with evidence and rational discussion. Don't resort to ad hominem attacks or personality judgments.</li>
 		<li>Differing opinions are valuable and should be respected. Not everyone sees eye-to-eye on every matter, but we're all trying to write useful software.</li>
-		<li>Language has meaning, and can be used in destructive ways. Be aware that what you say may not seem injurious to you, but might make someone else's experience on the site tangibly worse. If you are asked to reconsider your conduct, please exercise some introspection. We want everyone to feel welcome here. This includes people both inside and outside the Handmade community.</li>
+		<li>Language has meaning, and can be used in destructive ways. Be aware that what you say may not seem injurious to you, but might make someone else's experience tangibly worse. If you are asked to reconsider your conduct, please exercise some introspection. We want everyone to feel welcome here. This includes people both inside and outside the Handmade community.</li>
 		<li>Be aware of differences in English comprehension and culture. What you say may be misinterpreted by a more fluent or less fluent speaker, or someone from a different culture. Misunderstandings should be resolved with the help of a third party, preferably a staff member.</li>
 	</ul>
 	<h2>Inclusiveness</h2>
 	<p>The Handmade community will encourage participation of underrepresented groups. In order to promote diversity among the community, a Handmade community member shall not:</p>
 	<ul>
-		<li>Sexualize or objectify other members, even if you think it’s a compliment.</li>
+		<li>Sexualize or objectify others, even if you think it's a compliment.</li>
 		<li>Use pejoratives or excessively rely on foul language, especially if used to attack an individual.</li>
 		<li>Denigrate, belittle, defame, or speak ill of any individual.</li>
 		<li>Leave unsubstantiated or unjust criticism on someone's work, or disparage a person while critiquing their work.</li>
-		<li>Dismiss other people’s contributions, opinions, or concerns based on their personal attributes, especially those described in the Diversity section of the code of conduct.</li>
+		<li>Dismiss other people's contributions, opinions, or concerns based on their personal attributes.</li>
 		<li>Be rude. Disagreement is not an excuse to be flippant or inconsiderate.</li>
 		<li>Antagonize others, particularly if a disagreement has occurred. Instead, a peaceful resolution should be sought, with an impartial third party if necessary.</li>
 		<li>Assume a motive for uncharacteristic behavior. Everyone has a bad day.</li>
@@ -39,6 +39,6 @@
 	<p>It is up to the discretion of the moderators to determine when these guidelines are being met, and they are permitted to act accordingly.</p>
 	<p>If you feel an action has been made against you unreasonably, please contact the <a href="/contact">Handmade Network Team</a> privately with your grievance and we will review the decision.</p>
 	<p>This code of conduct is released under a <a class="external" href="https://creativecommons.org/licenses/by-sa/4.0">Creative Commons Attribution-ShareAlike 4.0 International License</a>.</p>
-	<p class="c--dim i">Written by Jeroen van Rijn</p>
+	<p class="c--dim i">Last updated by Ben Visness. Original by Jeroen van Rijn.</p>
 </div>
 {{ end }}

src/templates/src/include/footer.html

@@ -19,9 +19,6 @@
         <li class="{{ $footerClasses }}">
             <a href="{{ .Footer.ProjectIndexUrl }}">Projects</a>
         </li>
-        <li class="{{ $footerClasses }}">
-            <a href="{{ .Footer.CodeOfConductUrl }}">Code of Conduct</a>
-        </li>
         <li class="{{ $footerClasses }}">
             <a href="{{ .Footer.CommunicationGuidelinesUrl }}">Communication Guidelines</a>
         </li>

src/website/base_data.go

@@ -79,7 +79,6 @@ func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadc
 			HomepageUrl:                hmnurl.BuildHomepage(),
 			AboutUrl:                   hmnurl.BuildAbout(),
 			ManifestoUrl:               hmnurl.BuildManifesto(),
-			CodeOfConductUrl:           hmnurl.BuildCodeOfConduct(),
 			CommunicationGuidelinesUrl: hmnurl.BuildCommunicationGuidelines(),
 			ProjectIndexUrl:            hmnurl.BuildProjectIndex(1),
 			ForumsUrl:                  hmnurl.HMNProjectContext.BuildForum(nil, 1),

src/website/routes.go

@@ -160,7 +160,6 @@ func NewWebsiteRoutes(longRequestContext context.Context, conn *pgxpool.Pool) ht
 	// NOTE(asaf): HMN-only routes:
 	hmnOnly.GET(hmnurl.RegexManifesto, Manifesto)
 	hmnOnly.GET(hmnurl.RegexAbout, About)
-	hmnOnly.GET(hmnurl.RegexCodeOfConduct, CodeOfConduct)
 	hmnOnly.GET(hmnurl.RegexCommunicationGuidelines, CommunicationGuidelines)
 	hmnOnly.GET(hmnurl.RegexContactPage, ContactPage)
 	hmnOnly.GET(hmnurl.RegexMonthlyUpdatePolicy, MonthlyUpdatePolicy)

src/website/staticpages.go

@@ -20,18 +20,6 @@ func About(c *RequestContext) ResponseData {
 	return res
 }
 
-func CodeOfConduct(c *RequestContext) ResponseData {
-	baseData := getBaseDataAutocrumb(c, "Code of Conduct")
-	baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{
-		Property: "og:description",
-		Value:    "The Handmade community is an international community of creatives dedicated to building and improving high quality software. These are the guidelines we pledge to uphold to maintain a healthy community.",
-	})
-
-	var res ResponseData
-	res.MustWriteTemplate("code_of_conduct.html", baseData, c.Perf)
-	return res
-}
-
 func CommunicationGuidelines(c *RequestContext) ResponseData {
 	baseData := getBaseDataAutocrumb(c, "Communication Guidelines")
 	baseData.OpenGraphItems = append(baseData.OpenGraphItems, templates.OpenGraphItem{