From 68e3d42f9dfc4cf0ae2227e9f2006da5d9c7c922 Mon Sep 17 00:00:00 2001 From: Christopher Corley Date: Sat, 4 Jul 2015 07:46:15 -0400 Subject: [PATCH] Fixes links to other documents (.md => .org) --- README.md | 9 +++++---- core/core-fonts-support.el | 2 +- doc/VIMUSERS.org | 14 +++++++------- private/README.md | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index cdef16124..823e9f8ca 100644 --- a/README.md +++ b/README.md @@ -438,7 +438,7 @@ We especially need to create more configuration layers that, for instance, bring support for new languages. If you are ready to contribute please begin by consulting the -[contribution guidelines][CONTRIBUTE.org] and [conventions][CONVENTIONS.md], +[contribution guidelines][CONTRIBUTE.org] and [conventions][CONVENTIONS.org], thanks! # License @@ -519,8 +519,11 @@ the [emacs-mac-port][] build. See the [install OSX section][] for more details. [Twitter]: http://i.imgur.com/tXSoThF.png +[CONTRIBUTE.org]: doc/CONTRIBUTE.org [CONVENTIONS.org]: doc/CONVENTIONS.org +[DOCUMENTATION.org]: doc/DOCUMENTATION.org [HOWTOs.org]: doc/HOWTOs.org +[VIMUSERS.org]: doc/VIMUSERS.org [config]: doc/DOCUMENTATION.org#configuration-layers [dotfile]: doc/DOCUMENTATION.org#dotfile-configuration [manage_config]: doc/DOCUMENTATION.org#managing-private-configuration-layers @@ -534,9 +537,7 @@ details. [Evil Mode]: doc/DOCUMENTATION.org#evil [private]: ./private [layers]: ./contrib -[DOCUMENTATION.org]: doc/DOCUMENTATION.org [font section]: doc/DOCUMENTATION.org#font -[CONTRIBUTE.org]: doc/CONTRIBUTE.org [powerline-seps]: doc/DOCUMENTATION.org#powerline-separators [FAQ]: https://github.com/syl20bnr/spacemacs#faq [dotfile template]: ./core/templates/.spacemacs.template @@ -559,4 +560,4 @@ details. [Spacemacs logo]: https://github.com/nashamri/spacemacs-logo [Nasser Alshammari]: https://github.com/nashamri [cpaulik-unity-icon]: http://splendidabacus.com/posts/2015/03/spacemacs-unity-icon/ -[Windows Image Support]: http://stackoverflow.com/questions/2650041/emacs-under-windows-and-png-files \ No newline at end of file +[Windows Image Support]: http://stackoverflow.com/questions/2650041/emacs-under-windows-and-png-files diff --git a/core/core-fonts-support.el b/core/core-fonts-support.el index 9ad196bc0..a987a31d1 100644 --- a/core/core-fonts-support.el +++ b/core/core-fonts-support.el @@ -82,7 +82,7 @@ PLIST has the form (\"fontname\" :prop1 val1 :prop2 val2 ...)" (spacemacs-buffer/warning (concat "spacemacs/set-font is deprecated. " "Use the variable `dotspacemacs-default-font' " "instead (see Font section in " - "~/.emacs.d/doc/DOCUMENTATION.md for more " + "~/.emacs.d/doc/DOCUMENTATION.org for more " "info)."))) (provide 'core-fonts-support) diff --git a/doc/VIMUSERS.org b/doc/VIMUSERS.org index cc5544496..7e82e10ae 100644 --- a/doc/VIMUSERS.org +++ b/doc/VIMUSERS.org @@ -39,7 +39,7 @@ the gap between vim and Spacemacs. While some information may be duplicated, this does not replace the Spacemacs documentation. It is recommended that you read both files to fully understand Spacemacs. -[[file:DOCUMENTATION.md][Spacemacs Documentation]] +[[file:DOCUMENTATION.org][Spacemacs Documentation]] * Philosophy One misconception many vim users have is that Spacemacs is an Emacs /clone/ of @@ -57,7 +57,7 @@ for new users. This section attempts to clear up any confusion. **** Modes vs. States In vim you have various editing modes like =insert mode= and =visual mode= to -manipulate text. In Emacs, we have [[./DOCUMENTATION.md#states][states]]. These are equivalent to vim modes. +manipulate text. In Emacs, we have [[./DOCUMENTATION.org#states][states]]. These are equivalent to vim modes. For example, =evil-insert-state= is the same as =insert-mode= in vim. A =minor-mode= in Emacs is like a feature that is activated. For example, @@ -76,8 +76,8 @@ several packages that integrate well with each other. For example, the =python= layer includes support for auto-completion, documentation look-up, tests, and much more by using several different packages. This keeps you from thinking about what packages to install, and instead worry about what features you want. -More information on layers in the [[./VIMUSERS.md#customization][customization]] section and in the -[[./DOCUMENTATION.md#configuration-layers][documentation]]. +More information on layers in the [[./VIMUSERS.org#customization][customization]] section and in the +[[./DOCUMENTATION.org#configuration-layers][documentation]]. **** Micro-states Spacemacs provides a special functionality called micro-states. Micro-states @@ -96,7 +96,7 @@ Spacemacs uses ~SPC~ as its ~~ key. This document will use ~SPC~ to refe the ~~ key. All keybindings are mnemonic and are organized under the ~~ key. For example, the keybindings for language-specific commands are always under the ~SPC m~ prefix. A full list of conventions used in Spacemacs is -[[./CONVENTIONS.md][here]]. Note that all keybindings can be changed. +[[./CONVENTIONS.org][here]]. Note that all keybindings can be changed. Spacemacs uses [[https://github.com/kai2nenobu/guide-key][guide-key]] to show available keybindings after a delay: @@ -132,7 +132,7 @@ are located under the ~SPC b~ prefix. By default Emacs creates a lot of buffers that most people will never need, like =*Messages*=. Spacemacs automatically ignores these when using these keybindings. More information can be found -[[./DOCUMENTATION.md#special-buffers][here]]. +[[./DOCUMENTATION.org#special-buffers][here]]. **** Windows Windows are like splits in vim. They are useful for editing multiple files at @@ -476,7 +476,7 @@ wrapped. If you want ~j~ and ~k~ to behave like ~g j~ and ~g k~, add this to you * Other useful links - [[https://www.gnu.org/software/emacs/manual/emacs.html][Emacs Manual]] -- [[file:DOCUMENTATION.md][Spacemacs Documentation]] +- [[file:DOCUMENTATION.org][Spacemacs Documentation]] - [[http://ian.mccowan.space/2015/04/07/Spacemacs/][Spacemacs: A Vimmer's Emacs Prerequisites]] - Note: The article refers to ~SPC b s~ as the keybinding to switch buffers. It is ~SPC b b~ diff --git a/private/README.md b/private/README.md index 385cef701..c755c1e50 100644 --- a/private/README.md +++ b/private/README.md @@ -18,4 +18,4 @@ Each created file has further guidance written in them. Once the configuration is done, restart Emacs to load, install and configure your layer. -[conf_layers]: https://github.com/syl20bnr/spacemacs/blob/master/doc/DOCUMENTATION.md#extensions-and-packages +[conf_layers]: https://github.com/syl20bnr/spacemacs/blob/master/doc/DOCUMENTATION.org#extensions-and-packages