From c4ef58837a6a38e94f802c8a3fcac94cbf17f5a3 Mon Sep 17 00:00:00 2001
From: Otto Urpelainen <oturpe@iki.fi>
Date: Dec 03 2021 22:40:09 +0000
Subject: Fix some formatting


Certain paths were not monospace formatted.
Formatting of UsrMove merged paths table was somehow corrupted,
replaced with a working AsciiDoc table definition.

---

diff --git a/guidelines/modules/ROOT/pages/index.adoc b/guidelines/modules/ROOT/pages/index.adoc
index a20cd02..44bd669 100644
--- a/guidelines/modules/ROOT/pages/index.adoc
+++ b/guidelines/modules/ROOT/pages/index.adoc
@@ -639,23 +639,28 @@ to be used for this purpose, this exception will be removed.
 === Effect of the UsrMove Fedora Feature
 
 Fedora has merged several directories in `+/+`
-with their counterparts in `+/usr/+`.
+with their counterparts in `+/usr/+`:
 
-/bin
+[cols=",,"]
+|===
+|Path|Merged with|RPM Macro
 
-/usr/bin aka %\{_bindir}
+|`+/bin+`
+|`+/usr/bin+`
+|`+{_bindir}+`
 
-/sbin
+|`+/sbin+`
+|`+/usr/sbin+`
+|`+%{_sbindir}+`
 
-/usr/sbin aka %\{_sbindir}
+|`+/lib64+` or `+/lib+`
+|`+/usr/lib64+` or `+/usr/lib+`
+|`+%{_libdir}+`
 
-/lib64 or /lib
-
-/usr/lib64 or /usr/lib aka %\{_libdir}
-
-/lib
-
-/usr/lib aka %\{_prefix}/lib
+|`+/lib+`
+|`+/usr/lib+`
+|`+%{_prefix}/lib+`
+|===
 
 For example, end users will find that `+/bin/sh+`
 is the same file as `+/usr/bin/sh+`.
@@ -825,9 +830,9 @@ instead of packages.
 Packages SHOULD NOT include file dependencies
 outside of the following directories:
 
-* /usr/bin
-* /usr/sbin
-* /etc
+* `+/usr/bin+`
+* `+/usr/sbin+`
+* `+/etc+`
 
 Please also note that it is not uncommon
 for multiple packages to provide the same directory.