From e8301a864d5084ec07807ffe079f348e7fb78c20 Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Tue, 12 Sep 2017 16:37:28 +1200 Subject: [PATCH] Update references to point to master, not develop --- CHANGES.md | 7 +++---- CONTRIBUTING.md | 4 ++-- README.md | 3 +-- docs/CodeWalkthrough.md | 6 +++--- docs/SubscriptionFlow.md | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d2e7b89..cc941e0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,3 @@ - ## Unreleased 0.NN.N (2017.NN.NN) #### New Docs @@ -157,7 +156,7 @@ Joking aside, this is a substantial release which will change how you use re-fra - re-frame now supports the notion of Event Handlers accepting coeffects and returning effects.
There's now three kinds of event handlers: `-db`, `-fx` and `-ctx`.
- For a tutorial see: https://github.com/Day8/re-frame/tree/develop/docs
+ For a tutorial see: https://github.com/Day8/re-frame/tree/master/docs
For Effect Handler examples see: @@ -206,7 +205,7 @@ Joking aside, this is a substantial release which will change how you use re-fra Interceptors also dovetail really nicely with the effects and coeffects story which has emerged in re-frame through this 0.8.0 release. - Docs: https://github.com/Day8/re-frame/tree/develop/docs + Docs: https://github.com/Day8/re-frame/tree/master/docs - we now have a logo designed by Sketch Maester @martinklepsch. Thank you Martin! But remember, no good deed ever goes unpunished - we'll be pestering you every time from now on :-) @@ -229,7 +228,7 @@ Joking aside, this is a substantial release which will change how you use re-fra chance you won't notice the change UNLESS: 1. You have written your own middleware. If so, you'll have to rewrite it. - See how [the builtin interceptors are done](https://github.com/Day8/re-frame/blob/develop/src/re_frame/std_interceptors.cljc). + See how [the builtin interceptors are done](https://github.com/Day8/re-frame/blob/master/src/re_frame/std_interceptors.cljc). 2. You explicitly use `comp` to compose middleware like this: ```clj diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ed6b992..47c85a6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ the [ClojureScript mailing list](https://groups.google.com/forum/#!forum/clojure ## Pull requests -**Create pull requests to the develop branch**, work will be merged onto master when it is ready to be released. +**Create pull requests to the master branch.** ## Running tests @@ -26,7 +26,7 @@ You can also get auto compiles via: lein test-auto ``` but you'll need to manually open `test/test.html` in a browser. And you'll also need to -manually reload this page after each auto compile. +manually reload this page after each auto compile. #### Via Karma diff --git a/README.md b/README.md index 3080c41..e39dca6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ y'know. Pretty good. [![Clojars Project](https://img.shields.io/clojars/v/re-frame.svg)](https://clojars.org/re-frame) [![GitHub license](https://img.shields.io/github/license/Day8/re-frame.svg)](license.txt) -[![Circle CI](https://circleci.com/gh/Day8/re-frame/tree/develop.svg?style=shield&circle-token=:circle-ci-badge-token)](https://circleci.com/gh/Day8/re-frame/tree/develop) [![Circle CI](https://circleci.com/gh/Day8/re-frame/tree/master.svg?style=shield&circle-token=:circle-ci-badge-token)](https://circleci.com/gh/Day8/re-frame/tree/master) ## re-frame @@ -528,7 +527,7 @@ Client only: https://github.com/Day8/re-frame-template
Full Stack: http://www.luminusweb.net/ And please be sure to review these further resources:
-https://github.com/Day8/re-frame/blob/develop/docs/External-Resources.md +https://github.com/Day8/re-frame/blob/master/docs/External-Resources.md ### T-Shirt Unlocked diff --git a/docs/CodeWalkthrough.md b/docs/CodeWalkthrough.md index 6517753..920ef5c 100644 --- a/docs/CodeWalkthrough.md +++ b/docs/CodeWalkthrough.md @@ -10,8 +10,8 @@ In this tutorial, **we look at re-frame code**. By the end of it, you'll be at 7 ## What Code? -This repo contains an `/examples` application called ["simple"](https://github.com/Day8/re-frame/tree/develop/examples/simple), -which contains 70 lines of code. We'll look at every line of [the file](https://github.com/Day8/re-frame/blob/develop/examples/simple/src/simple/core.cljs). +This repo contains an `/examples` application called ["simple"](https://github.com/Day8/re-frame/tree/master/examples/simple), +which contains 70 lines of code. We'll look at every line of [the file](https://github.com/Day8/re-frame/blob/master/examples/simple/src/simple/core.cljs). This app: - displays the current time in a nice big, colourful font @@ -488,7 +488,7 @@ structure exists in `app-db` before any subscriptions or event handlers run. ## Next Steps You should now take time to carefully review the -[todomvc example application](https://github.com/Day8/re-frame/tree/develop/examples/todomvc). +[todomvc example application](https://github.com/Day8/re-frame/tree/master/examples/todomvc). On the one hand, it contains a lot of very helpful practical advice. On the other, it does use some more advanced features like `interceptors` which are covered later in the docs. diff --git a/docs/SubscriptionFlow.md b/docs/SubscriptionFlow.md index 49fdec5..46f3242 100644 --- a/docs/SubscriptionFlow.md +++ b/docs/SubscriptionFlow.md @@ -254,7 +254,7 @@ ability to attach an `:on-dispose` handler to the returned reaction, allowing yo ### Example reg-sub-raw -The following use of `reg-sub` can be found in [the todomvc example](https://github.com/Day8/re-frame/blob/develop/examples/todomvc/src/todomvc/subs.cljs): +The following use of `reg-sub` can be found in [the todomvc example](https://github.com/Day8/re-frame/blob/master/examples/todomvc/src/todomvc/subs.cljs): ```clj (reg-sub :visible-todos