Merge branch '1.x' into 2.x

* 1.x:
  removed wrong link in docs
  fixed doc markup

Author: fabpot

doc/templates.rst

@@ -805,7 +805,7 @@ The following operators don't fit into any of the other categories:
       {# returns the value of foo if it is defined and not null, 'no' otherwise #}
       {{ foo ?? 'no' }}
 
-.. _templates-string-interpolation
+.. _templates-string-interpolation:
 
 String Interpolation
 ~~~~~~~~~~~~~~~~~~~~