Branch out v1.17

elixir-lang · May 24, 2024 · 27b6ea8 · 27b6ea8
1 parent aa2385e
commit 27b6ea8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ PREFIX ?= /usr/local
 TEST_FILES ?= "*_test.exs"
 SHARE_PREFIX ?= $(PREFIX)/share
 MAN_PREFIX ?= $(SHARE_PREFIX)/man
-CANONICAL := main/
+# 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/RELEASE.md b/RELEASE.md
@@ -16,7 +16,7 @@
 
 7. Update `_data/elixir-versions.yml` (except for RCs) in `elixir-lang/elixir-lang.github.com`
 
-## Creating a new vMAJOR.MINOR branch (after first rc)
+## Creating a new vMAJOR.MINOR branch (before first rc)
 
 ### In the new branch
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -6,12 +6,11 @@ Elixir applies bug fixes only to the latest minor branch. Security patches are a
 
 Elixir version | Support
 :------------- | :-----------------------------
-1.17           | Development
-1.16           | Bug fixes and security patches
+1.17           | Bug fixes and security patches
+1.16           | Security patches only
 1.15           | Security patches only
 1.14           | Security patches only
 1.13           | Security patches only
-1.12           | Security patches only
 
 ## Announcements
 

diff --git a/lib/elixir/pages/references/compatibility-and-deprecations.md b/lib/elixir/pages/references/compatibility-and-deprecations.md
@@ -8,12 +8,11 @@ Elixir applies bug fixes only to the latest minor branch. Security patches are a
 
 Elixir version | Support
 :------------- | :-----------------------------
-1.17           | Development
-1.16           | Bug fixes and security patches
+1.17           | Bug fixes and security patches
+1.16           | Security patches only
 1.15           | Security patches only
 1.14           | Security patches only
 1.13           | Security patches only
-1.12           | Security patches only
 
 New releases are announced in the read-only [announcements mailing list](https://groups.google.com/group/elixir-lang-ann). All security releases [will be tagged with `[security]`](https://groups.google.com/forum/#!searchin/elixir-lang-ann/%5Bsecurity%5D%7Csort:date).