Mask: attribution, changelog, mapfile, versionadded.

4 files changed, 6 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index 2d7572cb..a9a8a2d4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -70,6 +70,7 @@ Other contributors, listed alphabetically, are:
 * Brian R. Jackson -- Tea lexer
 * Christian Jann -- ShellSession lexer
 * Dennis Kaarsemaker -- sources.list lexer
+* Alexander Kit -- MaskJS lexer
 * Igor Kalnitsky -- vhdl lexer
 * Pekka Klärck -- Robot Framework lexer
 * Eric Knibbe -- Lasso lexer
diff --git a/CHANGES b/CHANGES
index 1cb19c6a..9b6fecf6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,7 @@ Version 2.0
   * ColdFusion CFC (PR#283)
   * Idris (PR#210)
   * Intel objdump (PR#279)
+  * MaskJS (PR#280)
 
 - New styles: "xcode" and "igor", similar to the default highlighting of
   the respective IDEs.
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index fd455f99..0cd981f3 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -189,7 +189,7 @@ LEXERS = {
     'MakoLexer': ('pygments.lexers.templates', 'Mako', ('mako',), ('*.mao',), ('application/x-mako',)),
     'MakoXmlLexer': ('pygments.lexers.templates', 'XML+Mako', ('xml+mako',), (), ('application/xml+mako',)),
     'MaqlLexer': ('pygments.lexers.other', 'MAQL', ('maql',), ('*.maql',), ('text/x-gooddata-maql', 'application/x-gooddata-maql')),
-    'MaskLexer': ('pygments.lexers.web', 'Mask', ('mask',), ('*.mask',), ('text/x-mask')),
+    'MaskLexer': ('pygments.lexers.web', 'Mask', ('mask',), ('*.mask',), ('text/x-mask',)),
     'MasonLexer': ('pygments.lexers.templates', 'Mason', ('mason',), ('*.m', '*.mhtml', '*.mc', '*.mi', 'autohandler', 'dhandler'), ('application/x-mason',)),
     'MathematicaLexer': ('pygments.lexers.math', 'Mathematica', ('mathematica', 'mma', 'nb'), ('*.nb', '*.cdf', '*.nbp', '*.ma'), ('application/mathematica', 'application/vnd.wolfram.mathematica', 'application/vnd.wolfram.mathematica.package', 'application/vnd.wolfram.cdf')),
     'MatlabLexer': ('pygments.lexers.math', 'Matlab', ('matlab',), ('*.m',), ('text/matlab',)),
diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py
index e85946bb..c975ad80 100644
--- a/pygments/lexers/web.py
+++ b/pygments/lexers/web.py
@@ -4227,7 +4227,9 @@ class CirruLexer(RegexLexer):
 
 class MaskLexer(RegexLexer):
     """
-    For Mask markup
+    For `Mask <http://github.com/atmajs/MaskJS>`__ markup.
+
+    .. versionadded:: 2.0
     """
     name = 'Mask'
     aliases = ['mask']