Merge pull request #284 from maxim-belkin/fix-links-md

Add links.md to files in boilerplate

diff --git a/.gitignore b/.gitignore
index 8b84b8e6a397550df92dbf785ddb519bb5beef6e..128437da45e107d9c7e14e943c29e84cb723065c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 __pycache__
 _site
 .Rproj.user
+.Rhistory
+.RData
+

diff --git a/Makefile b/Makefile
index 74f655d6f8c79d9d3f847d2efb229a17d51a3a06..f0b73e6064bf52e64c6c27967a70c81a21cc2d89 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
 JEKYLL=jekyll
+JEKYLL_VERSION=3.7.3
 PARSER=bin/markdown_ast.rb
 DST=_site
 
@@ -16,6 +17,10 @@ all : commands
 commands :
        @grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'
 
+## docker-serve     : use docker to build the site
+docker-serve :
+       docker run --rm -it -v ${PWD}:/srv/jekyll -p 127.0.0.1:4000:4000 jekyll/jekyll:${JEKYLL_VERSION} make serve
+
 ## serve            : run a local server.
 serve : lesson-md
        ${JEKYLL} serve

diff --git a/CODE_OF_CONDUCT.md b/bin/boilerplate/CODE_OF_CONDUCT.md
similarity index 94%
rename from CODE_OF_CONDUCT.md
rename to bin/boilerplate/CODE_OF_CONDUCT.md
index acf6fb69a2966172764542a6ae3284cf96d1f0e1..c3b9669073c596aa8081d17f06a0f8a04c677c08 100644 (file)
--- a/CODE_OF_CONDUCT.md
+++ b/bin/boilerplate/CODE_OF_CONDUCT.md
@@ -1,7 +1,6 @@
 ---
 layout: page
 title: "Contributor Code of Conduct"
-permalink: /conduct/
 ---
 As contributors and maintainers of this project,
 we pledge to follow the [Carpentry Code of Conduct][coc].

diff --git a/bin/lesson_initialize.py b/bin/lesson_initialize.py
index a5eb6d05c63df3ba1d757b00b920241db3907b30..a96ba383a4046c39527d771872e6158867e502ba 100755 (executable)
--- a/bin/lesson_initialize.py
+++ b/bin/lesson_initialize.py
@@ -11,6 +11,7 @@ BOILERPLATE = (
     '.travis.yml',
     'AUTHORS',
     'CITATION',
+    'CODE_OF_CONDUCT.md',
     'CONTRIBUTING.md',
     'README.md',
     '_config.yml',