Merged with master and resolved a minor merge conflict in languages.rst

2 files changed, 138 insertions, 29 deletions

diff --git a/doc/index.rst b/doc/index.rst
index d89277ec..bfd8eda8 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -5,7 +5,7 @@ This is the home of Pygments.  It is a generic syntax highlighter suitable for
 use in code hosting, forums, wikis or other applications that need to prettify
 source code.  Highlights are:
 
-* a wide range of over 300 languages and other text formats is supported
+* a wide range of over 500 languages and other text formats is supported
 * special attention is paid to details that increase highlighting quality
 * support for new languages and formats are added easily; most languages use a
   simple regex-based lexing mechanism
diff --git a/doc/languages.rst b/doc/languages.rst
index f9efd70f..07c454d3 100644
--- a/doc/languages.rst
+++ b/doc/languages.rst
@@ -10,39 +10,56 @@ Programming languages
 
 * ActionScript
 * Ada
+* Agda (incl. literate)
+* `Alloy <http://alloy.mit.edu>`_
+* `AMPL <http://ampl.com>`_
 * ANTLR
+* APL
 * AppleScript
 * Assembly (various)
 * Asymptote
 * `Augeas <http://augeas.net>`_
+* AutoIt
 * Awk
 * BBC Basic
 * Befunge
+* BlitzBasic
 * `Boa <http://boa.cs.iastate.edu/docs/index.php>`_
 * Boo
+* `Boogie <https://boogie.codeplex.com/>`_
 * BrainFuck
-* C, C++
+* C, C++ (incl. dialects like Arduino)
 * C#
+* `Chapel <http://chapel.cray.com>`_
 * `Charm++ CI <http://charmplusplus.org/>`_
+* Cirru
+* Clay
+* `Clean <https://clean.cs.ru.nl/Clean>`_
 * Clojure
 * CoffeeScript
 * ColdFusion
 * Common Lisp
-* Coq
+* Component Pascal
+* `Coq <https://coq.inria.fr/>`_
+* Croc (MiniD)
 * Cryptol (incl. Literate Cryptol)
-* `Crystal <http://crystal-lang.org>`_
-* `Cython <http://cython.org>`_
-* `D <http://dlang.org>`_
+* `Crystal <https://crystal-lang.org>`_
+* Cypher
+* `Cython <https://cython.org>`_
+* `D <https://dlang.org>`_
 * Dart
 * DCPU-16
 * Delphi
-* Dylan
-* `Elm <http://elm-lang.org/>`_
+* Dylan (incl. console)
+* Eiffel
+* `Elm <https://elm-lang.org/>`_
+* Emacs Lisp
 * Email
-* Erlang
-* `Ezhil <http://ezhillang.org>`_ Ezhil - A Tamil programming language
+* Erlang (incl. shell sessions)
+* `Ezhil <http://ezhillang.org>`_
 * Factor
 * Fancy
+* Fantom
 * `Fennel <https://fennel-lang.org/>`_
 * `FloScript <http://ioflo.com/>`_
 * Fortran
@@ -50,64 +67,112 @@ Programming languages
 * F#
 * GAP
 * Gherkin (Cucumber)
-* GL shaders
+* GLSL shaders
+* `Golo <http://golo-lang.org/>`_
+* Gosu
 * Groovy
 * `Haskell <http://www.haskell.org>`_ (incl. Literate Haskell)
 * HLSL
 * `HSpec <http://hackage.haskell.org/package/hspec>`_
+* Hy
 * IDL
+* Idris (incl. Literate Idris)
+* Igor Pro
 * Io
+* Jags
 * Java
 * JavaScript
-* Lasso
-* LLVM
+* Jasmin
+* Jcl
+* `Julia <https://julialang.org>`_
+* Kotlin
+* Lasso (incl. templating)
+* Limbo
+* LiveScript
 * Logtalk
-* `Lua <http://www.lua.org>`_
+* Logos
+* `Lua <https://lua.org>`_
+* Mathematica
 * Matlab
-* MiniD
 * Modelica
 * Modula-2
+* Monkey
+* `Monte <https://monte.readthedocs.io/>`_
+* MoonScript
 * MuPad
+* NASM
 * Nemerle
+* NesC
+* NewLISP
 * Nimrod
+* `Nit <http://nitlanguage.org>`_
 * Notmuch
+* NuSMV
 * Objective-C
 * Objective-J
 * Octave
 * OCaml
+* Opa
+* OpenCOBOL
+* `ParaSail <http://www.parasail-lang.org>`_
+* Pawn
 * PHP
-* `Perl 5 <http://perl.org>`_ and `Perl 6 <https://perl6.org>`_
+* `Perl 5 <https://perl.org>`_
+* Pike
 * `Pony <https://www.ponylang.io/>`_
 * PovRay
 * PostScript
 * PowerShell
+* `Praat <http://www.praat.org>`_
 * Prolog
-* `Python <http://www.python.org>`_ 2.x and 3.x (incl. console sessions and tracebacks)
+* `Python <https://python.org>`_ 2.x and 3.x (incl. console sessions and
+  tracebacks)
+* QBasic
+* `Racket <http://racket-lang.org/>`_
+* `Raku <https://www.raku.org/>`_ a.k.a. Perl 6
 * `REBOL <http://www.rebol.com>`_
