From 9078ca3ab67416600d962aa7755e931df54598ba Mon Sep 17 00:00:00 2001 From: Robert Mayr Date: Nov 10 2017 21:59:50 +0000 Subject: update content for Modular Server Beta --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 9f5bc68..bdd2df1 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -12,6 +12,7 @@ release={ 'curr_alt_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_cloud_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_cloud_AMI_state': '', # either 'Alpha', 'Beta' or '' (i.e empty) + 'curr_server_state': 'Beta', # either 'Alpha', 'Beta' or '' (i.e empty) 'curr_atomic_state': '', # No Alpha/Beta for Atomic Host 'prev_arm_id': '26', 'prev_alt_id': '26', @@ -21,12 +22,14 @@ release={ 'curr_alt_id': '27', 'curr_cloud_id': '27', 'curr_atomic_id': '26', - 'curr_cloud_AMI_id': '27', + 'curr_server_id': '26', + 'curr_cloud_AMI_id': '26', 'next_arm_id': '28', 'next_alt_id': '28', 'next_cloud_id': '28', - 'next_atomic_id': '28', - 'next_cloud_AMI_id': '28', + 'next_atomic_id': '27', + 'next_server_id': '27', + 'next_cloud_AMI_id': '27', 'composedate': '20160616', 'unofficial_compose': '20160614', 'alt_composedate': '20161118', @@ -80,6 +83,7 @@ path={ 'torrent': 'https://torrent.fedoraproject.org/torrents', 'torrent_spins': 'https://torrent.fedoraproject.org/torrents', 'download': 'https://download.fedoraproject.org/pub/fedora/linux/releases', + 'download_modular':'https://download.fedoraproject.org/pub/fedora/linux/modular/releases', 'dl': 'https://download.fedoraproject.org/pub/fedora/linux/updates', 'download_spins': 'https://download.fedoraproject.org/pub/alt/releases', 'download_atomic': 'https://download.fedoraproject.org/pub/alt/atomic', diff --git a/getfedora.org/data/content/server/download/index.html b/getfedora.org/data/content/server/download/index.html index ad111c6..a5618cb 100644 --- a/getfedora.org/data/content/server/download/index.html +++ b/getfedora.org/data/content/server/download/index.html @@ -29,8 +29,8 @@
-

${Markup(_('Download Fedora %(rel)s Server')) % {'rel':global_variables.release['curr_id']}}

-

${_('Download')}

+

${Markup(_('Download Fedora %(rel)s Server')) % {'rel':global_variables.release['curr_server_id']}}

+

${_('Download')}

${Markup(_('64-bit %sGB installation image')) % global_variables.iso_size['x86_64_server_DVD']}
@@ -38,7 +38,7 @@
-

${Markup(_('Are you looking for the Fedora 27 Server Beta? We\'re hard at work revamping Fedora Server to be built with <a href="%(modularity)s">Modularity</a> based on feedback from the <a href="%(boltron)s">Boltron tech preview</a>. Stay tuned for a beta release in several weeks. Read more on <a href="%(fedmag)s">Fedora Magazine</a>. Or, download Fedora 26 Server below.') % {'modularity':'https://docs.pagure.org/modularity/', 'boltron':'https://fedoramagazine.org/announcing-boltron/', 'fedmag':'https://fedoramagazine.org/where-is-fedora-server-27-beta/'})} +

${_('Are you looking for Fedora 27 Modular Server Beta?')} ${_('Download it here!')}

@@ -54,11 +54,11 @@

${_('Netinstall Image:')}

-
-
${Markup(_('F%(rel)s Beta')) % {'rel':global_variables.release['next_id']}}
+
${Markup(_('F%(rel)s Beta')) % {'rel':global_variables.release['next_server_id']}}

${_('Try a pre-release')}

${_('We\'re working on our next release.')}
- ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_id']}}

-

${Markup(_('Download F%(rel)s Beta images')) % {'rel':global_variables.release['next_id']}}

+ ${Markup(_('Help us get F%(rel)s ready!')) % {'rel':global_variables.release['next_server_id']}}

+

${Markup(_('Download F%(rel)s Beta images')) % {'rel':global_variables.release['next_server_id']}}

${_('How to test pre-releases')}

- +
- -->

${_('Get more Fedora')}

diff --git a/getfedora.org/data/content/server/prerelease/index.html b/getfedora.org/data/content/server/prerelease/index.html index 36102ca..fbb0cf1 100644 --- a/getfedora.org/data/content/server/prerelease/index.html +++ b/getfedora.org/data/content/server/prerelease/index.html @@ -5,7 +5,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> - ${Markup(_('Download Fedora Server %s')) % global_variables.release['curr_state']} + ${Markup(_('Download Fedora %s Modular Server')) % global_variables.release['curr_server_state']} @@ -14,8 +14,8 @@
-

${Markup(_('Download Fedora %(rel)s %(state)s Server')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

-

${_('Download')}

+

${Markup(_('Download Fedora %(rel)s %(state)s Modular Server')) % {'rel':global_variables.release['next_server_id'], 'state':global_variables.release['curr_server_state']}}

+

${_('Download')}

${Markup(_('64-bit %sGB Installation Image')) % global_variables.iso_size['pre_x86_64_server_DVD']}
@@ -28,21 +28,22 @@

${Markup(_('This is pre-release software and is supported by the <a href="%(team_url)s">Server Working Group</a>. Please direct questions to their <a href="%(team_list)s">mailing list</a> or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Server', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/server', 'team_irc':'#fedora-server'})} ${Markup(_('All issues or bugs should be reported via the <a href="%s">Red Hat Bugzilla</a>. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')} - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} + ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_server_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_server_id'])})} - ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})} + ${Markup(_('Read the <a href="%(relnotes_url)s">Release Notes</a> for more information on changes and new features, and the <a href="%(commonbugs_url)s">Common Bugs</a> page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_server_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_server_id'])})}

-

${_('When is Fedora %s going to be released?') % global_variables.release['next_id']}

- ${_('Read all the key milestones of the release schedule...')} +

${_('Verify your Image')}

${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the CHECKSUM file below into the same directory as the image you downloaded and follow <a href="%s/%s/verify">these instructions</a>.') % (path, lang))}

- ${_('Validate!')} + ${_('Validate!')}
@@ -52,7 +53,7 @@

${_('Netinstall Image:')}