From f859cf0fe8af648b5fdb5657806fad377103474a Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@batsov.com>
Date: Wed, 16 Jan 2019 15:16:17 +0200
Subject: [PATCH] Fix a bad merge

---
 doc/configuration.md |  8 +++++---
 doc/usage.md         | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/doc/configuration.md b/doc/configuration.md
index c0f23a3..d9f0346 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -27,8 +27,10 @@ Or you can use another theme altogether by adding something in `personal/preload
 (setq prelude-theme 'tango)
 ```
 
-**Note** To use a non-built-in theme, like [Solarized](https://github.com/bbatsov/zenburn-emacs),
-you'll have to install it from MELPA first by `M-x package-install RET solarized-theme`. Then add
+!!! Note
+
+    To use a non-built-in theme, like [Solarized](https://github.com/bbatsov/solarized-emacs),
+    you'll have to install it from MELPA first by `M-x package-install RET solarized-theme`. Then add
 
 ``` lisp
 (setq prelude-theme 'solarized-dark)
@@ -51,7 +53,7 @@ lexicographical order.  The overall loading precedence is:
 
 1.  `personal/preload/*`
 2.  `core/`
-3.  `prelude-modules.el`
+3.  `personal/prelude-modules.el` (or deprecated `prelude-modules.el`)
 4.  `personal/*`
 
 #### Personalization Example
diff --git a/doc/usage.md b/doc/usage.md
index dd01af0..f4b19fe 100644
--- a/doc/usage.md
+++ b/doc/usage.md
@@ -140,10 +140,18 @@ If you want to swap them add this to your personal config:
 
 You can also temporarily swap them with `C-c w` (`M-x prelude-swap-meta-and-super`).
 
-**Note**: I'd highly recommend to all macOS users to consider
-[remapping Return to
-Control](http://emacsredux.com/blog/2013/11/12/a-crazy-productivity-boost-remap-return-to-control/)
-instead. That's an epic productivity boost and it's not as crazy as it sounds!
+!!! Tip
+
+    [The Emacs Mac port](https://bitbucket.org/mituharu/emacs-mac.git) comes
+    with `Command`
+    [set](https://bitbucket.org/mituharu/emacs-mac/src/7fdbfba85d543f01b81e997e2b03788c35cb3bfa/src/macterm.c?at=master&fileviewer=file-view-default#macterm.c-6147:6169)
+    to `Meta`.
+
+!!! Tip
+
+    I'd highly recommend to all macOS users to consider
+    [remapping Return to Control](http://emacsredux.com/blog/2013/11/12/a-crazy-productivity-boost-remap-return-to-control/)
+    instead. That's an epic productivity boost and it's not as crazy as it sounds!
 
 #### Projectile