From 89da79bcdbff48020f50ccf509961856ab7b2e4f Mon Sep 17 00:00:00 2001
From: Simon Clark <simon.richard.clark@gmail.com>
Date: Nov 01 2017 21:31:05 +0000
Subject: [PATCH 1/2] Fix alignment of topics in _topic_map.yml


---

diff --git a/_topic_map.yml b/_topic_map.yml
index 7ab6ebd..8eaf900 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -40,8 +40,8 @@ Topics:
   - Name: Changes in Fedora for System Administrators
     Dir: sysadmin
     Topics:
-     - Name: Fedora Modularity
-       File: Modularity
+      - Name: Fedora Modularity
+        File: Modularity
 #     - Name: Kernel
 #       File: Kernel
       - Name: Installation

From bf7b33dd7c4fcb08f569e55d95eb562366044bca Mon Sep 17 00:00:00 2001
From: Simon Clark <simon.richard.clark@gmail.com>
Date: Nov 01 2017 21:37:17 +0000
Subject: [PATCH 2/2] Fix formatting in Modularity.adoc


---

diff --git a/en-US/sysadmin/Modularity.adoc b/en-US/sysadmin/Modularity.adoc
index eb5486f..f18121e 100644
--- a/en-US/sysadmin/Modularity.adoc
+++ b/en-US/sysadmin/Modularity.adoc
@@ -1,7 +1,10 @@
 [[sect-modularity]]
 = Fedora Modularity
+include::en-US/entities.adoc[]
+
 Modularity is the initiative to disconnect the lifecycle of applications from each other and from the lifecycle of the operating system, while still maintaining the ease of use of a typical Linux distribution. This work has produced two changes that have been incorporated into Fedora 27: Host and Platform and Modular Server.
 
+[[sect-modularity-host-platform]]
 == Host and Platform
 The Host and Platform change is an evolution of the Base Runtime module concept that was introduced in the Fedora 26 Boltron Release, splitting the minimal system further into independent modules, which gives greater flexibility when composing and maintaining the base system.
 
@@ -11,6 +14,7 @@ The Host and Platform change is an evolution of the Base Runtime module concept 
 
 The Host and Platform modules are independent, making it possible to run the same Host with different Platforms and vice versa. Each of the two modules has its own life cycle, update cadence and versioning scheme.
 
+[[sect-modularity-modular-server]]
 == Modular Server
 The Modular Server change promotes the work done in the Fedora 26 Boltron Release to the Fedora Server Edition. In Fedora 27, the Fedora Server Edition is created and delivered using the Modularity infrastructure pipeline and the Host and Platform design concept.