Merge remote-tracking branch 'upstream/master' into dev

This commit is contained in:
Alexey Radkov 2014-05-04 15:23:45 +04:00
commit 0559bf8aed

View File

@ -80,10 +80,10 @@ Lists:
- bullet list item 8 - bullet list item 8
- bullet list item 9 - bullet list item 9
# numbered list item 1 1. numbered list item 1
# numbered list item 2 2. numbered list item 2
# numbered list item 3 a) numbered list item 3
# numbered list item 4 b) numbered list item 4
= Header1 = = Header1 =
== Header2 == == Header2 ==
@ -119,11 +119,11 @@ Commands
Install details Install details
============================================================================== ==============================================================================
Using pathogen (http://www.vim.org/scripts/script.php?script_id=2332) Using pathogen (http://www.vim.org/scripts/script.php?script_id=2332 )
cd ~/.vim cd ~/.vim
mkdir bundle mkdir bundle
cd bundle cd bundle
git clone git://github.com/vim-scripts/vimwiki.git git clone git://github.com/vim-scripts/vimwiki.git
Then launch vim and run `:help vimwiki` to verify it was installed. Then launch vim, run `:Helptags` and then `:help vimwiki` to verify it was installed.