From ed206a9b99cb528931fa23b6127fcb1cab246eb1 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 27 Jan 2018 09:40:55 -0500 Subject: [PATCH] [2.0.x] Fixed #29055 -- Doc'd that escapejs doesn't make template literals safe. Backport of f229049d6cd186025f4033dc47608b0c9731e882 from master --- docs/ref/templates/builtins.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 49e07aeec2..f029cf8f61 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1640,8 +1640,8 @@ For example, you can apply ``escape`` to fields when :ttag:`autoescape` is off:: ------------ Escapes characters for use in JavaScript strings. This does *not* make the -string safe for use in HTML, but does protect you from syntax errors when using -templates to generate JavaScript/JSON. +string safe for use in HTML or JavaScript template literals, but does protect +you from syntax errors when using templates to generate JavaScript/JSON. For example::