Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move documentation to docs folder #5459

Merged
merged 8 commits into from
Nov 2, 2016
Merged

Move documentation to docs folder #5459

merged 8 commits into from
Nov 2, 2016

Conversation

benbalter
Copy link
Contributor

Per #5409, this pull requests moves the user-facing documentation from the site folder to the docs folder where we can rely on Pages to automatically generate the docs for us.

To do this, I did a few things:

  1. Abstract the docs folder to a variable in the rake task
  2. Move the rake task to use the docs folder rather than the site folder
  3. Moved the actual folder content
  4. Migrated the maintainer docs, which was at /docs to /docs/_docs/development/, and added YAML front matter.

There should be no other change to the user-facing site content.

Also to note, rake site:publish simply runs rake site:generated_pages and commits and pushes the result (since we no longer need to do the multiple branch dance). It may be possible to have Jekyllbot do this after each release (to update the history and contributing files).

Once this merges, we can delete the gh-pages branch. We're also working to get this repo early access to new releases of Jekyll, so that it can always be running the latest stable version, regardless of what version other Pages users are using.

Fixes #5409.

@zlatanvasovic
Copy link
Contributor

We're also working to get this repo early access to new releases of Jekyll, so that it can always be running the latest stable version, regardless of what version other Pages users are using.

Exactly why this change is awesome. Big 👍.

Copy link
Member

@parkr parkr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! You can also remove docs/.gitignore. 😄

sh "git push origin gh-pages"
sh "git add docs/"
sh "git commit --allow-empty -m 'Generating pages for #{sha}.'"
sh "git push origin master"
end
puts 'Done.'
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed. I'll just change the settings so it uses master /docs.


File.open('gh-pages/.nojekyll', 'wb') { |f| f.puts(":dog: food.") }

# Commit and push.
puts "Committing and pushing to GitHub Pages..."
sha = `git rev-parse HEAD`.strip
Dir.chdir('gh-pages') do
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or get rid of this.

@@ -46,5 +46,6 @@
- title: Meta
docs:
- contributing
- development
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'd like this to be called maintaining or something like that. @jekyll/affinity-team-captains, how do you feel about putting your docs on the jekyllrb.com website?

@ashmaroli
Copy link
Member

I have a personal request:
Can we consider renaming all existing .markdown posts to .md before implementing this PR?
I've a PR at #5176 dealing with this..
Thanks

@parkr
Copy link
Member

parkr commented Oct 11, 2016

/cc @jekyll/documentation

@zlatanvasovic
Copy link
Contributor

zlatanvasovic commented Oct 19, 2016

@benbalter Any progress on this? The number of conflicted files is increasing, so it'll be easier to finish and merge it sooner than later.

@DirtyF
Copy link
Member

DirtyF commented Oct 19, 2016

@zdroid Subscribe to the issue if you want to follow progress, but please don't put pressure on maintainers, we're all volunteers, there is no rush for this.

@zlatanvasovic
Copy link
Contributor

@DirtyF I did subscribe, don't worry. I'm sorry if I rushed anyone, I know it's hard to keep up with working on open source project. 😄

@parkr
Copy link
Member

parkr commented Oct 19, 2016

@zdroid Thanks for the nudge! This is actually waiting on availability of Jekyll 3.3 on GitHub Pages.

@parkr
Copy link
Member

parkr commented Nov 2, 2016

GitHub Pages is now running Jekyll 3.3. 🎉 https://github.com/blog/2277-what-s-new-in-github-pages-with-jekyll-3-3

benbalter and others added 5 commits November 2, 2016 13:51
Adding a link to updated installation instructions for Jekyll 3 and Ruby 2.2.5. These instructions were adapted and significantly updated from the earlier work of Julian Thilo which is now outdated.
@@ -14,6 +13,9 @@ timezone: America/Los_Angeles
collections:
docs:
output: true
posts:
permalink: /news/:year/:month/:day/:title/
output: true

name: Jekyll • Simple, blog-aware, static sites
Copy link
Contributor

@zlatanvasovic zlatanvasovic Nov 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't be escaped as ·? I've just noticed this, I know it's not related to the actual commit.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know if it's causing an issue at all? I kind of like the UTF-8 dot. 😄

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be OK since the HTML files are using utf-8.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, it's fine. The old browsers such as IE6/7 (I am unsure for others) had character-encoding problems, but nobody uses them anymore. Keep the cool character as is. ⛱️

@parkr
Copy link
Member

parkr commented Nov 2, 2016

@jekyllbot: merge +site

@jekyllbot jekyllbot merged commit 2115b73 into master Nov 2, 2016
@jekyllbot jekyllbot deleted the docs-folder branch November 2, 2016 21:48
jekyllbot added a commit that referenced this pull request Nov 2, 2016
@jekyll jekyll locked and limited conversation to collaborators Jul 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Delete gh-pages branch and use master /docs instead (?)
8 participants