From f8bd08f8612cfe313c1c2f0522c0fdd7e31b90ef Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Jul 25 2017 14:56:39 +0000 Subject: Change "flavors" to "editions" --- diff --git a/en-US/Downloading_Fedora.adoc b/en-US/Downloading_Fedora.adoc index ef67a5b..ec0c5f3 100644 --- a/en-US/Downloading_Fedora.adoc +++ b/en-US/Downloading_Fedora.adoc @@ -5,12 +5,12 @@ include::en-US/entities.adoc[] [[chap-downloading-fedora]] == Downloading Fedora -.Fedora Flavors -Fedora provides three primary flavors tailored for some specific use cases. link:++https://getfedora.org++[] offers Fedora Cloud for scalable infrastructure, Fedora Server for organizational infrastructure, and Fedora Workstation for the developer and desktop user. +.Fedora Editions +Fedora provides three primary Editions tailored for some specific use cases. link:++https://getfedora.org++[] offers Fedora Cloud for scalable infrastructure, Fedora Server for organizational infrastructure, and Fedora Workstation for the developer and desktop user. For alternative desktop environments or media built for more niche purposes, check out link:++https://spins.fedoraproject.org++[Fedora Spins]. -Each of these downloads provides a different set of default packages, but you can add to your system after the initial installation to customize it for your needs. The installation process is the same for all spins and flavors, so you can use this guide for any choice you make. +Each of these downloads provides a different set of default packages, but you can add to your system after the initial installation to customize it for your needs. The installation process is the same for all spins and Editions, so you can use this guide for any choice you make. .Which Architecture Is My Computer? Most modern systems are 64{nbsp}bit x86 architecture. If your computer was manufactured after 2007, or you aren't sure, you probably have a `x86_64` system. @@ -35,13 +35,13 @@ Live Image:: Live images allow you to preview Fedora before installing it. Inst + Use a live image to install your favorite system, test Fedora on new hardware, troubleshoot, or share with friends. -DVD Image:: DVD images boot directly into the installation enviroment, and allow you to choose from a variety of packages that are provided with it. In Fedora 21, the DVD option is only available in the *Fedora Server* flavor. +DVD Image:: DVD images boot directly into the installation enviroment, and allow you to choose from a variety of packages that are provided with it. In Fedora 21, the DVD option is only available in the *Fedora Server* Edition. + Use the Fedora Server DVD image when you want customized Fedora Server installations using an offline installation source. netinstall Image:: The netinstall image boots directly into the installation environment, and uses the online Fedora package repositories as the installation source. With a netinstall image, you can select a wide variety of packages to create a customized installation of Fedora. + -The Fedora Server netinstall image is a universal one, and can be used to install any Fedora flavor or your own set of favorite packages. +The Fedora Server netinstall image is a universal one, and can be used to install any Fedora Edition or your own set of favorite packages. ARM images:: For many ARM systems, Fedora provides preconfigured filesystem images. Write the image to removable media and boot directly into a Fedora installation that's ready to use. + diff --git a/en-US/install/After_Installation.adoc b/en-US/install/After_Installation.adoc index 12d5ace..79b1486 100644 --- a/en-US/install/After_Installation.adoc +++ b/en-US/install/After_Installation.adoc @@ -7,7 +7,7 @@ include::en-US/entities.adoc[] This chapter describes the initial setup tools which open after you finish the installation, reboot the system, and log in for the first time. -Two separate configuration tools are part of {PRODUCT}. If you installed the [application]*GNOME* desktop environment (the default {PRODUCT} environment, installed for example as part of the {PRODUCT} Workstation flavor), the [application]*GNOME Initial Setup* utility will open; for all other graphical environments, the [application]*Initial Setup* tool serves the same purpose. +Two separate configuration tools are part of {PRODUCT}. If you installed the [application]*GNOME* desktop environment (the default {PRODUCT} environment, installed for example as part of the {PRODUCT} Workstation Edition), the [application]*GNOME Initial Setup* utility will open; for all other graphical environments, the [application]*Initial Setup* tool serves the same purpose. Both of these tools will allow you to configure user-specific settings which have not been configured during the installation. Some of the settings are available both in the graphical installer (or as Kickstart commands) as well as in the initial-setup utilities; in that case, they will only be displayed after the first reboot if you skipped them during the installation. This means that, for example, if you configured a user account before the installation finished, you will not be prompted to do so again after the installation completes. diff --git a/en-US/install/Preparing_for_Installation.adoc b/en-US/install/Preparing_for_Installation.adoc index 66b36a1..c57f495 100644 --- a/en-US/install/Preparing_for_Installation.adoc +++ b/en-US/install/Preparing_for_Installation.adoc @@ -26,7 +26,7 @@ Always back up your data before performing an upgrade or reinstalling your syste [[sect-preparing-obtaining-images]] ==== Downloading Boot and Installation Images -The Fedora Project offers different flavors tailored for some specific use cases. Choose the Fedora flavor best for you, or you can build your own by customizing after the installation, or by using a kickstart file as described in <>. Kickstart installation requires the `netinstall` media type, or a direct installation booting method such as PXE; kickstarts are not supported with live images. +The Fedora Project offers different Editions tailored for some specific use cases. Choose the Fedora Edition best for you, or you can build your own by customizing after the installation, or by using a kickstart file as described in <>. Kickstart installation requires the `netinstall` media type, or a direct installation booting method such as PXE; kickstarts are not supported with live images. Read more about Fedora Workstation, Fedora Cloud, Fedora Server and the available media types in <>. @@ -166,10 +166,10 @@ Most media creation methods in this section are destructive. Ensure you do not n . In Windows 8 and 10, the application will be under "all apps" under F for [application]*Fedora Media Writer*. Or in Windows 10, you can just type [application]*Fedora Media Writer* in the search box on the task bar. -. Select the Fedora flavor you wish to make a bootable USB drive for. +. Select the Fedora Edition you wish to make a bootable USB drive for. + [[figu-fedora_media_writer_choose_flavor_windows]] -.Fedora Media Writer Main Screen: Choose your flavor of Fedora +.Fedora Media Writer Main Screen: Choose your Edition of Fedora + image::fedora_media_writer/main_screen.png[Image of Fedora Image Writer Main Screen] @@ -214,10 +214,10 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer writ + or in [application]*gnome 3* by selecting *activities,* then selecting *system tools*, and then selecting [application]*Fedora LiveUSB Creator* -. Select the Fedora flavor you wish to make a bootable USB drive for. +. Select the Fedora Edition you wish to make a bootable USB drive for. + [[figu-fedora_media_writer_choose_flavor_linux]] -.Fedora Media Writer Main Screen: Choose your flavor of Fedora +.Fedora Media Writer Main Screen: Choose your Edition of Fedora + image::fedora_media_writer/main_screen.png[Image of Fedora Image Writer Main Screen] @@ -254,10 +254,10 @@ image::fedora_media_writer/write_to_device.png[Image of Fedora Image Writer writ . Mac OS will then ask if you are sure you want to open the file (it is from the internet after all), select "Open" to run the program. -. Select the Fedora flavor you wish to make a bootable USB drive for. +. Select the Fedora Edition you wish to make a bootable USB drive for. + [[figu-fedora_media_writer_choose_flavor_mac]] -.Fedora Media Writer Main Screen: Choose your flavor of Fedora +.Fedora Media Writer Main Screen: Choose your Edition of Fedora + image::fedora_media_writer/main_screen.png[Image of Fedora Image Writer Main Screen]