From d97583f10b23709746967c3a037099fd01c1d214 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 3 Jul 2017 15:34:21 +0100 Subject: [PATCH] Switch from redcarpet to kramdown --- Gemfile | 1 - Gemfile.lock | 2 -- _config.yml | 4 +--- index.md | 8 ++++---- spec/1.0.0-draft.9.md | 8 ++++---- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 4006953..8010f03 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,6 @@ source 'https://rubygems.org' # This will help ensure the proper Jekyll version is running. # Happy Jekylling! gem 'jekyll', '3.5.0' -gem 'redcarpet' # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. diff --git a/Gemfile.lock b/Gemfile.lock index bd30709..ef88fdf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,6 @@ GEM rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.24) @@ -49,7 +48,6 @@ DEPENDENCIES jekyll (= 3.5.0) jekyll-seo-tag jekyll-sitemap - redcarpet tzinfo-data BUNDLED WITH diff --git a/_config.yml b/_config.yml index 5e6993e..152ac12 100644 --- a/_config.yml +++ b/_config.yml @@ -19,6 +19,4 @@ defaults: values: layout: "default" -markdown: redcarpet -redcarpet: - extensions: ['autolink'] +markdown: kramdown diff --git a/index.md b/index.md index 79052ed..5ebb86b 100644 --- a/index.md +++ b/index.md @@ -88,12 +88,12 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 3. Git Best Practices 1. All commit messages SHOULD follow the Commit Guidelines and format from the official git documentation: - https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project + 2. You SHOULD always use "--force-with-lease" when doing a force push. The plain "--force" option is dangerous and destructive. More information: - https://developer.atlassian.com/blog/2015/04/force-with-lease/ + 3. You SHOULD understand and be comfortable with rebasing: - https://git-scm.com/book/en/v2/Git-Branching-Rebasing + 4. It is RECOMMENDED that you always do "git pull --rebase" instead of "git pull" to avoid unnecessary merge commits. You can make this the default behavior of "git pull" with "git config --global pull.rebase true". @@ -108,7 +108,7 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 2. If you are using a "VERSION" file in the root of the project, this MUST only contain the exact version string. 3. The version string SHOULD follow the Semantic Versioning - (http://semver.org/) format. Use of Semantic Versioning is OPTIONAL, but + () format. Use of Semantic Versioning is OPTIONAL, but the version string MUST NOT have a "v" prefix. For example "v2.11.4" is bad, and "2.11.4" is good. 5. Releases diff --git a/spec/1.0.0-draft.9.md b/spec/1.0.0-draft.9.md index 79052ed..5ebb86b 100644 --- a/spec/1.0.0-draft.9.md +++ b/spec/1.0.0-draft.9.md @@ -88,12 +88,12 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 3. Git Best Practices 1. All commit messages SHOULD follow the Commit Guidelines and format from the official git documentation: - https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project + 2. You SHOULD always use "--force-with-lease" when doing a force push. The plain "--force" option is dangerous and destructive. More information: - https://developer.atlassian.com/blog/2015/04/force-with-lease/ + 3. You SHOULD understand and be comfortable with rebasing: - https://git-scm.com/book/en/v2/Git-Branching-Rebasing + 4. It is RECOMMENDED that you always do "git pull --rebase" instead of "git pull" to avoid unnecessary merge commits. You can make this the default behavior of "git pull" with "git config --global pull.rebase true". @@ -108,7 +108,7 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). 2. If you are using a "VERSION" file in the root of the project, this MUST only contain the exact version string. 3. The version string SHOULD follow the Semantic Versioning - (http://semver.org/) format. Use of Semantic Versioning is OPTIONAL, but + () format. Use of Semantic Versioning is OPTIONAL, but the version string MUST NOT have a "v" prefix. For example "v2.11.4" is bad, and "2.11.4" is good. 5. Releases