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

Add copy on source directory configuration to gh-pages deployment page #2669

Merged
merged 3 commits into from Aug 1, 2014

Conversation

Projects
None yet
3 participants
@budparr
Contributor

budparr commented Jul 31, 2014

Funny, I thought this went in the master branch, but on the page I was editing it indicates that you keep the site in the gh-pages branch, so I confused the two with the initial request.

From issue #2648 I thought it would be helpful to mention on the gh-pages deployment page that a site's source files must reside in the root directory.

note:

  • used "warning" flag.
  • pointed to relevant troubleshooting page on gh-pages docs as well as jekyll docs on configuration variables.
  • placement doesn't seem critical. Can be at the bottom of the page.
@parkr

View changes

Show outdated Hide outdated site/_docs/github-pages.md
@@ -54,6 +54,14 @@ actual software project for Jekyll, however the Jekyll website (that you’re
looking at right now) is contained in the [gh-pages
branch]({{ site.repository }}/tree/gh-pages) of the same repository.
<div class="note">

This comment has been minimized.

@parkr

parkr Jul 31, 2014

Member

Why not make this the warning? Why warn the thing above?

@parkr

parkr Jul 31, 2014

Member

Why not make this the warning? Why warn the thing above?

This comment has been minimized.

@budparr

budparr Jul 31, 2014

Contributor

that's an error. will fix

@budparr

budparr Jul 31, 2014

Contributor

that's an error. will fix

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jul 31, 2014

Member

Thanks!

Member

parkr commented Jul 31, 2014

Thanks!

@parkr

View changes

Show outdated Hide outdated site/_docs/github-pages.md
@@ -30,7 +30,7 @@ repository](https://github.com/mojombo/mojombo.github.io) has the name
Content from the `master` branch of your repository will be used to build and
publish the GitHub Pages site, so make sure your Jekyll site is stored there.
<div class="note info">
<div class="note">

This comment has been minimized.

@parkr

parkr Jul 31, 2014

Member

Can you add back info? 😄

@parkr

parkr Jul 31, 2014

Member

Can you add back info? 😄

parkr added a commit that referenced this pull request Aug 1, 2014

@parkr parkr merged commit cf44052 into jekyll:master Aug 1, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Aug 1, 2014

Member

Thanks (again)!

Member

parkr commented Aug 1, 2014

Thanks (again)!

parkr added a commit that referenced this pull request Aug 1, 2014

@jekyll jekyll locked and limited conversation to collaborators Feb 27, 2017

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.