From 73ca5dcc7c68b94e0d22fd1ab02e186f84665947 Mon Sep 17 00:00:00 2001
From: Mirek Jahoda <mjahoda@redhat.com>
Date: Jul 24 2018 11:54:07 +0000
Subject: Adding three more topics from the BNE Fedora Docs day and fixing additional errors


---

diff --git a/_topic_map.yml b/_topic_map.yml
index 6c2aed8..a0a0724 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -42,6 +42,8 @@ Topics:
     File: upgrading
   - Name: Controlling network traffic with firewalld
     File: firewalld
+  - Name: Using Adobe Flash
+    File: using-adobe-flash
   - Name: Adding new fonts in Fedora
     File: adding-new-fonts-fedora
   - Name: Creating GPG Keys
@@ -77,6 +79,8 @@ Topics:
     File: configuring-ip-networking-with-nmcli
   - Name: Creating disk partitions
     File: creating-a-disk-partition-in-linux
+  - Name: Encrypting drives using LUKS
+    File: encrypting-drives-using-LUKS
   - Name: NVIDIA Optimus Bumblebee
     File: bumblebee
   - Name: Raspberry Pi
@@ -87,6 +91,8 @@ Topics:
     File: adding-or-removing-software-repositories-in-fedora
   - Name: Resetting a root password
     File: reset-root-password
+  - Name: Installing an RPM file
+    File: proc_installing-RPM
   - Name: Creating RPM packages
     File: creating-rpm-packages
   - Name: Creating a GNU Hello World RPM Package
@@ -126,7 +132,7 @@ Topics:
   - Name: Configuring X.org as the default GNOME session
     File: configuring-xorg-as-default-gnome-session
 #  - Name: (FIX ME!) Identifying Wayland problems
-#    File: debug-wayland-problems
+#    File: debug-wayland-problems  note (mj): the wiki page is maintained and is better fit for this
 # - Name: (CHECK) GRUB 2
 #   File: grub2
 # - Name: (FIX ME!) How to debug Dracut problems
@@ -137,8 +143,6 @@ Topics:
 #   File: edit-iptables-rules
 # - Name: (FIX ME!) How to enable touchpad click
 #   File: enable-touchpad-click
-# - Name: (CHECK) Flash
-#   File: flash
 # - Name: (FIX ME!) Mirroring
 #   File: mirroring
 # - Name: (FIX ME!) OpenH264
diff --git a/en-US/configuring-ip-networking-with-nmcli.adoc b/en-US/configuring-ip-networking-with-nmcli.adoc
index 60c58a8..eca1e38 100644
--- a/en-US/configuring-ip-networking-with-nmcli.adoc
+++ b/en-US/configuring-ip-networking-with-nmcli.adoc
@@ -1,4 +1,6 @@
-[id='Configuring-networking-with-nmcli']
+:parent-context: {context}
+
+[id='Configuring-networking-with-nmcli-{context}']
 = Configuring IP networking with nmcli
 
 How to configure networking using the [application]*nmcli* (NetworkManager Command Line Interface) command-line utility.
@@ -9,4 +11,6 @@ include::en-US/modules/proc_Brief-selection-of-nmcli-examples.adoc[leveloffset=+
 
 include::en-US/modules/con_Understanding-the-nmcli-options.adoc[leveloffset=+1]
 
-include::en-US/modules/proc_Configuring-networking-with-nmcli.adoc[leveloffset=+1]
+include::en-US/modules/ref_Configuring-networking-with-nmcli.adoc[leveloffset=+1]
+
+:context: {parent-context}
diff --git a/en-US/flash.adoc b/en-US/flash.adoc
deleted file mode 100644
index ca89079..0000000
--- a/en-US/flash.adoc
+++ /dev/null
@@ -1,54 +0,0 @@
-:experimental:
-include::en-US/entities.adoc[]
-include::en-US/3rdparty-message.adoc[]
-
-[[ch-flash]]
-= Flash
-
-[[sect-what-is-flash]]
-== What is Flash?
-
-Flash is a web browser plugin for multimedia use.
-Because it is not free/libre and open source software, Adobe's Flash plugin cannot be included in Fedora.
-However, Adobe does release a version of the Flash plugin for Fedora, and other Linux distributions, for Firefox, Chromium, and other popular Internet browsers.
-
-The use of Flash is not as wide-spread as it use to be as many sites like Youtube use HTML5 for video playback.
-Many modern browsers like Firefox and Chromium can play these files without the need for a Flash plugin.
-Google Chrome's web browser comes with Flash installed by default.
-
-== How do I install Adobe Flash?
-
-Before downloading Flash, you will need to know whether you are using Fedora 32-bit, or 64-bit.
-Open the terminal and enter:
-
-[source,bash]
-
-====
-
-uname -p
-
-====
-
-A result of `x86` means it is 32-bit, and `x86_64` is 64-bit.
-
-To install Adobe Flash on Fedora:
-
-. Go to the official Adobe Flash web site at link:++https://get.adobe.com/flashplayer/otherversions/++[https://get.adobe.com/flashplayer/otherversions/].
-
-. In the drop-down for _Select an Operating System_, choose 32-Bit or 64-Bit (depending on the result above).
-
-. In the drop-down for _Select a version_, select *FP for Linux 64-bit (.rpm) - NPAPI* for browsers like Firefox, or select *FP for Linux 64-bit (.rpm) - PPAPI* for browsers like Chromium. 
-
-. Click the *Download Now* button to download the file.
-
-. Open a terminal, go to the directory where the file was downloaded and enter:
-
-[source,bash]
-
-====
-
-sudo dnf install flash-player-*.rpm
-
-====
-
-You have successfully installed the Adobe Flash plugin and websites using Flash will now work on your browser.
diff --git a/en-US/installing-and-running-vlc.adoc b/en-US/installing-and-running-vlc.adoc
index 6de7805..f1583e6 100644
--- a/en-US/installing-and-running-vlc.adoc
+++ b/en-US/installing-and-running-vlc.adoc
@@ -5,7 +5,7 @@
 [[installing-and-running-vlc]]
 = Installing and Running VLC
 
-include::3rdparty-message.adoc[]
+include::en-US/3rdparty-message.adoc[]
 
 :leveloffset: +1