summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@dashbit.co>2021-11-07 20:07:38 +0100
committerJosé Valim <jose.valim@dashbit.co>2021-11-07 20:07:38 +0100
commit16284830e4e52c0992d64684a0d44d51e790e923 (patch)
tree708b74f9119f578ee815c881d3da3297669da91e
parent3d18d6ecfe417e037c544e22e70b2c7243049743 (diff)
downloadelixir-16284830e4e52c0992d64684a0d44d51e790e923.tar.gz
Update references to main branch
-rw-r--r--Makefile2
-rw-r--r--README.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 08389da3f..6baceb05c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ TEST_FILES ?= "*_test.exs"
SHARE_PREFIX ?= $(PREFIX)/share
MAN_PREFIX ?= $(SHARE_PREFIX)/man
#CANONICAL := MAJOR.MINOR/
-CANONICAL ?= master/
+CANONICAL ?= main/
ELIXIRC := bin/elixirc --ignore-module-conflict $(ELIXIRC_OPTS)
ERLC := erlc -I lib/elixir/include
ERL_MAKE := if [ -n "$(ERLC_OPTS)" ]; then ERL_COMPILER_OPTIONS=$(ERLC_OPTS) erl -make; else erl -make; fi
diff --git a/README.md b/README.md
index 10d160e73..91d760df8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-<img src="https://github.com/elixir-lang/elixir-lang.github.com/raw/master/images/logo/logo.png" width="200" alt="Elixir">
+<img src="https://github.com/elixir-lang/elixir-lang.github.com/raw/main/images/logo/logo.png" width="200" alt="Elixir">
-[![CI](https://github.com/elixir-lang/elixir/workflows/CI/badge.svg?branch=master)](https://github.com/elixir-lang/elixir/actions?query=branch%3Amaster+workflow%3ACI) [![Build status](https://api.cirrus-ci.com/github/elixir-lang/elixir.svg?branch=master)](https://cirrus-ci.com/github/elixir-lang/elixir)
+[![CI](https://github.com/elixir-lang/elixir/workflows/CI/badge.svg?branch=main)](https://github.com/elixir-lang/elixir/actions?query=branch%3Amaster+workflow%3ACI) [![Build status](https://api.cirrus-ci.com/github/elixir-lang/elixir.svg?branch=main)](https://cirrus-ci.com/github/elixir-lang/elixir)
Elixir is a dynamic, functional language designed for building scalable
and maintainable applications.