diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fc9f4ebd..7347f9e0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,13 +3,11 @@ name: Docs on: push: branches: - - master - main paths: - docs/** pull_request: branches: - - master - main paths: - docs/** diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59968c7e..c5285f9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,11 +3,9 @@ name: Test on: push: branches: - - master - main pull_request: branches: - - master - main jobs: diff --git a/README.md b/README.md index d28ecc0d..762a31eb 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # ShareDB [![NPM Version](https://img.shields.io/npm/v/sharedb.svg)](https://npmjs.org/package/sharedb) - ![Test](https://github.com/share/sharedb/workflows/Test/badge.svg) - [![Coverage Status](https://coveralls.io/repos/github/share/sharedb/badge.svg?branch=master)](https://coveralls.io/github/share/sharedb?branch=master) + ![Test](https://github.com/share/sharedb/actions/workflows/test.yml/badge.svg?branch=main) + [![Coverage Status](https://coveralls.io/repos/github/share/sharedb/badge.svg?branch=main)](https://coveralls.io/github/share/sharedb?branch=main) ShareDB is a realtime database backend based on [Operational Transformation (OT)](https://en.wikipedia.org/wiki/Operational_transformation) of JSON diff --git a/docs/_config.yml b/docs/_config.yml index ff99e858..4d4274cb 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -25,7 +25,7 @@ aux_links: gh_edit_link: true # show or hide edit this page link gh_edit_link_text: "Edit this page on GitHub" gh_edit_repository: "https://github.com/share/sharedb" # the github URL for your repo -gh_edit_branch: "master" # the branch that your docs is served from +gh_edit_branch: "main" # the branch that your docs is served from gh_edit_source: "docs" # the source that your files originate from gh_edit_view_mode: "tree" # "tree" or "edit" if you want the user to jump into the editor immediately diff --git a/docs/getting-started.md b/docs/getting-started.md index 0e91fc3b..75fa2d62 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -25,7 +25,7 @@ You may also wish to install other [OT types]({{ site.baseurl }}{% link types/in ## Examples -There are [working examples](https://github.com/share/sharedb/tree/master/examples) in the git repository. +There are [working examples](https://github.com/share/sharedb/tree/main/examples) in the git repository. ## Usage @@ -65,7 +65,7 @@ This server will accept any WebSocket connection on port 8080, and bind it to Sh This client example uses [`reconnecting-websocket`](https://www.npmjs.com/package/reconnecting-websocket) to reconnect clients after a socket is closed. -Try running the [working example](https://github.com/share/sharedb/tree/master/examples/counter) to see this in action. +Try running the [working example](https://github.com/share/sharedb/tree/main/examples/counter) to see this in action. ```js var ReconnectingWebSocket = require('reconnecting-websocket')