Merge branch '2.x' into 3.x

* 2.x:
  Reorganize some information
  Add `Twig Language Server` and `Modern Twig` extension to docs

Author: fabpot

Diff for: doc/templates.rst

@@ -59,10 +59,15 @@ Many IDEs support syntax highlighting and auto-completion for Twig:
 * *Notepad++* via the `Notepad++ Twig Highlighter`_
 * *Emacs* via `web-mode.el`_
 * *Atom* via the `PHP-twig for atom`_
-* *Visual Studio Code* via the `Twig pack`_
+* *Visual Studio Code* via the `Twig pack`_ or `Modern Twig`_
 
-Also, `TwigFiddle`_ is an online service that allows you to execute Twig templates
-from a browser; it supports all versions of Twig.
+You might also be interested in:
+
+* `TwigFiddle`_: an online service that allows you to execute Twig templates
+  from a browser; it supports all versions of Twig
+
+* `Twig Language Server`_: provides some language features like syntax
+  highlighting, diagnostics, auto complete, ...
 
 Variables
 ---------
@@ -884,3 +889,5 @@ Twig can be extended. If you want to create your own extensions, read the
 .. _`PHP-twig for atom`:          https://github.com/reesef/php-twig
 .. _`TwigFiddle`:                 https://twigfiddle.com/
 .. _`Twig pack`:                  https://marketplace.visualstudio.com/items?itemName=bajdzis.vscode-twig-pack
+.. _`Modern Twig`:                https://marketplace.visualstudio.com/items?itemName=Stanislav.vscode-twig
+.. _`Twig Language Server`:       https://github.com/kaermorchen/twig-language-server/tree/master/packages/language-server