Merge pull request #270 from fedora-cloud/f20-eol

update fedora/content.md about f20 going EOL
This commit is contained in:
Tianon Gravi 2015-07-06 12:10:24 -07:00
commit 18ea053251
1 changed files with 3 additions and 3 deletions

View File

@ -1,12 +1,12 @@
# Fedora
This image serves as the `official Fedora image` for `Fedora 21` and as a semi-official image for Fedora 20 (heisenbug) and rawhide.
This image serves as the `official Fedora image` for `Fedora 22`, `Fedora 21` and as a semi-official image for Fedora 20 (heisenbug) and rawhide.
%%LOGO%%
The `fedora:latest` tag will always point to the latest stable release, currently [Fedora 21](https://getfedora.org/). `fedora:latest` is now the same as `fedora:21`.
The `fedora:latest` tag will always point to the latest stable release, currently [Fedora 22](https://getfedora.org/). `fedora:latest` is now the same as `fedora:22`.
Fedora rawhide is available via `fedora:rawhide` and Fedora 20 via `fedora:20` and `fedora:heisenbug`.
Fedora rawhide is available via `fedora:rawhide` and Fedora 20 via `fedora:20` and `fedora:heisenbug`. Fedora 20 has now reached EOL and will receive no updates after the fix for `CVE-2015-4000 (Logjam)`.
The metalink `http://mirrors.fedoraproject.org` is used to automatically select a mirror site (both for building the image as well as for the yum repos in the container image).