Start graph lexers file instead of just cypher

2 files changed, 11 insertions, 14 deletions

diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
index ac691ea8..c805708f 100644
--- a/pygments/lexers/_mapping.py
+++ b/pygments/lexers/_mapping.py
@@ -88,7 +88,7 @@ LEXERS = {
     'CssPhpLexer': ('pygments.lexers.templates', 'CSS+PHP', ('css+php',), (), ('text/css+php',)),
     'CssSmartyLexer': ('pygments.lexers.templates', 'CSS+Smarty', ('css+smarty',), (), ('text/css+smarty',)),
     'CudaLexer': ('pygments.lexers.compiled', 'CUDA', ('cuda', 'cu'), ('*.cu', '*.cuh'), ('text/x-cuda',)),
-    'CypherLexer': ('pygments.lexers.cypher', 'Cypher', ('cyp','cypher'), ('*.cyp', '*.cypher'),('text/application-cypher',)),
+    'CypherLexer': ('pygments.lexers.graph', 'Cypher', ('cypher',), ('*.cyp', '*.cypher'), ()),
     'CythonLexer': ('pygments.lexers.compiled', 'Cython', ('cython', 'pyx', 'pyrex'), ('*.pyx', '*.pxd', '*.pxi'), ('text/x-cython', 'application/x-cython')),
     'DLexer': ('pygments.lexers.compiled', 'D', ('d',), ('*.d', '*.di'), ('text/x-dsrc',)),
     'DObjdumpLexer': ('pygments.lexers.asm', 'd-objdump', ('d-objdump',), ('*.d-objdump',), ('text/x-d-objdump',)),
@@ -99,7 +99,7 @@ LEXERS = {
     'DgLexer': ('pygments.lexers.agile', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
     'DiffLexer': ('pygments.lexers.text', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
     'DjangoLexer': ('pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
-    'DockerLexer': ('pygments.lexers.text', 'Docker', ('docker', 'dockerfile'), ('Dockerfile',), ('text/x-dockerfile-config',)),
+    'DockerLexer': ('pygments.lexers.text', 'Docker', ('docker', 'dockerfile'), ('Dockerfile', '*.docker'), ('text/x-dockerfile-config',)),
     'DtdLexer': ('pygments.lexers.web', 'DTD', ('dtd',), ('*.dtd',), ('application/xml-dtd',)),
     'DuelLexer': ('pygments.lexers.web', 'Duel', ('duel', 'jbst', 'jsonml+bst'), ('*.duel', '*.jbst'), ('text/x-duel', 'text/x-jbst')),
     'DylanConsoleLexer': ('pygments.lexers.compiled', 'Dylan session', ('dylan-console', 'dylan-repl'), ('*.dylan-console',), ('text/x-dylan-console',)),
diff --git a/pygments/lexers/cypher.py b/pygments/lexers/graph.py
index fb3f4319..1abaf6d3 100644
--- a/pygments/lexers/cypher.py
+++ b/pygments/lexers/graph.py
@@ -1,17 +1,11 @@
 # -*- coding: utf-8 -*-
 """
-    pygments.lexers.cypher
-    ~~~~~~~~~~~~~~~~~~~~~~
+    pygments.lexers.graph
+    ~~~~~~~~~~~~~~~~~~~~~
 
-    A Lexer for the cypher graph query language use in the neo4j graph database.
+    Lexers for graph query languages.
 
-    `CypherLexer`
-
-    the ``tests/examplefiles`` contains file "test.cyp" which has valid
-    cypher queries that execute against the example database shipped with Neo4J
-
-
-    :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -27,9 +21,12 @@ __all__ = ['CypherLexer']
 
 class CypherLexer(RegexLexer):
     """
-    For Cypher Query Language
-    http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html
+    For `Cypher Query Language
+    <http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html>`_
+
     For the Cypher version in Neo4J 2.0
+
+    .. versionadded:: 2.0
     """
     name = 'Cypher'
     aliases = ['cypher']