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

Reorganize docs for v1/v2 split #4360

Merged
merged 10 commits into from Nov 17, 2016
Merged

Conversation

GeoffreyBooth
Copy link
Collaborator

@GeoffreyBooth GeoffreyBooth commented Nov 16, 2016

This moves the generated documentation files into docs/v1, with docs/index.html symlinked to docs/v1/index.html. Static assets like images are moved under docs/v1. Generated source is under docs/v1/annotated-source. Cakefile is updated to save generated files into these new paths. See demo: https://geoffreybooth.github.io/coffeescript/

Other updates:

  • The missing underscore.html is now in docs/v1/annotated-source. Closes Dead links at coffeescript.org #4295.
  • The included jQuery was removed in favor of Google’s hosted version.
  • Updated dependencies; removed check for --harmony before running generators tests.
  • All references to coffeescript.org now say https://coffeescript.org.

@jashkenas Once this is merged in, go to the repo Settings page and under GitHub Pages change Source to master branch /docs folder and check Enforce HTTPS.

@GeoffreyBooth GeoffreyBooth added this to the 2.0.0 milestone Nov 16, 2016
@lydell
Copy link
Collaborator

lydell commented Nov 16, 2016

Awesome work! 👍

@jashkenas jashkenas merged commit f32740c into jashkenas:master Nov 17, 2016
@jashkenas
Copy link
Owner

Did it -- but looks like the site is down now because maybe our CNAME file isn't in the right place? Trying to fix...

@jashkenas
Copy link
Owner

There we go. Fixed it. Good luck with the /v2 !

@GeoffreyBooth
Copy link
Collaborator Author

@jashkenas Did you turn on HTTPS? The links in the code now are for https://coffeescript.org.

@jashkenas
Copy link
Owner

I did, but HTTPS doesn't work for Github pages with custom domains.

image

If you don't mind reverting the links to HTTP, that would be lovely.

For more, see: isaacs/github#156

@GeoffreyBooth
Copy link
Collaborator Author

Okay, I’ve reverted them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants