From deb589dcbc7da7e2723e9ad3cfeb446114b1a56c Mon Sep 17 00:00:00 2001 From: rbowen Date: May 14 2018 18:45:11 +0000 Subject: Fix conflicting change. --- diff --git a/content/community/irc-meetings.ics b/content/community/irc-meetings.ics deleted file mode 100644 index 44d2fb7..0000000 --- a/content/community/irc-meetings.ics +++ /dev/null @@ -1,183 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//Google Inc//Google Calendar 70.9054//EN -VERSION:2.0 -CALSCALE:GREGORIAN -METHOD:PUBLISH -X-WR-CALNAME:CentOS Sig Meetings -X-WR-TIMEZONE:America/New_York -BEGIN:VEVENT -DTSTART:20180503T160000Z -DTEND:20180503T170000Z -RRULE:FREQ=WEEKLY;BYDAY=TH -DTSTAMP:20180501T183232Z -UID:7ed45kvf39lodok46rsec43iij@google.com -CREATED:20180501T180025Z -DESCRIPTION:http://wiki.centos.org/SpecialInterestGroup/Atomic -LAST-MODIFIED:20180501T180318Z -LOCATION:#centos-devel on Freenode -SEQUENCE:1 -STATUS:CONFIRMED -SUMMARY:CentOS Atomic SIG weekly IRC meeting -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180503T150000Z -DTEND:20180503T160000Z -RRULE:FREQ=WEEKLY;BYDAY=TH -DTSTAMP:20180501T183232Z -UID:6dm9mc4cbhn5lp93mpdt2rj5fd@google.com -CREATED:20180501T180437Z -DESCRIPTION:http://wiki.centos.org/SpecialInterestGroup/Cloud -LAST-MODIFIED:20180501T180438Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:CentOS Cloud SIG weekly IRC meeting -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180507T140000Z -DTEND:20180507T150000Z -RRULE:FREQ=WEEKLY;BYDAY=MO -DTSTAMP:20180501T183232Z -UID:4fd1rlb58mtffemhu7v801k9uc@google.com -CREATED:20180501T180601Z -DESCRIPTION:http://wiki.centos.org/HowTos/CommunityBuildSystem -LAST-MODIFIED:20180501T180601Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:CentOS Community Buildsystem & Infrastructure Meeting -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180504T170000Z -DTEND:20180504T180000Z -RRULE:FREQ=WEEKLY;BYDAY=FR -DTSTAMP:20180501T183232Z -UID:1ius30qtlgmovqs5173ivehp8j@google.com -CREATED:20180501T180710Z -DESCRIPTION:https://wiki.centos.org/SpecialInterestGroup/ConfigManagementSI - G -LAST-MODIFIED:20180501T180710Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:CentOS Config Management SIG weekly IRC meeting -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180503T093000Z -DTEND:20180503T103000Z -RRULE:FREQ=WEEKLY;BYDAY=TH -DTSTAMP:20180501T183232Z -UID:5d68rmcc10u6oe9sj5m70ghmf4@google.com -CREATED:20180501T180836Z -DESCRIPTION:http://www.karan.org/blog/2015/06/08/regular-office-hours/\n\nI - am going to make myself available to anyone who wants to come along and ta - lk about CentOS Linux\, the CentOS Project\, the SIGs or anything else that - is related to these. During this time\, you can find me on #centos-devel @ - irc.freenode.net as kbsingh\, and you can also call me on the phone at +44 - 207 009 4455. -LAST-MODIFIED:20180501T180836Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:Karanbir Singh IRC Office Hours -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180502T170000Z -DTEND:20180502T180000Z -RRULE:FREQ=WEEKLY;BYDAY=WE -DTSTAMP:20180501T183232Z -UID:1ev7p2j4imc2c9c70p1pnfhtte@google.com -CREATED:20180501T180945Z -DESCRIPTION:http://www.karan.org/blog/2015/06/08/regular-office-hours/\n\nI - am going to make myself available to anyone who wants to come along and ta - lk about CentOS Linux\, the CentOS Project\, the SIGs or anything else that - is related to these. During this time\, you can find me on #centos-devel @ - irc.freenode.net as kbsingh\, and you can also call me on the phone at +44 - 207 009 4455. -LAST-MODIFIED:20180501T180945Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:Karanbir Singh Office Hours -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180502T170000Z -DTEND:20180502T180000Z -RRULE:FREQ=WEEKLY;BYDAY=WE -DTSTAMP:20180501T183232Z -UID:0alruoav4ud6qhd3iapesoa8p9@google.com -CREATED:20180501T181234Z -DESCRIPTION:https://wiki.centos.org/SpecialInterestGroup/PaaS -LAST-MODIFIED:20180501T181234Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:CentOS PaaS SIG weekly IRC meeting -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180501T140000Z -DTEND:20180501T150000Z -RRULE:FREQ=WEEKLY;BYDAY=TU -DTSTAMP:20180501T183232Z -UID:5tav8ncg6coshur19jm0n43rf5@google.com -CREATED:20180501T181317Z -DESCRIPTION:http://wiki.centos.org/SpecialInterestGroup/SCLo -LAST-MODIFIED:20180501T181317Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:CentOS Software Collections SIG Sync-up -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180504T153000Z -DTEND:20180504T163000Z -RRULE:FREQ=WEEKLY;BYDAY=FR -DTSTAMP:20180501T183232Z -UID:2sjoiasg4tfg5v6gj895918oig@google.com -CREATED:20180501T181409Z -DESCRIPTION:http://wiki.centos.org/SpecialInterestGroup/Storage -LAST-MODIFIED:20180501T181409Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:CentOS Storage SIG weekly IRC meeting -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180501T150000Z -DTEND:20180501T160000Z -DTSTAMP:20180501T183232Z -UID:2s0cf89h7j0f99uutjb1fk3vqp@google.com -CREATED:20180501T181447Z -DESCRIPTION:https://wiki.centos.org/SpecialInterestGroup/Virtualization -LAST-MODIFIED:20180501T181447Z -LOCATION:#centos-devel on Freenode -SEQUENCE:0 -STATUS:CONFIRMED -SUMMARY:CentOS Virtualization SIG weekly IRC meeting -TRANSP:OPAQUE -END:VEVENT -BEGIN:VEVENT -DTSTART:20180502T180000Z -DTEND:20180502T190000Z -RRULE:FREQ=WEEKLY;BYDAY=WE -DTSTAMP:20180501T183232Z -UID:4n2nqi0aa4ne0nos1jcjbvf71j@google.com -CREATED:20180501T181143Z -DESCRIPTION:http://wiki.centos.org/SpecialInterestGroup/OpsTools -LAST-MODIFIED:20180501T182912Z -LOCATION:#centos-devel on Freenode -SEQUENCE:1 -STATUS:CONFIRMED -SUMMARY:CentOS OpsTools SIG weekly IRC meeting -TRANSP:OPAQUE -END:VEVENT -END:VCALENDAR diff --git a/content/download.haml b/content/download.haml index f218521..1696171 100644 --- a/content/download.haml +++ b/content/download.haml @@ -14,9 +14,9 @@ title: Download CentOS .col-sm-12 %p .downloadbutton - %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/CentOS-7-x86_64-DVD-1708.iso" ) DVD ISO - %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/CentOS-7-x86_64-Everything-1708.iso" ) Everything ISO - %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1708.iso" ) Minimal ISO + %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/CentOS-7-x86_64-DVD-1804.iso" ) DVD ISO + %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/CentOS-7-x86_64-Everything-1804.iso" ) Everything ISO + %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1804.iso" ) Minimal ISO %p ISOs are also available %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/" ) via Torrent. diff --git a/content/index.erb b/content/index.erb index d980d67..3173c18 100644 --- a/content/index.erb +++ b/content/index.erb @@ -18,7 +18,7 @@ $(document).ready(function () {

