You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by rdowner <gi...@git.apache.org> on 2018/02/02 11:06:13 UTC
[GitHub] brooklyn-docs pull request #243: Remove non-website stuff from `website` bra...
GitHub user rdowner opened a pull request:
https://github.com/apache/brooklyn-docs/pull/243
Remove non-website stuff from `website` branch
Note that this is a PR against `website`, **not** against `master`. Please bear this in mind when reviewing, and committer please merge into the correct branch :-)
See [this mailing list thread](https://lists.apache.org/thread.html/817a36456f347646bdf4cdf4def10ab5f6b153c5fb9009eb42f228e6@%3Cdev.brooklyn.apache.org%3E) for the explanation and discussion.
In short: a few months back the user guide was extracted from the Jekyll-based website tooling and converted to use GitBook. The `master` branch of this repo now contains the GitBook system and has removed all website files. The `website` branch was forked off just before the commits to implement GitBook and delete the Jekyll tooling + website content - therefore the `website` branch contains both the website and the outdated user guide.
This pull request removes the user guide and related scripts etc. from the `website` branch. This will result in `master` containing just the GitBook user guide, and `website` containing just the Jekyll website.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/rdowner/brooklyn-docs experiment/website-no-docs
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-docs/pull/243.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #243
----
commit 58bb3aa0ef28e2261230b4c724b050c938f3130d
Author: Richard Downer <ri...@...>
Date: 2017-10-11T14:09:30Z
Delete all the guide files
commit cebbd3aa3fb870f1b63fffb0ca3b12ee07b48177
Author: Richard Downer <ri...@...>
Date: 2017-10-12T09:33:05Z
Break the join with the guide; just use links
At this point, the generated HTML for website-root is exactly the same
as before the split, with the exception of the site map and one or two
very small differences.
commit b09a69d7206cf63142d50b719af072c8addb52f1
Author: Richard Downer <ri...@...>
Date: 2017-10-12T10:22:53Z
Remove non-main-website items from _build
Cuts out guide, Javadoc and PDF build related code and configuration.
commit fd239317c83ee229b390e7aca2d776cbc3ca2a3d
Author: Richard Downer <ri...@...>
Date: 2017-10-12T12:51:46Z
Remove PDF related files/content
commit d3122d4fe49237bb22990e7d038eab9a83b73bcb
Author: Richard Downer <ri...@...>
Date: 2017-10-12T13:53:43Z
Delete plugins no longer in use
commit 5b360c27115a9c9535961469b77631be35369b48
Author: Richard Downer <ri...@...>
Date: 2017-10-12T14:30:54Z
Move website content up a level and simplify config
commit 83afd19c69adbee2a2d6ec60df8ea415273a250b
Author: Richard Downer <ri...@...>
Date: 2018-02-02T10:58:02Z
Fix "Edit This Page" link for new repo configuration
----
---
[GitHub] brooklyn-docs issue #243: Remove non-website stuff from `website` branch
Posted by tbouron <gi...@git.apache.org>.
Github user tbouron commented on the issue:
https://github.com/apache/brooklyn-docs/pull/243
Thanks @rdowner for this. Tested locally without an issue 👍
Will merge now
---
[GitHub] brooklyn-docs pull request #243: Remove non-website stuff from `website` bra...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/brooklyn-docs/pull/243
---