remove migrate guide, rename committer's guides to committer guide for consistency
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1c99f6ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1c99f6ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1c99f6ec Branch: refs/heads/master Commit: 1c99f6ec82641b5f35c13e6834e568253d73f930 Parents: 863fa75 Author: Alex Heneveld <[email protected]> Authored: Tue Jan 13 18:01:29 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Tue Jan 13 18:01:29 2015 +0000 ---------------------------------------------------------------------- docs/website/developers/committers/index.md | 3 +- docs/website/developers/index.md | 5 +- docs/website/developers/migrate-to-apache.md | 121 ---------------------- 3 files changed, 3 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1c99f6ec/docs/website/developers/committers/index.md ---------------------------------------------------------------------- diff --git a/docs/website/developers/committers/index.md b/docs/website/developers/committers/index.md index e334762..abd4781 100644 --- a/docs/website/developers/committers/index.md +++ b/docs/website/developers/committers/index.md @@ -1,9 +1,8 @@ --- layout: website-normal -title: Committer's Guides +title: Committer Guide children: - merging-contributed-code.md -- ../migrate-to-apache.md --- These pages contain information that is relevant to people with "committer" status in our project. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1c99f6ec/docs/website/developers/index.md ---------------------------------------------------------------------- diff --git a/docs/website/developers/index.md b/docs/website/developers/index.md index 0f1180c..265c898 100644 --- a/docs/website/developers/index.md +++ b/docs/website/developers/index.md @@ -31,9 +31,8 @@ Firstly, please see our [community resources](../community/index.html), in parti - [IRC channel](../community/irc.html) - [JIRA for bug tracking](https://issues.apache.org/jira/browse/BROOKLYN) +Next, you may want to read the [Developer Guide]({{ site.path.guide }}/dev/). + If you have changes or additions to the Brooklyn source code, we would love to see them! Please read our guide on [how to contribute](how-to-contribute.html). -If you have used the *brooklyncentral* repository prior to Brooklyn's move to -Apache, you can read the guide on -[how to migrate your brooklyncentral fork to Apache](migrate-to-apache.html). http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1c99f6ec/docs/website/developers/migrate-to-apache.md ---------------------------------------------------------------------- diff --git a/docs/website/developers/migrate-to-apache.md b/docs/website/developers/migrate-to-apache.md deleted file mode 100644 index 79e5530..0000000 --- a/docs/website/developers/migrate-to-apache.md +++ /dev/null @@ -1,121 +0,0 @@ ---- -layout: website-normal -title: How to Migrate ---- - -*This is old. Everyone has probably already migrated. -But just in case you need it, this page is being left a bit longer -(just taken out of the menus).* - -Prior to our adoption by the Apache Incubator, Brooklyn was developed in a -GitHub repository at `https://github.com/brooklyncentral/brooklyn`. If you -already have a fork of this repository, follow this guide to smoothly shift -your repository references to the new repository at Apache. - -If you have not forked or cloned the `brooklyncentral/brooklyn` repository, -then this is not the right guide for you. Instead, you should refer to the -[How to contribute](how-to-contribute.html) page, and possibly refer to -[GitHub Help - Fork A Repo](https://help.github.com/articles/fork-a-repo) for -further help. - - -Assumptions ------------ - -This guides assumes that you have followed the standard GitHub workflow, as -describe in [GitHub Help - Fork A Repo](https://help.github.com/articles/fork-a-repo). -In particular: - -- You have forked the `brooklyncentral/brooklyn` repository into your own - username: - - - -- You have used `git clone` to clone this fork onto your own computer; -- You have added an additional remote, `upstream`, to refer to the original - `brooklyncentral/brooklyn` repository. - -In short, if you can recognise the above screenshot, and the output of the -`git remote -v` command looks similar to below, then this guide should work -for you. (Replace `rdowner` with your own GitHub username.) - - origin https://github.com/rdowner/brooklyn.git (fetch) - origin https://github.com/rdowner/brooklyn.git (push) - upstream https://github.com/brooklyncentral/brooklyn (fetch) - upstream https://github.com/brooklyncentral/brooklyn (push) - -Or, if you are using SSH to access your remote repositories, it may look like -this: - - origin [email protected]:rdowner/brooklyn.git (fetch) - origin [email protected]:rdowner/brooklyn.git (push) - upstream [email protected]:brooklyncentral/brooklyn.git (fetch) - upstream [email protected]:brooklyncentral/brooklyn (push) - - - -Procedure ---------- - -The new repository has a mirror in GitHub, located at -[https://github.com/apache/incubator-brooklyn](https://github.com/apache/incubator-brooklyn). -Go to this page now, and fork it: - - - -This will now create a fork of this repository under your own username: - - - -So previously you referred to repositories named `brooklyn` under the -`brooklyncentral` organization and your own username. Now, you will need to -refer to repositories named `incubator-brooklyn` under the `Apache` -organization and your own username. - -To update the cloned repository on your computer to point to the new -repositories instead of the old ones, use these commands, replacing `rdowner` -with your own GitHub username. - - git remote set-url origin https://github.com/rdowner/incubator-brooklyn.git - git remote set-url upstream https://github.com/apache/incubator-brooklyn.git - -Or, if you would prefer to use SSH to access your remote repositories: - - git remote set-url origin [email protected]:rdowner/incubator-brooklyn.git - git remote set-url upstream [email protected]:apache/incubator-brooklyn.git - -Finally, fetch everything: - - git fetch --all - - -Existing pull requests ----------------------- - -If you have submitted a pull request at `brooklyncentral/brooklyn`, this pull -request will be closed, unmerged, with a message pointing you to this page. You -will need to re-submit your pull request against the -`apache/incubator-brooklyn`. - -If you have followed the above procedure, all you will need to do is identify -the branch in your local repository on your computer that you used to make the -original pull request, and push this to your new fork: - -``` -git push origin my-new-feature-branch -``` - -Now, go to your `incubator-brooklyn` fork on the GitHub website, and you should -see the **Compare & pull request** button; click this, and it will set up a -pull request against the new repository. - - - - -Any problems? -------------- - -If you are not sure how to do this, perhaps because you have a slightly -different arrangement in your repositories, or is something unusual happens, -please ask our community for help. You can find details of our IRC channel -and mailing lists on our [Community](index.html) page.