The CentOS Project

The CentOS Project is a community-driven free software effort focused on delivering a robust open source ecosystem. For users, we offer a consistent manageable platform that suits a wide variety of deployments. For open source communities, we offer a solid, predictable base to build upon, along with extensive resources to build, test, release, and maintain their code.

We're also expanding the availability of CentOS images across a number of vendors, providing official images for Amazon, Google, and more. For self-hosted cloud, we also provide a generic cloud-init enabled image.

-

For more information about updates and improvements in CentOS 7, please check out the release notes or the release announcement in the mailing list archive.

+

For more information about updates and improvements in CentOS 7, please check out the release notes or the release announcement in the mailing list archive.

Get CentOS Now
diff --git a/content/sponsors/itsyndicate.erb b/content/sponsors/itsyndicate.erb new file mode 100644 index 0000000..f61d032 --- /dev/null +++ b/content/sponsors/itsyndicate.erb @@ -0,0 +1,9 @@ +--- +name: ITsyndicate +sponsor: true +country: Ukraine +is_hidden: true +img: /images/sponsors/itsyndicate.png +url: https://itsyndicate.org/ +--- + diff --git a/content/sponsors/riverfrontnetworks.erb b/content/sponsors/riverfrontnetworks.erb new file mode 100644 index 0000000..9a01795 --- /dev/null +++ b/content/sponsors/riverfrontnetworks.erb @@ -0,0 +1,9 @@ +--- +name: RiverFront Networks +sponsor: true +country: usa +is_hidden: true +img: /images/sponsors/riverfrontnetworks.png +url: https://www.riverfrontnetworks.com/ +--- + diff --git a/static/images/sponsors/itsyndicate.png b/static/images/sponsors/itsyndicate.png new file mode 100644 index 0000000..1cc3fbc Binary files /dev/null and b/static/images/sponsors/itsyndicate.png differ diff --git a/static/images/sponsors/riverfrontnetworks.png b/static/images/sponsors/riverfrontnetworks.png new file mode 100644 index 0000000..9e4f3b8 Binary files /dev/null and b/static/images/sponsors/riverfrontnetworks.png differ