ibm-js / delite

HTML Custom Element / Widget infrastructure

http://ibm-js.github.io/delite/

Other

68 stars 28 forks source link

New templates for documentation #369

Closed clmath closed 9 years ago

clmath commented 9 years ago

This PR contains the templates used in https://github.com/ibm-js/delite/pull/368.

Warning: this PR MUST NOT be merged until the new doc from https://github.com/ibm-js/delite/pull/368 is committed and deployed. Otherwise it will break ibm-js.github.io

wkeese commented 9 years ago

Warning: this PR MUST NOT be merged until the new doc from #368 is committed and deployed. Otherwise it will break ibm-js.github.io

I'm not following. It seems like #368 and #369 should be checked in together, and then the new gh-pages branch should be generated. I forget how to do that though... I'm skeptical of your claim about "breaking ibm-js.github.io". That site is generated from the gh-pages branch, so I don't see how checking something into the master branch could break it.

You can push these changes yourself, or if you don't have write permission then let me know what to do.

cjolif commented 9 years ago

369 is not against master but against gh-pages thus the fact it can break gh-pages. @clmath process is correct. First #368 needs to be committed to master (it can't break doc as it is not deployed), then when we will deploy we will need to also commit #369. Basically #368 can be committed any time, #369 has to wait the release time.

wkeese commented 9 years ago

Ah I didn't realize that #369 is against gh-pages. Should I push #368 now, or are you guys handling everything?

cjolif commented 9 years ago

Feel free to merge #368 if you want, otherwise we will look into merging it next week.