Fix #4082: Allow users to use .htm and .xhtml (XHTML5.) #4160

Merged
merged 1 commit into from Nov 25, 2015

Conversation

Projects
None yet
4 participants
@envygeeks
Contributor

envygeeks commented Nov 18, 2015

No description provided.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Nov 19, 2015

Member

Should this also be applied to documents?

Member

parkr commented Nov 19, 2015

Should this also be applied to documents?

@parkr parkr added the fix label Nov 19, 2015

@parkr parkr added this to the 3.1 milestone Nov 19, 2015

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Nov 19, 2015

Member

Should this also be applied to documents?

@envygeeks ^^

Member

parkr commented Nov 19, 2015

Should this also be applied to documents?

@envygeeks ^^

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Nov 19, 2015

Contributor

@parkr I tried but I couldn't figure out where (but that's probably because I was dealing with a storm of bugs in our stack yesterday so I wasn't paying attention.) I'll play with it today and make sure documents work as expected and update and ping if I need to!

Contributor

envygeeks commented Nov 19, 2015

@parkr I tried but I couldn't figure out where (but that's probably because I was dealing with a storm of bugs in our stack yesterday so I wasn't paying attention.) I'll play with it today and make sure documents work as expected and update and ping if I need to!

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Nov 19, 2015

Member

Thanks :)

Member

parkr commented Nov 19, 2015

Thanks :)

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Nov 23, 2015

Member

Document code:

def destination(base_directory)
dest = site.in_dest_dir(base_directory)
path = site.in_dest_dir(dest, URL.unescape_path(url))
path = File.join(path, "index.html") if url.end_with?("/")
path << output_ext unless path.end_with?(output_ext)
path
end

Member

parkr commented Nov 23, 2015

Document code:

def destination(base_directory)
dest = site.in_dest_dir(base_directory)
path = site.in_dest_dir(dest, URL.unescape_path(url))
path = File.join(path, "index.html") if url.end_with?("/")
path << output_ext unless path.end_with?(output_ext)
path
end

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Nov 24, 2015

Contributor

On it, I forgot about this when I was doing stuff. I'll get it fixed up.

Contributor

envygeeks commented Nov 24, 2015

On it, I forgot about this when I was doing stuff. I'll get it fixed up.

parkr added a commit that referenced this pull request Nov 25, 2015

@parkr parkr merged commit ac1b2b8 into master Nov 25, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@parkr parkr deleted the fix-html-htm-xhtml-pages branch Nov 25, 2015

parkr added a commit that referenced this pull request Nov 25, 2015

@XhmikosR

This comment has been minimized.

Show comment
Hide comment
@XhmikosR

XhmikosR Nov 25, 2015

Contributor

This might be a mistake (the double space). Not that it matters but you know :)

Contributor

XhmikosR commented on lib/jekyll/page.rb in 90865d5 Nov 25, 2015

This might be a mistake (the double space). Not that it matters but you know :)

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks Nov 25, 2015

Contributor

It wasn't a mistake, it was intentional to line up the right side because the one space disparity annoyed me.

Contributor

envygeeks replied Nov 25, 2015

It wasn't a mistake, it was intentional to line up the right side because the one space disparity annoyed me.

@pathawks pathawks referenced this pull request in jekyll/jekyll-sitemap Dec 13, 2015

Merged

Allow HTML files to end with .xhtml or .htm #93

@yous yous referenced this pull request in jekyll/jekyll-redirect-from Feb 20, 2016

Closed

'index' page generated rather than 'index.html' #99

@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.