Merge branch 'dev' of git://github.com/vimwiki/vimwiki into sstallion/autogenerate-tags

doc/vimwiki.txt

@@ -878,6 +878,8 @@ is decorated: >
 
   *bold text*
   _italic text_
+  _*bold italic text*_
+  *_bold italic text _*
   ~~strikeout text~~
   `code (no syntax) text`
   super^script^
@@ -2909,6 +2911,26 @@ URLs and hides markers and URL for links that have a description.
 Default: 2
 
 
+------------------------------------------------------------------------------
+*g:vimwiki_conceal_pre*
+
+Conceal preformatted text markers. For example,
+>
+    {{{python
+    def say_hello():
+        print("Hello, world!")
+    }}}
+>
+would appear as simply
+>
+    def say_hello():
+        print("Hello, world!")
+>
+in your wiki file.
+
+Default: 0
+
+
 ------------------------------------------------------------------------------
 *g:vimwiki_autowriteall*
 
@@ -2994,6 +3016,21 @@ are from 1 to 6.
 The default is 1.
 
 
+------------------------------------------------------------------------------
+*g:vimwiki_toc_link_format*
+
+The format of the links in the Table of Contents (see |vimwiki-toc|).
+
+
+Value           Description~
+0               Extended: The link contains the description and URL. URL
+                references all levels.
+1               Brief: The link contains only the URL. URL references only
+                the immediate level.
+
+Default: 0
+
+
 ------------------------------------------------------------------------------
 *g:vimwiki_map_prefix*