Merge branch 'pr326'

modules/ROOT/pages/_partials/concept_chromium-web-browser.adoc

@@ -1,20 +1,16 @@
-[id='chromium-web-browser']
+[id='chromium-and-google-chrome']
 = Chromium and Google Chrome web browsers
 
-Only the Chromium browser is available from official Fedora repositories.
-
+Fedora Workstation, in its out of the box configuration, only includes free and open source software. **Mozilla Firefox** is the browser included in Fedora Workstation by default. However, it easy to install either **Google Chrome** or **Chromium**, if preferred.
 
 [id='chromium']
 == Chromium
 
-Chromium is the upstream project for Google Chrome.
-
-NOTE: As of August 2016, Chromium is included in the Fedora Repositories. If you were using the old Chromium https://copr.fedorainfracloud.org/coprs/spot/chromium/[Copr] repository, upgrade your Chromium.
-
-Fedora's Chromium package does not support h264, mp3, or aac because of legal concerns. It is built to support the *widevine* plugin (but does not include it).
-
+Chromium is the upstream project for Google Chrome. Chromium is included in the Fedora Repositories. Fedora's Chromium package only contains free and open source software, so does not include several features of Google Chrome that rely on proprietary software.
 
 [id='google-chrome']
 == Google Chrome
 
-Chromium is upstream for Google Chrome. Fedora does not include Google Chrome because it is a proprietary product and bundles other proprietary software. However, Google does maintain a DNF or YUM repository for Fedora at link:https://www.google.com/chrome/[google.com/chrome]. The given link also includes downloadable RPMs that you can use to install Chrome.
+Google Chrome is a popular web browser developed by Google. Chrome is built on top of the open-source browser project, Chromium. Chrome includes additional features such as support for proprietary media files (such as H.264 or AAC) and playback of rights-protected media (Netflix, etc.) Chrome also includes support for other Google services such as browser sync and location services, which are not supported by Chromium.
+
+Google Chrome is available in Fedora Workstation via a curated third-party repository. Once this repository is enabled, Chrome can be installed via Software or the command line.

modules/ROOT/pages/_partials/proc_enabling-chromium-plugins.adoc

@@ -1,19 +0,0 @@
-[id='enabling-chromium-plugins']
-= Enabling Chromium plugins
-
-.To enable *widevine* plugin
-
-Fedora's _chromium_ package is built to support the *widevine* plugin (but does not include it). 
-
-. Copy `libwidevinecdm.so` and `libwidevinecdmadapter.so` from the Google Chrome package into `/usr/lib64/chromium-plugins`.
-
-. Restart Chromium. You can see *Widevine Content Decryption Module* in *chrome://flags*.
-
-NOTE: To enable speech synthesis support, pass the `--enable-speech-dispatcher` flag to `chromium-browser`.
-
-
-[discrete]
-== Additional resources
-
-
-* https://fedoraproject.org/wiki/Chromium

modules/ROOT/pages/_partials/proc_installing-chromium-web-browser.adoc

@@ -7,9 +7,9 @@ Both Chromium and Google Chrome can be installed on Fedora.
 [id='installing-chromium']
 == Installing Chromium
 
-Chromium can be installed using GUI and terminal.
+Chromium can be installed using the Software application and via command line.
 
-.Installing Chromium using GUI
+=== Installing Chromium using Software (GUI)
 
 . Click on Software tool in Fedora.
 
@@ -17,7 +17,7 @@ Chromium can be installed using GUI and terminal.
 
 . Click on Install.
 
-.Installing Chromium using terminal
+=== Installing Chromium using Terminal
 
 . To install Chromium Web Browser, use the command:
 +
@@ -31,40 +31,65 @@ Chromium can be installed using GUI and terminal.
 # dnf upgrade chromium
 ----
 
+[TIP]
+==== 
+If you require support for non-free multimedia formats like H.264 or AAC, or the ability to play DRM-protected media such as Netflix, Spotify, etc. it may be preferable to install the *chromium-freeworld* package from the https://docs.fedoraproject.org/en-US/quick-docs/setup_rpmfusion/[RPM Fusion] repositories, as the necessary plug-ins are already built-in.
+====
 
 [id='installing-chrome']
 == Installing Chrome
 
-*Google Chrome* can be installed by downloading rpm.
+Chrome can be installed using Software or a terminal, once the repository is enabled.
 
-. Click the following link: https://www.google.com/chrome/browser/desktop/index.html .
+=== Installing Chrome using Software (GUI)
 
-. Click on *Download Chrome* and select *Fedora 64* or *32 bits* download and install the repo.
+. Open the *Software* application.
 
-. Login as root and use the command to install Google Chrome:
+. Click on the menu at the top right and select *Software Repositories*.
+
+. Make sure Third Party Repositories is enabled. If the button label is *Install*, then click that button to install the third party repositiories. If the button reads *Remove All* then the third party repositories are already installed.
++
+image:installing-chromium-or-google-chrome-browsers-0.png[]
++
+. Scroll down to find the repository called *google-chrome*. Click on it and choose *Enable*. 
++
+image:installing-chromium-or-google-chrome-browsers-1.png[]
+
+You can now search for *Google Chrome* in Software, and install it.
+
+=== Installing Chrome using Terminal
+
+The additional repositories can also be managed using a terminal and DNF.
+
+. Install Third Party Repositories
 +
 ----
-# dnf install google-chrome
+$ sudo dnf install fedora-workstation-repositories
+----
++
+. Enable the Google Chrome repo:
++
+----
+$ sudo dnf config-manager --set-enabled google-chrome
+----
++
+. Finally, install Chrome:
++
+----
+$ sudo dnf install google-chrome-stable
 ----
 
 [NOTE]
 ====
-If you want to install unstable Google Chrome version, use the following command:
+If you want to install the Chrome Dev Channel version, use the following command:
 
 ----
-# dnf install google-chrome-unstable
+$ sudo dnf install google-chrome-unstable
 ----
 
-If you want to install stable Google Chrome version using the following command:
+If you want to install Chrome Beta use the following:
 
 ----
-# dnf install google-chrome-beta`
+$ sudo dnf install google-chrome-beta
 ----
 ====
-
-
-[discrete]
-== Additional resources
-
-* https://copr.fedorainfracloud.org/[COPR repository]
-* https://www.google.com/chrome/browser/desktop/index.html[Google Chrome rpm]

modules/ROOT/pages/installing-chromium-or-google-chrome-browsers.adoc

@@ -5,13 +5,9 @@ ifdef::context[:parent-context: {context}]
 
 include::{partialsdir}/3rdparty-message.adoc[]
 
-include::{partialsdir}/unreviewed-message.adoc[]
-
 include::{partialsdir}/concept_chromium-web-browser.adoc[leveloffset=+1]
 
 include::{partialsdir}/proc_installing-chromium-web-browser.adoc[leveloffset=+1]
 
-include::{partialsdir}/proc_enabling-chromium-plugins.adoc[leveloffset=+1]
-
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]