summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMiikka Salminen <miikka.salminen@gmail.com>2016-02-03 21:28:17 +0200
committerMiikka Salminen <miikka.salminen@gmail.com>2016-02-03 21:28:17 +0200
commit3dfdf1ec1a679fa7ad2749ca85f0e2c3f23f8460 (patch)
tree48ecccd46e14a384c81265c30de53d0c02ed1caa /doc
parenta109fab994438a6323df468f1e16c5a1387008fc (diff)
downloadpygments-3dfdf1ec1a679fa7ad2749ca85f0e2c3f23f8460.tar.gz
Adds an entry to changelog. Adds magic method and variable lexing for PHP along with corresponding changes in a test file.
Diffstat (limited to 'doc')
-rw-r--r--doc/docs/tokens.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/docs/tokens.rst b/doc/docs/tokens.rst
index f9ed3d92..96a6d003 100644
--- a/doc/docs/tokens.rst
+++ b/doc/docs/tokens.rst
@@ -175,8 +175,8 @@ Name Tokens
Token type for function names.
`Name.Function.Magic`
- same as `Name.Function` but for function names that have an implicit use in
- a language (e.g. ``__init__`` method in Python).
+ same as `Name.Function` but for special function names that have an implicit use
+ in a language (e.g. ``__init__`` method in Python).
`Name.Label`
Token type for label names (e.g. in languages that support ``goto``).
@@ -206,8 +206,8 @@ Name Tokens
same as `Name.Variable` but for instance variables.
`Name.Variable.Magic`
- same as `Name.Variable` but for variable names that have an implicit use in
- a language (e.g. ``__doc__`` in Python).
+ same as `Name.Variable` but for special variable names that have an implicit use
+ in a language (e.g. ``__doc__`` in Python).
Literals