From 839f23102768de8d42a0192160e91cd0ced3065a Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Fri, 23 Aug 2013 22:59:10 +0200 Subject: [PATCH 1/4] Replace yoursite.com by example.com --- CONTRIBUTING.markdown | 5 ++++- site/docs/pages.md | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown index 6df99625..7831eb48 100644 --- a/CONTRIBUTING.markdown +++ b/CONTRIBUTING.markdown @@ -68,7 +68,10 @@ You can find the documentation for jekyllrb.com in the 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. +requests directed at another branch will not be accepted. + +Use the domain `example.com` as an example in order to comply with the +[RFC 2606](http://tools.ietf.org/html/rfc2606). 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. diff --git a/site/docs/pages.md b/site/docs/pages.md index 283c31cf..e7b837fa 100644 --- a/site/docs/pages.md +++ b/site/docs/pages.md @@ -53,9 +53,9 @@ and associated URLs might look like: |-- _layouts/ |-- _posts/ |-- _site/ -|-- about.html # => http://yoursite.com/about.html -|-- index.html # => http://yoursite.com/ -└── contact.html # => http://yoursite.com/contact.html +|-- about.html # => http://example.com/about.html +|-- index.html # => http://example.com/ +└── contact.html # => http://example.com/contact.html {% endhighlight %} ### Named folders containing index HTML files @@ -76,10 +76,10 @@ look like: ├── _posts/ ├── _site/ ├── about/ -| └── index.html # => http://yoursite.com/about/ +| └── index.html # => http://example.com/about/ ├── contact/ -| └── index.html # => http://yoursite.com/contact/ -└── index.html # => http://yoursite.com/ +| └── index.html # => http://example.com/contact/ +└── index.html # => http://example.com/ {% endhighlight %} This approach may not suit everyone, but for people who like clean URLs it’s From 9291ca7492669e794092b5a9a17620bafc9a6d00 Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Sat, 24 Aug 2013 18:23:14 +0200 Subject: [PATCH 2/4] Revert hint --- CONTRIBUTING.markdown | 3 --- 1 file changed, 3 deletions(-) diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown index 7831eb48..88c0ced5 100644 --- a/CONTRIBUTING.markdown +++ b/CONTRIBUTING.markdown @@ -70,9 +70,6 @@ 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. -Use the domain `example.com` as an example in order to comply with the -[RFC 2606](http://tools.ietf.org/html/rfc2606). - 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. From 29ef18828aff65295ad145714a9b9ec6dae0ff4f Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Sat, 24 Aug 2013 18:25:01 +0200 Subject: [PATCH 3/4] Revert stupid whitespace --- CONTRIBUTING.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown index 88c0ced5..6df99625 100644 --- a/CONTRIBUTING.markdown +++ b/CONTRIBUTING.markdown @@ -68,7 +68,7 @@ You can find the documentation for jekyllrb.com in the 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. +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. From 4abd93567f094a416fded96022673e1261a4e2b4 Mon Sep 17 00:00:00 2001 From: Anatol Broder Date: Fri, 30 Aug 2013 21:26:38 +0200 Subject: [PATCH 4/4] Example FTW --- features/site_data.feature | 8 ++++---- site/docs/deployment-methods.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/features/site_data.feature b/features/site_data.feature index 9ab94056..faa266b7 100644 --- a/features/site_data.feature +++ b/features/site_data.feature @@ -4,10 +4,10 @@ Feature: Site data In order to make the site slightly dynamic Scenario: Use page variable in a page - Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@me.com" + Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com" When I run jekyll Then the _site directory should exist - And I should see "Contact: email@me.com" in "_site/contact.html" + And I should see "Contact: email@example.com" in "_site/contact.html" Scenario Outline: Use page.path variable in a page Given I have a directory @@ -95,10 +95,10 @@ Feature: Site data Scenario: Use configuration date in site payload Given I have an "index.html" page that contains "{{ site.url }}" - And I have a configuration file with "url" set to "http://mysite.com" + And I have a configuration file with "url" set to "http://example.com" When I run jekyll Then the _site directory should exist - And I should see "http://mysite.com" in "_site/index.html" + And I should see "http://example.com" in "_site/index.html" Scenario: Access Jekyll version via jekyll.version Given I have an "index.html" page that contains "{{ jekyll.version }}" diff --git a/site/docs/deployment-methods.md b/site/docs/deployment-methods.md index 41c5472e..63fd7021 100644 --- a/site/docs/deployment-methods.md +++ b/site/docs/deployment-methods.md @@ -37,7 +37,7 @@ this](http://web.archive.org/web/20091223025644/http://www.taknado.com/en/2009/0 To have a remote server handle the deploy for you every time you push changes using Git, you can create a user account which has all the public keys that are authorized to deploy in its `authorized_keys` file. With that in place, setting up the post-receive hook is done as follows: {% highlight bash %} -laptop$ ssh deployer@myserver.com +laptop$ ssh deployer@example.com server$ mkdir myrepo.git server$ cd myrepo.git server$ git --bare init @@ -63,7 +63,7 @@ Finally, run the following command on any users laptop that needs to be able to deploy using this hook: {% highlight bash %} -laptops$ git remote add deploy deployer@myserver.com:~/myrepo.git +laptops$ git remote add deploy deployer@example.com:~/myrepo.git {% endhighlight %} Deploying is now as easy as telling nginx or Apache to look at