From bef8d26688fd1dfcd0b99e5d7d43b01f58deb9be Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Fri, 4 Dec 2015 00:04:46 -0500
Subject: [PATCH] Fixes typos

---
 doc/FAQ.org           | 14 +++++++-------
 layers/org/README.org | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/FAQ.org b/doc/FAQ.org
index ed14b0ff4..93ed8350f 100644
--- a/doc/FAQ.org
+++ b/doc/FAQ.org
@@ -87,15 +87,15 @@ in =user-init=, and any variable that Spacemacs explicitly sets but you wish to
 Anything that isn't just setting a variable should 99% be in =user-config=.
 
 ** Why do some of my =org=-related settings cause problems?
-Since version 0.104, spacemacs uses the `org` version from the org ELPA
-repository instead of the one shipped with emacs. Then, any `org` related code
-should not be loaded before `dotspacemacs/user-config`, otherwise both versions
+Since version 0.104, spacemacs uses the =org= version from the org ELPA
+repository instead of the one shipped with emacs. Then, any =org= related code
+should not be loaded before =dotspacemacs/user-config=, otherwise both versions
 will be loaded and will conflict.
 
-Because of autoloading, calling to `org` function will trigger the loading up
-of the `org` shipped with emacs wich will induce conflicts.
-One way to do your `org` config is to wrap you config code in a
-`with-eval-after-load` block.
+Because of autoloading, calling to =org= functions will trigger the loading up
+of the =org= shipped with emacs wich will induce conflicts.
+One way to avoid conflict is to wrap your =org= config code in a
+=with-eval-after-load= block like this:
 
 #+BEGIN_SRC emacs-lisp
   (with-eval-after-load 'org
diff --git a/layers/org/README.org b/layers/org/README.org
index 9d4c4bfda..fbe1fc93d 100644
--- a/layers/org/README.org
+++ b/layers/org/README.org
@@ -6,7 +6,7 @@
 * Table of Contents                                         :TOC_4_org:noexport:
  - [[Description][Description]]
    - [[Features:][Features:]]
-   - [[Note][Note]]
+   - [[Important Note][Important Note]]
  - [[Install][Install]]
    - [[Layer][Layer]]
    - [[Github support][Github support]]
@@ -37,22 +37,22 @@ This layer enables  [[http://orgmode.org/][org mode]] for Spacemacs.
 - TODO capture via [[https://github.com/waymondo/org-repo-todo][org-repo-todo]]
 - presentation mode via [[https://github.com/rlister/org-present][org-present]]
 - 
-** Note
+** Important Note
 Since version 0.104, spacemacs uses the =org= version from the org ELPA
 repository instead of the one shipped with emacs. Then, any =org= related code
 should not be loaded before =dotspacemacs/user-config=, otherwise both versions
 will be loaded and will conflict.
-Org layer checks if this has occurred and signals an error if org features have
-been instantiated prior to org layer loading.
 
-One way to do your =org= config is to wrap you config code in a 
-=with-eval-after-load= block.
+Because of autoloading, calling to =org= functions will trigger the loading up
+of the =org= shipped with emacs wich will induce conflicts.
+One way to avoid conflict is to wrap your =org= config code in a
+=with-eval-after-load= block like this:
 
 #+BEGIN_SRC emacs-lisp
   (with-eval-after-load 'org
     ;; here goes your Org config :)
     ;; ....
-    )    
+    )
 #+END_SRC
 
 * Install