Hi Colin, you should open a ticket in our websites trac[1] and upload your patch, sending this just via mail as plain text is not really useful. Thanks. Robert
[1] https://fedorahosted.org/fedora-websites/ 2016-02-23 17:25 GMT+01:00 Colin Walters <[email protected]>: > From 306cd5a9a99742e38a8688481337444fc967e428 Mon Sep 17 00:00:00 2001 > From: Colin Walters <[email protected]> > Date: Tue, 23 Feb 2016 11:23:24 -0500 > Subject: [PATCH] web: s/Atomic/Atomic Host/ where appropriate > > "Atomic" is now a generic branding around many different container > efforts. Most of the things here are talking about what we now > generally call Atomic Host. > > Note: I didn't test this patch. > --- > fedoraproject.org/data/content/get-prerelease.html | 12 ++++---- > .../data/content/cloud/download/atomic.html | 34 > +++++++++++----------- > 2 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/fedoraproject.org/data/content/get-prerelease.html b/ > fedoraproject.org/data/content/get-prerelease.html > index c9bb1ea..3c10bb6 100644 > --- a/fedoraproject.org/data/content/get-prerelease.html > +++ b/fedoraproject.org/data/content/get-prerelease.html > @@ -355,13 +355,13 @@ l_code = l_map.get(lang, dflt_language) > </div> > <div class="grid_12 omega"> > <h4>${_('Cloud Images')}</h4> > - <p>${_('The Fedora Cloud Working Group offers > two variants for different use cases. The Base image is suitable for anyone > who wants to run Fedora in the AWS public cloud, or in a private cloud like > OpenStack. It can be customized to fit your needs by adding additional > packages. The Atomic image is generated using rpm-ostree tools to allow > true "atomic" updates, and is optimized to run Docker containers.')}</p> > + <p>${_('The Fedora Cloud Working Group offers > two variants for different use cases. The Base image is suitable for anyone > who wants to run Fedora in the AWS public cloud, or in a private cloud like > OpenStack. It can be customized to fit your needs by adding additional > packages. The Atomic Host image is generated using rpm-ostree tools to > allow true "atomic" updates, and is optimized to run Docker > containers.')}</p> > <p>${_('Both are available either to download > in several formats or to launch in public clouds.')}</p> > <div class="grid_5"> > <a href="#base" class="big-button">${_('F%s > Cloud Base') % global_variables.release['next_id']}</a> > </div> > <div class="grid_5"> > - <a href="#atomic" class="big-button">${_('F%s > Atomic') % global_variables.release['next_id']}</a> > + <a href="#atomic" class="big-button">${_('F%s > Atomic Host') % global_variables.release['next_id']}</a> > </div> > </div> > </div> > @@ -424,9 +424,9 @@ l_code = l_map.get(lang, dflt_language) > > <div class="alpha omega"><hr /></div> > > - <h3 id="atomic">${Markup(_('Fedora %(rel)s %(state)s > Atomic')) % {'rel':global_variables.release['next_id'], > 'state':global_variables.release['curr_state']}}</h3> > - <p>${Markup(_('The Fedora Atomic image is a minimal set > of Fedora packages optimized for use as a Docker container host. <a > href="%s">Read more</a> about Docker Container Images.') % ' > https://fedoraproject.org/wiki/Changes/Docker_Container_Image')}</p> > - <p>${Markup(_('Fedora Atomic images are available in > Amazon EC2 and for direct download. The downloadable images are available > in compressed raw image format and in qcow2 for immediate use with <a > href="%s">OpenStack</a>. The images are configured with > cloud-init, and so will take advantage of ec2-compatible metadata services > for provisioning ssh keys.') % 'http://openstack.redhat.com/')}</p> > + <h3 id="atomic">${Markup(_('Fedora %(rel)s %(state)s > Atomic Host')) % {'rel':global_variables.release['next_id'], > 'state':global_variables.release['curr_state']}}</h3> > + <p>${Markup(_('The Fedora Atomic Host image is a minimal > set of Fedora packages optimized for use as a Docker container host. <a > href="%s">Read more</a> about Docker Container Images.') % ' > https://fedoraproject.org/wiki/Changes/Docker_Container_Image')}</p> > + <p>${Markup(_('Fedora Atomic Host images are available in > Amazon EC2 and for direct download. The downloadable images are available > in compressed raw image format and in qcow2 for immediate use with <a > href="%s">OpenStack</a>. The images are configured with > cloud-init, and so will take advantage of ec2-compatible metadata services > for provisioning ssh keys.') % 'http://openstack.redhat.com/')}</p> > > <h4>${_('Currently supported EC2 Images')}</h4> > <p>${_('Choose the region and machine > architecture and just click to launch in your Amazon Web Services account. > Or, copy the AMI ID and use that to launch from the AWS Console or > command-line tools.')}</p> > @@ -457,7 +457,7 @@ l_code = l_map.get(lang, dflt_language) > </li> > </ul> > --> > - <p class="note">${_('We had a mirroring SNAFU with the > Fedora Atomic Beta images. Additionally, we have some fixes coming soon. > Check back for updated download links in the next few days.')}</p> > + <p class="note">${_('We had a mirroring SNAFU with the > Fedora Atomic Host Beta images. Additionally, we have some fixes coming > soon. Check back for updated download links in the next few days.')}</p> > > <div class="alpha omega"><hr /></div> > > diff --git a/getfedora.org/data/content/cloud/download/atomic.html b/ > getfedora.org/data/content/cloud/download/atomic.html > index ad3a861..be9b940 100644 > --- a/getfedora.org/data/content/cloud/download/atomic.html > +++ b/getfedora.org/data/content/cloud/download/atomic.html > @@ -35,7 +35,7 @@ > <p>${_('There are two main versions of Fedora Cloud > available:')} > <ul> > <li>${Markup(_('<a href="index.html">Base > images</a> suitable for creating VMs.'))}</li> > - <li>${Markup(_('<a href="atomic.html">Atomic > images</a> for creating hosts for container deployment.'))}</li> > + <li>${Markup(_('<a href="atomic.html">Atomic Host > images</a> for creating hosts for container deployment.'))}</li> > </ul> > </p> > </div> > @@ -56,7 +56,7 @@ > <div class="collapse navbar-collapse navbar-center"> > <ul class="nav navbar-nav"> > <li class=""><a href="index.html">${_('Base > Images')}</a></li> > - <li class=""><a href="atomic.html" > class="active">${_('Atomic Images')}</a></li> > + <li class=""><a href="atomic.html" > class="active">${_('Atomic Host Images')}</a></li> > <li class=""><a href="docker.html">${_('Docker > Image')}</a></li> > </ul> > </div> > @@ -68,9 +68,9 @@ > <div class="col-md-8 col-xs-12"> > <div class="row top-margin"> > <div class="col-xs-12"> > - <h2 class="cloudy">${_('Atomic Images')}</h2> > - <p>${_('Fedora Atomic represents the leading edge of Project > Atomic development. The images published here showcase that work. Note that > the images have passed several levels of automated testing, but are not > always subjected to manual testing by the QA team.')}</p> > - <p>${Markup(_('Please test before using new versions in > production. If you do discover a problem, the Atomic tools make it easy to > flip back to an earlier release — and if that happens, please also help us > by <a href="%s">filing bugs</a> or <a > href="%s">submitting fixes</a>.') % (' > http://www.projectatomic.io/community/', ' > https://github.com/projectatomic/'))}</p> > + <h2 class="cloudy">${_('Atomic Host Images')}</h2> > + <p>${_('Fedora Atomic Host is a leading edge base operating > system following the Project Atomic model. It is designed around > Kubernetes and Docker containers. The images published here showcase that > work. Note that the images have passed several levels of automated testing, > but are not always subjected to manual testing by the QA team.')}</p> > + <p>${Markup(_('Please test before using new versions in > production. If you do discover a problem, the Atomic Host tools make it > easy to flip back to an earlier release — and if that happens, please also > help us by <a href="%s">filing bugs</a> or <a > href="%s">submitting fixes</a>.') % (' > http://www.projectatomic.io/community/', ' > https://github.com/projectatomic/'))}</p> > <p>${_('Fedora Atomic Host images are updated roughly every > two weeks, rather than on the main six-month Fedora cadence. Because > development is moving quickly, only the latest major Fedora release is > supported.')}</p> > <p>${Markup(_('Note that different Fedora Atomic Host media > are subject to different levels of automatic testing. We are making > continuous improvements to these tests; <a href="%s">click > here</a> to see the current test status.') % (' > https://apps.fedoraproject.org/autocloud/jobs/'))}</p> > <p class="bold">${Markup(_('You can learn more about the > Atomic project at <a href="%s">projectatomic.io</a>.') % (' > http://projectatomic.io/'))}</p> > @@ -121,7 +121,7 @@ > <!-- Start Vagrant --> > <div class="row"> > <div class="col-xs-12 top-margin"> > - <h3>${_('Atomic Images for Vagrant')}</h3> > + <h3>${_('Atomic Host Images for Vagrant')}</h3> > <p>${_('These images are Vagrant Boxes images for > deployment using Vagrant.')}</p> > </div> > </div> > @@ -131,13 +131,13 @@ > <h5 class="bold">${_('VirtualBox Image')}</h5> > <p>${_('If you\'re using Vagrant on Mac OS X or Windows, this > is likely the image you\'ll want to use.')}</p> > <a class="btn btn-success btn-fix download-cloud > download-cloud-splash" > href="${global_variables.path['download_atomic']}/stable/Cloud-Images/x86_64/Images/Fedora-Cloud-Atomic-Vagrant-${global_variables.release['curr_cloud_id']}-${global_variables.release['atomic_composedate']}.x86_64.vagrant-virtualbox.box" > role="button">${_('VirtualBox Image')}</a> > - <p class="caption">${_('64-bit %sMB VirtualBox Atomic > Vagrant Image') % global_variables.iso_size['atomic_VBvag_cloud']}</p> > + <p class="caption">${_('64-bit %sMB VirtualBox Atomic Host > Vagrant Image') % global_variables.iso_size['atomic_VBvag_cloud']}</p> > </div> > <div class="col-xs-12"> > <h5 class="bold">${_('libvirt/KVM Image')}</h5> > <p>${_('If you\'re using Vagrant on Fedora, this is the image > you\'ll want to use.')}</p> > <a class="btn btn-success btn-fix download-cloud > download-cloud-splash" > href="${global_variables.path['download_atomic']}/stable/Cloud-Images/x86_64/Images/Fedora-Cloud-Atomic-Vagrant-${global_variables.release['curr_cloud_id']}-${global_variables.release['atomic_composedate']}.x86_64.vagrant-libvirt.box" > role="button">${_('libvirt/KVM Image')}</a> > - <p class="caption">${_('64-bit %sMB libvirt/KVM Atomic > Vagrant Image') % global_variables.iso_size['atomic_libvag_cloud']}</p> > + <p class="caption">${_('64-bit %sMB libvirt/KVM Atomic Host > Vagrant Image') % global_variables.iso_size['atomic_libvag_cloud']}</p> > </div> > </div> > > @@ -155,11 +155,11 @@ > <div class="row hidden-xs"> > <div class="col-sm-6"> > <a class="btn btn-success btn-fix download-cloud > download-cloud-splash" > href="${global_variables.path['download_atomic']}/stable/Cloud-Images/x86_64/Images/Fedora-Cloud-Atomic-Vagrant-${global_variables.release['curr_cloud_id']}-${global_variables.release['atomic_composedate']}.x86_64.vagrant-virtualbox.box" > role="button">${_('VirtualBox Image')}</a> > - <p class="caption">${_('64-bit %sMB VirtualBox Atomic > Vagrant Image') % global_variables.iso_size['atomic_VBvag_cloud']}</p> > + <p class="caption">${_('64-bit %sMB VirtualBox Atomic Host > Vagrant Image') % global_variables.iso_size['atomic_VBvag_cloud']}</p> > </div> > <div class="col-sm-6"> > <a class="btn btn-success btn-fix download-cloud > download-cloud-splash" > href="${global_variables.path['download_atomic']}/stable/Cloud-Images/x86_64/Images/Fedora-Cloud-Atomic-Vagrant-${global_variables.release['curr_cloud_id']}-${global_variables.release['atomic_composedate']}.x86_64.vagrant-libvirt.box" > role="button">${_('libvirt/KVM Image')}</a> > - <p class="caption">${_('64-bit %sMB libvirt/KVM Atomic > Vagrant Image') % global_variables.iso_size['atomic_libvag_cloud']}</p> > + <p class="caption">${_('64-bit %sMB libvirt/KVM Atomic Host > Vagrant Image') % global_variables.iso_size['atomic_libvag_cloud']}</p> > </div> > </div> > <!-- End Vagrant --> > @@ -168,7 +168,7 @@ > <!-- Start Amazon --> > <div class="row"> > <div class="col-xs-12 top-margin"> > - <h3>${_('Atomic Cloud Images for Amazon Public Cloud > EC2')}</h3> > + <h3>${_('Atomic Host Cloud Images for Amazon Public Cloud > EC2')}</h3> > <p>${_('The links below will provide you listings of > available AMIs by region with buttons to launch them in your Amazon Web > Services account. AMI IDs for usage with the AWS Console or command-line > tools are also provided.')}</p> > <p>${_('All images are available in two formats: a GP2 > format which uses faster SSD storage, and a standard format which is more > suitable if you have infrequently accessed data and you want to keep > storage cost low.')}</p> > </div> > @@ -177,14 +177,14 @@ > <div class="col-xs-12"> > <h5 class="bold">${_('Hardware Virtual Machine (HVM)')}</h5> > > - <!-- Modal for EC2 GP2 Cloud Atomic HVM Instances --> > + <!-- Modal for EC2 GP2 Cloud Atomic Host HVM Instances --> > <button type="button" class="btn btn-success btn-fix > download-cloud-splash" data-toggle="modal" > data-target=".GP2-atomic-EC2">${_('GP2 HVM AMIs')}</button> > <div class="modal fade GP2-atomic-EC2" tabindex="-1" > role="dialog" aria-hidden="true"> > <div class="modal-dialog modal-cloud"> > <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="close" > data-dismiss="modal"><span aria-hidden="true">×</span><span > class="sr-only">${_('Close')}</span></button> > - <h4 class="modal-title">${Markup(_('Fedora %(rel)s > GP2 Atomic Cloud HVM AMIs')) % > {'rel':global_variables.release['curr_id']}}</h4> > + <h4 class="modal-title">${Markup(_('Fedora %(rel)s > GP2 Atomic Host Cloud HVM AMIs')) % > {'rel':global_variables.release['curr_id']}}</h4> > </div> > <table class="table table-hover"> > <thead> > @@ -205,14 +205,14 @@ > </div> > </div> > </div> > - <!-- Modal for EC2 Standard Cloud Atomic HVM Instances --> > + <!-- Modal for EC2 Standard Cloud Atomic Host HVM Instances > --> > <p><button type="button" class="btn btn-success btn-fix > download-cloud-splash" data-toggle="modal" > data-target=".atomic-EC2">${_('Standard HVM AMIs')}</button></p> > <div class="modal fade atomic-EC2" tabindex="-1" > role="dialog" aria-hidden="true"> > <div class="modal-dialog modal-cloud"> > <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="close" > data-dismiss="modal"><span aria-hidden="true">×</span><span > class="sr-only">${_('Close')}</span></button> > - <h4 class="modal-title">${Markup(_('Fedora %(rel)s > Standard Atomic Cloud HVM AMIs')) % > {'rel':global_variables.release['curr_id']}}</h4> > + <h4 class="modal-title">${Markup(_('Fedora %(rel)s > Standard Atomic Host Cloud HVM AMIs')) % > {'rel':global_variables.release['curr_id']}}</h4> > </div> > <table class="table table-hover"> > <thead> > @@ -245,9 +245,9 @@ > <div class="col-md-3 col-xs-12 col-md-offset-1"> > <h3>${_('Other Downloads')}</h3> > <p> > - ${_('Atomic Image:')} > + ${_('Atomic Host Image:')} > <ul> > - <li><p><a class="download-cloud-splash" > href="${global_variables.path['download_atomic']}/stable/Cloud_Atomic/x86_64/iso/Fedora-Cloud_Atomic-x86_64-${global_variables.release['curr_id']}-${global_variables.release['atomic_composedate']}.iso">${_('64-bit > Atomic ISO image')}</a></p></li> > + <li><p><a class="download-cloud-splash" > href="${global_variables.path['download_atomic']}/stable/Cloud_Atomic/x86_64/iso/Fedora-Cloud_Atomic-x86_64-${global_variables.release['curr_id']}-${global_variables.release['atomic_composedate']}.iso">${_('64-bit > Atomic Host ISO image')}</a></p></li> > </ul> > </p> > <div class="bottom-margin"> > -- > 1.8.3.1 > -- > websites mailing list > [email protected] > http://lists.fedoraproject.org/admin/lists/[email protected] -- Robert Mayr (robyduck)
-- websites mailing list [email protected] http://lists.fedoraproject.org/admin/lists/[email protected]
