From 259927f916c7e4c67c3c4b1739d745963059ccab Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 31 Jan 2022 13:48:27 -0800 Subject: [PATCH] docs: update end-of-life messages This change updates the messaging about AngularJS end-of-life in several places: * Docs homepage * Docs banner * Security and support pages * GitHub README --- README.md | 5 +- SECURITY.md | 22 +++----- .../templates/app/indexPage.template.html | 3 +- docs/content/api/index.ngdoc | 3 +- .../content/misc/version-support-status.ngdoc | 50 +------------------ 5 files changed, 16 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index b0a07e5f7f41..bfadf56ff3b7 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,8 @@ piece of cake. Best of all? It makes development fun! -------------------- -**On July 1, 2018 AngularJS entered a 3 year Long Term Support period:** [Find out more](https://docs.angularjs.org/misc/version-support-status) - -**Looking for the new Angular? Go here:** https://github.com/angular/angular +**[Support for legacy AngularJS has fully ended.](https://goo.gle/angularjs-end-of-life)** +**Visit https://github.com/angular/angular for the actively supported Angular framework.** -------------------- diff --git a/SECURITY.md b/SECURITY.md index 47aebc7052e2..4384f3bf8019 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,19 +2,13 @@ ## Supported Versions -| Version | Supported | Status | Comments | -| ----------- | ------------------ | --------------------- | ------------------------------------ | -| 1.8.x | :white_check_mark: | Long Term Support | See [Long Term Support policy][0] | -| 1.3.x-1.7.x | :x: | | | -| 1.2.x | :warning: | Security patches only | Last version to provide IE 8 support | -| <1.2.0 | :x: | | | - -## Reporting a Vulnerability +[Support for legacy AngularJS has fully ended.](https://goo.gle/angularjs-end-of-life). -Email us at [security@angularjs.org](mailto:security@angularjs.org) to report any potential security issues in AngularJS. +[Visit https://angular.io for the actively supported Angular framework](https://angular.io). -Please [use the latest AngularJS possible](https://docs.angularjs.org/guide/security#use-the-latest-angularjs-possible) -and keep in mind the guidance around AngularJS' -[expression language](https://docs.angularjs.org/guide/security#angularjs-templates-and-expressions). - -[0]: https://docs.angularjs.org/misc/version-support-status#long-term-support +| Version | Supported | Status | Comments | +| ----------- | ------------------ | --------------------- | ------------------------------------ | +| 1.8.x | :x: | All support ended | | +| 1.3.x-1.7.x | :x: | All support ended | | +| 1.2.x | :x: | All support ended | Last version to provide IE 8 support | +| <1.2.0 | :x: | All support ended | | diff --git a/docs/config/templates/app/indexPage.template.html b/docs/config/templates/app/indexPage.template.html index 2146c6d3a07a..5fb71b25d5a8 100644 --- a/docs/config/templates/app/indexPage.template.html +++ b/docs/config/templates/app/indexPage.template.html @@ -146,7 +146,8 @@

{{ key }}

- AngularJS is now in Long Term Support (LTS) mode: Find out more. Explore End Of Life (EOL) options here. + Support for legacy AngularJS has fully ended. + Visit https://angular.io for the actively supported Angular.

diff --git a/docs/content/api/index.ngdoc b/docs/content/api/index.ngdoc index c6c250fa95ba..72355ac30532 100644 --- a/docs/content/api/index.ngdoc +++ b/docs/content/api/index.ngdoc @@ -5,7 +5,8 @@ # AngularJS API Docs
-**On July 1, 2018 AngularJS entered a 3 year Long Term Support period:** [Find out more](misc/version-support-status). +[Support for legacy AngularJS has fully ended](https://goo.gle/angularjs-end-of-life). +Visit [https://angular.io](https://angular.io) for the actively supported Angular.
## Welcome to the AngularJS API docs page. diff --git a/docs/content/misc/version-support-status.ngdoc b/docs/content/misc/version-support-status.ngdoc index f01b4dd0105a..5b0e483a7df4 100644 --- a/docs/content/misc/version-support-status.ngdoc +++ b/docs/content/misc/version-support-status.ngdoc @@ -4,55 +4,9 @@ # Version Support Status -This page describes the support status of the significant versions of AngularJS. +[Support for legacy AngularJS has fully ended.](https://goo.gle/angularjs-end-of-life). -
- On July 1, 2018 AngularJS entered a 3 year Long Term Support period.
-
- _**UPDATE (2020-07-27):**_
- _Due to COVID-19 affecting teams migrating from AngularJS, we are extending the LTS by six months - (until December 31, 2021)._ -
- -Any version branch not shown in the following table (e.g. 1.7.x) is no longer being developed. - - - - - - - - - - - - - - - - - -
VersionStatusComments
1.2.xSecurity patches onlyLast version to provide IE 8 support
1.8.xLong Term SupportSee {@link version-support-status#long-term-support Long Term Support} section below.
- -### Long Term Support - -On July 1st 2018, AngularJS entered a Long Term Support period. - -We now focus exclusively on providing fixes to bugs that satisfy at least one of the following criteria: - -* A security flaw is detected in the 1.8.x branch of the framework -* One of the major browsers releases a version that will cause current production applications using AngularJS 1.8.x to stop working -* The jQuery library releases a version that will cause current production applications using AngularJS 1.8.x to stop working. - -AngularJS 1.2.x will get a new version if and only if a new severe security issue is discovered. - - - -### Blog Post - -You can read more about these plans in our [blog post announcement](https://blog.angular.io/stable-angularjs-and-long-term-support-7e077635ee9c). - -### Extended Long Term Support +[Visit https://angular.io for the actively supported Angular framework](https://angular.io). If you need support for AngularJS beyond December 2021, you should consider: