Merge branch 'master' into patch-1

[etc/vim.git] / README.md

diff --git a/README.md b/README.md
index 8318f7d85ae93450dfc544721830d0e4a1725ae8..c626e0a7eab3cbb969f461e01d6c242af78e521c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -81,6 +81,12 @@ let g:vim_markdown_folding_style_pythonic = 1
 Level 1 heading which is served as a document title is not folded.
 `g:vim_markdown_folding_level` setting is not active with this fold style.
 
 Level 1 heading which is served as a document title is not folded.
 `g:vim_markdown_folding_level` setting is not active with this fold style.
 

+To prevent foldtext from being set add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_override_foldtext = 0
+```
+

 ### Set header folding level
 
 Folding level is a number between 1 and 6. By default, if not specified, it is set to 1.
 ### Set header folding level
 
 Folding level is a number between 1 and 6. By default, if not specified, it is set to 1.


@@ -128,6 +134,9 @@ let g:vim_markdown_emphasis_multiline = 0
 Concealing is set for some syntax.
 
 For example, conceal `[link text](link url)` as just `link text`.
 Concealing is set for some syntax.
 
 For example, conceal `[link text](link url)` as just `link text`.

+Also, `_italic_` and `*italic*` will conceal to just _italic_.
+Similarly `__bold__`, `**bold**`, `___italic bold___`, and `***italic bold***`
+will conceal to just __bold__, **bold**, ___italic bold___, and ***italic bold*** respectively.

 
 To enable conceal use Vim's standard conceal configuration.
 
 
 To enable conceal use Vim's standard conceal configuration.