Commit e5618a51 authored by François Michonneau's avatar François Michonneau
Browse files

merge styles v9.5.2

parents bed7cd9b 0ff9a92c

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -6,3 +6,6 @@ 
__pycache__

_site

.Rproj.user

.Rhistory

.RData

CONDUCT.md→CODE_OF_CONDUCT.md

+0 −0

File moved.

View file

Makefile

+6 −1
Original line number Diff line number Diff line
@@ -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
@@ -63,7 +68,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/lesson_footer.html

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
  <div class="row">

    <div class="col-md-12" align="center">

      Using <a href="https://github.com/carpentries/styles/">The Carpentries style</a>

      version <a href="https://github.com/carpentries/styles/releases/tag/v9.5.0">9.5.0</a>.

      version <a href="https://github.com/carpentries/styles/releases/tag/v9.5.2">9.5.2</a>.

    </div>

  </div>

</footer>

_includes/links.md

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
[cran-checkpoint]: https://cran.r-project.org/package=checkpoint

[cran-knitr]: https://cran.r-project.org/package=knitr

[cran-stringr]: https://cran.r-project.org/package=stringr

[email]: mailto:lessons@software-carpentry.org

[email]: mailto:team@carpentries.org

[github-importer]: https://import.github.com/

[importer]: https://github.com/new/import

[jekyll-collection]: https://jekyllrb.com/docs/collections/