Merge branch 'master' of https://github.com/explosion/spaCy

CONTRIBUTORS.md

@@ -58,3 +58,4 @@ This is a list of everyone who has made significant contributions to spaCy, in a
 * Yanhao Yang, [@YanhaoYang](https://github.com/YanhaoYang)
 * Yasuaki Uechi, [@uetchy](https://github.com/uetchy)
 * Yubing Dong, [@tomtung](https://github.com/tomtung)
+* Yuval Pinter, [@yuvalpinter](https://github.com/yuvalpinter)

website/docs/api/annotation.jade

@@ -38,6 +38,11 @@ p
 
 +h(2, "pos-tagging") Part-of-speech Tagging
 
++infobox("Tip: Understanding tags")
+    |  In spaCy v1.8.3+, you can also use #[code spacy.explain()] to get the
+    |  description for the string representation of a tag. For example,
+    |  #[code spacy.explain("RB")] will return "adverb".
+
 include _annotation/_pos-tags
 
 +h(2, "lemmatization") Lemmatization
@@ -65,10 +70,20 @@ p
 
 +h(2, "dependency-parsing") Syntactic Dependency Parsing
 
++infobox("Tip: Understanding labels")
+    |  In spaCy v1.8.3+, you can also use #[code spacy.explain()] to get the
+    |  description for the string representation of a label. For example,
+    |  #[code spacy.explain("prt")] will return "particle".
+
 include _annotation/_dep-labels
 
 +h(2, "named-entities") Named Entity Recognition
 
++infobox("Tip: Understanding entity types")
+    |  In spaCy v1.8.3+, you can also use #[code spacy.explain()] to get the
+    |  description for the string representation of an entity label. For example,
+    |  #[code spacy.explain("LANGUAGE")] will return "any named language".
+
 include _annotation/_named-entities
 
 +h(2, "json-input") JSON input format for training

website/docs/usage/models.jade

@@ -67,7 +67,7 @@ p
     python -m spacy download en_core_web_md
 
     # download exact model version (doesn't create shortcut link)
-    python -m spacy download en_core_web_md-1.2.0 --direct
+    python -m spacy download en_core_web_md-1.2.1 --direct
 
 p
     |  The download command will #[+a("#download-pip") install the model] via
@@ -96,10 +96,10 @@ p
 
 +code(false, "bash").
     # with external URL
-    pip install #{gh("spacy-models")}/releases/download/en_core_web_md-1.2.0/en_core_web_md-1.2.0.tar.gz
+    pip install #{gh("spacy-models")}/releases/download/en_core_web_md-1.2.1/en_core_web_md-1.2.1.tar.gz
 
     # with local file
-    pip install /Users/you/en_core_web_md-1.2.0.tar.gz
+    pip install /Users/you/en_core_web_md-1.2.1.tar.gz
 
 p
     |  By default, this will install the model into your #[code site-packages]