-* `Red <http://www.red-lang.org>`_
+* `Red <https://www.red-lang.org>`_
 * Redcode
-* `Ruby <http://www.ruby-lang.org>`_ (incl. irb sessions)
-* Rust
+* Rexx
+* `Ruby <https://www.ruby-lang.org>`_ (incl. irb sessions)
+* `Rust <https://rust-lang.org>`_
 * S, S-Plus, R
 * Scala
 * `Scdoc <https://git.sr.ht/~sircmpwn/scdoc>`_
 * Scheme
 * Scilab
 * `SGF <https://www.red-bean.com/sgf/>`_
+* Shell scripts (Bash, Tcsh, Fish)
+* `Shen <http://shenlanguage.org/>`_
+* Silver
 * `Slash <https://github.com/arturadib/Slash-A>`_
 * `Slurm <https://slurm.schedmd.com/overview.html>`_
 * Smalltalk
 * SNOBOL
+* `Snowball <http://snowballstem.org/>`_
 * `Solidity <https://solidity.readthedocs.io/>`_
+* SourcePawn
+* `Stan <https://mc-stan.org/>`_
+* Standard ML
+* Stata
+* Swift
+* Swig
+* `SuperCollider <http://supercollider.github.io/>`_
 * Tcl
 * `Tera Term language <https://ttssh2.osdn.jp/>`_
-* `TOML <https://github.com/toml-lang/toml>`_
+* TypeScript
+* TypoScript
 * `USD <https://graphics.pixar.com/usd/docs/index.html>`_
+* Unicon
+* Urbiscript
 * Vala
-* Verilog
+* VBScript
+* Verilog, SystemVerilog
 * VHDL
 * Visual Basic.NET
 * Visual FoxPro
+* `Whiley <http://whiley.org/>`_
+* `Xtend <http://xtend-lang.org/>`_
 * XQuery
 * `Zeek <https://www.zeek.org>`_
 * Zephir
@@ -116,55 +181,99 @@ Programming languages
 Template languages
 ------------------
 
+* Angular templates
 * Cheetah templates
-* `Django <http://www.djangoproject.com>`_ / `Jinja
-  <http://jinja.pocoo.org/jinja>`_ templates
+* ColdFusion
+* `Django <https://www.djangoproject.com>`_ / `Jinja
+  <https://jinja.pocoo.org/jinja>`_ templates
 * ERB (Ruby templating)
-* `Genshi <http://genshi.edgewall.org>`_ (the Trac template language)
+* Evoque
+* `Genshi <https://genshi.edgewall.org>`_ (the Trac template language)
+* Handlebars
 * JSP (Java Server Pages)
+* Liquid
 * `Myghty <http://www.myghty.org>`_ (the HTML::Mason based framework)
-* `Mako <http://www.makotemplates.org>`_ (the Myghty successor)
-* `Smarty <http://www.smarty.net>`_ templates (PHP templating)
+* `Mako <https://www.makotemplates.org>`_ (the Myghty successor)
+* Slim
+* `Smarty <https://www.smarty.net>`_ templates (PHP templating)
 * Tea
+* `Twig <http://twig.sensiolabs.org/>`_
 
 Other markup
 ------------
 
 * Apache config files
-* Bash shell scripts
+* Apache Pig
 * BBCode
+* CapDL
+* `Cap'n Proto <https://capnproto.com>`_
 * CMake
+* `Csound <https://csound.com>`_ scores
 * CSS
 * Debian control files
 * Diff files
+* Dockerfiles
 * DTD
+* EBNF
+* E-mail headers
+* Extempore
+* Flatline
 * Gettext catalogs
 * Gnuplot script
 * Groff markup
+* Hexdumps
 * HTML
 * HTTP sessions
+* IDL
+* Inform
 * INI-style config files
 * IRC logs (irssi style)
+* Isabelle
+* JSGF notation
+* JSON, JSON-LD
+* Lean theorem prover
 * Lighttpd config files
+* LLVM assembly
+* LSL scripts
 * Makefiles
 * MoinMoin/Trac Wiki markup
+* MQL
 * MySQL
+* NCAR command language
 * Nginx config files
+* `Nix language <http://nixos.org/nix/>`_
+* NSIS scripts
+* Notmuch
 * POV-Ray scenes
+* `Puppet <http://puppetlabs.com/>`_
+* QML
 * Ragel
 * Redcode
 * ReST
+* `Roboconf <http://roboconf.net/en/roboconf.html>`_
 * Robot Framework
 * RPM spec files
+* Rql
+* RSL
+* Scdoc
+* SPARQL
 * SQL, also MySQL, SQLite
 * Squid configuration
+* TADS 3
+* Terraform
 * TeX
-* tcsh
+* `Thrift <https://thrift.apache.org/>`_
+* `TOML <https://github.com/toml-lang/toml>`_
+* Treetop grammars
+* Varnish configs
+* VGL
 * Vim Script
+* WDiff
 * Windows batch files
 * XML
 * XSLT
 * YAML
+* Windows Registry files
 
 ... that's all?
 ---------------