diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7696930c48..22f49c5a1b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ Guidelines for bug reports: reported. 2. **Check if the issue has been fixed** — try to reproduce it using the - `master` branch in the repository. + `main` branch in the repository. 3. **Isolate and report the problem** — ideally create a reduced test case. @@ -145,16 +145,16 @@ in order to craft an excellent pull request: 2. If you cloned a while ago, get the latest changes from upstream, and update your fork: ```bash - git checkout master - git pull upstream master + git checkout main + git pull upstream main git push ``` -3. Create a new topic branch (off of `master`) to contain your feature, change, +3. Create a new topic branch (off of `main`) to contain your feature, change, or fix. - **IMPORTANT**: Making changes in `master` is discouraged. You should always - keep your local `master` in sync with upstream `master` and make your + **IMPORTANT**: Making changes in `main` is discouraged. You should always + keep your local `main` in sync with upstream `main` and make your changes in topic branches. ```bash @@ -183,17 +183,17 @@ in order to craft an excellent pull request: with a clear title and description. 8. If you haven't updated your pull request for a while, you should consider - rebasing on master and resolving any conflicts. + rebasing on main and resolving any conflicts. - **IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You - should always `git rebase` on `master` to bring your changes up to date when + **IMPORTANT**: _Never ever_ merge upstream `main` into your branches. You + should always `git rebase` on `main` to bring your changes up to date when necessary. ```bash - git checkout master - git pull upstream master + git checkout main + git pull upstream main git checkout - git rebase master + git rebase main ``` Thank you for your contributions! diff --git a/README.md b/README.md index 1f21739a42..db46c15368 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![phoenix logo](https://raw.githubusercontent.com/phoenixframework/phoenix/master/priv/static/phoenix.png) +![phoenix logo](https://raw.githubusercontent.com/phoenixframework/phoenix/main/priv/static/phoenix.png) > Peace of mind from prototype to production. @@ -40,7 +40,7 @@ defp deps do [{:phoenix, path: "../..", override: true}, ``` -To create projects outside of the `installer/` directory, add the latest archive to your machine by following the instructions in [installer/README.md](https://github.com/phoenixframework/phoenix/blob/master/installer/README.md) +To create projects outside of the `installer/` directory, add the latest archive to your machine by following the instructions in [installer/README.md](https://github.com/phoenixframework/phoenix/blob/main/installer/README.md) To build the documentation from source: diff --git a/guides/introduction/community.md b/guides/introduction/community.md index 1d47514b92..5af9873132 100644 --- a/guides/introduction/community.md +++ b/guides/introduction/community.md @@ -10,7 +10,7 @@ There are a number of places to connect with community members at all experience * Feel free to join and check out the #phoenix channel on [Discord](https://discord.gg/elixir). - * Read about [bug reports](https://github.com/phoenixframework/phoenix/blob/master/CONTRIBUTING.md#bug-reports) or open an issue in the Phoenix [issue tracker](https://github.com/phoenixframework/phoenix/issues). + * Read about [bug reports](https://github.com/phoenixframework/phoenix/blob/main/CONTRIBUTING.md#bug-reports) or open an issue in the Phoenix [issue tracker](https://github.com/phoenixframework/phoenix/issues). * Ask or answer questions about Phoenix on [Elixir Forum](https://elixirforum.com/c/phoenix-forum) or [Stack Overflow](https://stackoverflow.com/questions/tagged/phoenix-framework). @@ -18,7 +18,7 @@ There are a number of places to connect with community members at all experience * Follow the Phoenix Framework on [Twitter](https://twitter.com/elixirphoenix). - * The source for these guides is [on GitHub](https://github.com/phoenixframework/phoenix/tree/master/guides). To help improve the guides, please report an [issue](https://github.com/phoenixframework/phoenix/issues) or open a [pull request](https://github.com/phoenixframework/phoenix/pulls). + * The source for these guides is [on GitHub](https://github.com/phoenixframework/phoenix/tree/main/guides). To help improve the guides, please report an [issue](https://github.com/phoenixframework/phoenix/issues) or open a [pull request](https://github.com/phoenixframework/phoenix/pulls). ## Books diff --git a/guides/real_time/channels.md b/guides/real_time/channels.md index 6a1494ddbb..a37bfbc456 100644 --- a/guides/real_time/channels.md +++ b/guides/real_time/channels.md @@ -169,7 +169,7 @@ The following libraries exist today, and new ones are always welcome. #### Official -Phoenix ships with a JavaScript client that is available when generating a new Phoenix project. The documentation for the JavaScript module is available at [https://hexdocs.pm/phoenix/js/](https://hexdocs.pm/phoenix/js/); the code is in [multiple js files](https://github.com/phoenixframework/phoenix/blob/master/assets/js/phoenix/). +Phoenix ships with a JavaScript client that is available when generating a new Phoenix project. The documentation for the JavaScript module is available at [https://hexdocs.pm/phoenix/js/](https://hexdocs.pm/phoenix/js/); the code is in [multiple js files](https://github.com/phoenixframework/phoenix/blob/main/assets/js/phoenix/). #### 3rd Party diff --git a/priv/templates/phx.gen.html/resource_form.html.heex b/priv/templates/phx.gen.html/resource_form.html.heex index 74b648e06e..5d8e0cbaea 100644 --- a/priv/templates/phx.gen.html/resource_form.html.heex +++ b/priv/templates/phx.gen.html/resource_form.html.heex @@ -6,4 +6,4 @@ <:actions> <.button>Save <%= schema.human_singular %> - \ No newline at end of file +