Unverified Commit 0e0f2bf4 authored by Raniere Silva's avatar Raniere Silva Committed by GitHub
Browse files

Merge pull request #280 from katrinleinweber/patch-3 

Rename CoC file to align with GitHub's Community Profile expectation
parents 2a7326fb 5d78abcd

CONDUCT.md→CODE_OF_CONDUCT.md

+0 −0

File moved.

View file

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ RMD_DST = $(patsubst _episodes_rmd/%.Rmd,_episodes/%.md,$(RMD_SRC)) 
# Lesson source files in the order they appear in the navigation menu.

MARKDOWN_SRC = \

  index.md \

  CONDUCT.md \

  CODE_OF_CONDUCT.md \

  setup.md \

  $(sort $(wildcard _episodes/*.md)) \

  reference.md \

_includes/navbar.html

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
      <ul class="nav navbar-nav">



	{% comment %} Always show code of conduct. {% endcomment %}

        <li><a href="{{ page.root }}{% link CONDUCT.md %}">Code of Conduct</a></li>

        <li><a href="{{ page.root }}{% link CODE_OF_CONDUCT.md %}">Code of Conduct</a></li>



        {% if site.kind == "lesson" %}

	{% comment %} Show setup instructions. {% endcomment %}

bin/boilerplate/CONTRIBUTING.md

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ In exchange, 
we will address your issues and/or assess your change proposal as promptly as we can,

and help you become a member of our community.

Everyone involved in [Software Carpentry][swc-site] and [Data Carpentry][dc-site]

agrees to abide by our [code of conduct](CONDUCT.md).

agrees to abide by our [code of conduct](CODE_OF_CONDUCT.md).



## How to Contribute

bin/lesson_check.py

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ SOURCE_DIRS = ['', '_episodes', '_extras'] 
# specially. This list must include all the Markdown files listed in the

# 'bin/initialize' script.

REQUIRED_FILES = {

    '%/CONDUCT.md': True,

    '%/CODE_OF_CONDUCT.md': True,

    '%/CONTRIBUTING.md': False,

    '%/LICENSE.md': True,

    '%/README.md': False,