From 5ada13fb45c3467482642b4933b4b4d4be0a8762 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Fri, 7 Jun 2013 10:51:53 -0700 Subject: [PATCH 1/5] Updated contributing documentation as per parkr. --- CONTRIBUTING.md | 16 ++++++++++++++++ site/docs/contributing.md | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b2b1eb6b..9014a047 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,6 +50,22 @@ Here's the most direct way to get your work merged into the project: * Create a pull request against mojombo/jekyll and describe what your change does and the why you think it should be merged. +Updating Documentation +---------------------- + +We want the jekyll documentation to be the best it can be and we welcome +pull request when you find it lacking. + +You can find the documentation for jekyllrb.com in the +[site/docs](https://github.com/zachgersh/jekyll/tree/master/site/docs) directory, +it is setup to use jekyll pages. + +All documentation pull requests should be directed at MASTER. We will +close pull requests that are not directed at master. + +The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) here on github can be freely updated without a pull +request as all github users have access. + Gotchas ------- diff --git a/site/docs/contributing.md b/site/docs/contributing.md index e7616a7e..dccf4328 100644 --- a/site/docs/contributing.md +++ b/site/docs/contributing.md @@ -82,6 +82,22 @@ git push origin my_awesome_feature * Create a pull request against mojombo/jekyll and describe what your change does and the why you think it should be merged. +Updating Documentation +---------------------- + +We want the jekyll documentation to be the best it can be and we +welcome pull request when you find it lacking. + +You can find the documentation for jekyllrb.com in the +[site/docs](https://github.com/mojombo/jekyll/tree/master/site/docs) +directory, it is setup to use jekyll pages. + +All documentation pull requests should be directed at MASTER. We +will close pull requests that are not directed at master. + +The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) here on github can be freely updated without a pull +request as all github users have access. + Gotchas ------- From 86b05370080ff30bb2eb5f77ab20d1388ad23918 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Fri, 7 Jun 2013 10:57:46 -0700 Subject: [PATCH 2/5] Slight rewording of the english to make it sound better. --- CONTRIBUTING.md | 6 +++--- site/docs/contributing.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9014a047..6a4eba83 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,10 +60,10 @@ You can find the documentation for jekyllrb.com in the [site/docs](https://github.com/zachgersh/jekyll/tree/master/site/docs) directory, it is setup to use jekyll pages. -All documentation pull requests should be directed at MASTER. We will -close pull requests that are not directed at master. +All documentation pull requests should be directed at MASTER. Pull +requests directed at another branch will not be accepted. -The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) here on github can be freely updated without a pull +The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) on github can be freely updated without a pull request as all github users have access. Gotchas diff --git a/site/docs/contributing.md b/site/docs/contributing.md index dccf4328..1bf9835b 100644 --- a/site/docs/contributing.md +++ b/site/docs/contributing.md @@ -92,10 +92,10 @@ You can find the documentation for jekyllrb.com in the [site/docs](https://github.com/mojombo/jekyll/tree/master/site/docs) directory, it is setup to use jekyll pages. -All documentation pull requests should be directed at MASTER. We -will close pull requests that are not directed at master. +All documentation pull requests should be directed at MASTER. Pull +requests directed at another branch will not be accepted. -The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) here on github can be freely updated without a pull +The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) on github can be freely updated without a pull request as all github users have access. Gotchas From ec1644dfd2f32bad81edfa9ca6406213e537e3e0 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Sun, 9 Jun 2013 21:34:45 -0700 Subject: [PATCH 3/5] Slight formatting changes to make everyone happy. --- CONTRIBUTING.md | 11 +++++------ site/docs/contributing.md | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6a4eba83..3887df16 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,18 +53,17 @@ Here's the most direct way to get your work merged into the project: Updating Documentation ---------------------- -We want the jekyll documentation to be the best it can be and we welcome +We want the Jekyll documentation to be the best it can be and we welcome pull request when you find it lacking. You can find the documentation for jekyllrb.com in the -[site/docs](https://github.com/zachgersh/jekyll/tree/master/site/docs) directory, -it is setup to use jekyll pages. +[site](https://github.com/mojombo/jekyll/tree/master/site) directory, +it is setup to use Jekyll pages. -All documentation pull requests should be directed at MASTER. Pull +All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. -The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) on github can be freely updated without a pull -request as all github users have access. +The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub can be freely updated without a pull request as all GitHub users have access. Gotchas ------- diff --git a/site/docs/contributing.md b/site/docs/contributing.md index 1bf9835b..adb46b5c 100644 --- a/site/docs/contributing.md +++ b/site/docs/contributing.md @@ -85,18 +85,17 @@ git push origin my_awesome_feature Updating Documentation ---------------------- -We want the jekyll documentation to be the best it can be and we +We want the Jekyll documentation to be the best it can be and we welcome pull request when you find it lacking. You can find the documentation for jekyllrb.com in the -[site/docs](https://github.com/mojombo/jekyll/tree/master/site/docs) -directory, it is setup to use jekyll pages. +[site](https://github.com/mojombo/jekyll/tree/master/site) +directory, it is setup to use Jekyll pages. -All documentation pull requests should be directed at MASTER. Pull +All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. -The [jekyll wiki](https://github.com/mojombo/jekyll/wiki) on github can be freely updated without a pull -request as all github users have access. +The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub can be freely updated without a pull request as all GitHub users have access. Gotchas ------- From 6e0bb5e0ba7ff8d95fcd781beef19443dd90900a Mon Sep 17 00:00:00 2001 From: zachgersh Date: Mon, 17 Jun 2013 21:36:08 -0700 Subject: [PATCH 4/5] Final changes for M & P. --- CONTRIBUTING.md | 11 ++++++----- site/docs/contributing.md | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3887df16..912be910 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,13 @@ Here's the most direct way to get your work merged into the project: Updating Documentation ---------------------- -We want the Jekyll documentation to be the best it can be and we welcome -pull request when you find it lacking. +We want the Jekyll documentation to be the best it can be. We've +open-sourced our docs and we welcome any pull requests if you find it +lacking. -You can find the documentation for jekyllrb.com in the -[site](https://github.com/mojombo/jekyll/tree/master/site) directory, -it is setup to use Jekyll pages. +You can find the documentation for jekyllrb.com in the +[site](https://github.com/mojombo/jekyll/tree/master/site) directory of +Jekyll's repo on GitHub.com. All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. diff --git a/site/docs/contributing.md b/site/docs/contributing.md index adb46b5c..b5f7e480 100644 --- a/site/docs/contributing.md +++ b/site/docs/contributing.md @@ -85,12 +85,13 @@ git push origin my_awesome_feature Updating Documentation ---------------------- -We want the Jekyll documentation to be the best it can be and we -welcome pull request when you find it lacking. +We want the Jekyll documentation to be the best it can be. We've +open-sourced our docs and we welcome any pull requests if you find it +lacking. You can find the documentation for jekyllrb.com in the -[site](https://github.com/mojombo/jekyll/tree/master/site) -directory, it is setup to use Jekyll pages. +[site](https://github.com/mojombo/jekyll/tree/master/site) directory of +Jekyll's repo on GitHub.com. All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. From c0c92a2e82b1023595960ccd3a43fa0fcf972128 Mon Sep 17 00:00:00 2001 From: zachgersh Date: Tue, 18 Jun 2013 08:17:57 -0700 Subject: [PATCH 5/5] Damn you spacing on my lines. --- CONTRIBUTING.md | 4 +++- site/docs/contributing.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 912be910..95ae0c8f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,7 +64,9 @@ Jekyll's repo on GitHub.com. All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. -The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub can be freely updated without a pull request as all GitHub users have access. +The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub +can be freely updated without a pull request as all +GitHub users have access. Gotchas ------- diff --git a/site/docs/contributing.md b/site/docs/contributing.md index b5f7e480..75bb7ba1 100644 --- a/site/docs/contributing.md +++ b/site/docs/contributing.md @@ -96,7 +96,9 @@ Jekyll's repo on GitHub.com. All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. -The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub can be freely updated without a pull request as all GitHub users have access. +The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub +can be freely updated without a pull request as all +GitHub users have access. Gotchas -------