summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Nesbitt <bryce2@obviously.com>2014-06-02 13:19:12 -0700
committerTim Graham <timograham@gmail.com>2014-06-02 18:53:00 -0400
commit9334150ca4d60026be4e36e3599bb1e23ccbae7b (patch)
treee397f706e740e9f04363976a0dc5b1191bdce1bd
parent3a736c1836f65649f931c1a72e2d7bb33e52b361 (diff)
[1.6.x] Fixed #22753 -- Documented ability to use a note with the {% comment %} tag.
Backport of e020894470 from master
-rw-r--r--docs/ref/templates/builtins.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 6d6c159fe3..c632ad38c1 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -52,11 +52,13 @@ comment
^^^^^^^
Ignores everything between ``{% comment %}`` and ``{% endcomment %}``.
+An optional note may be inserted in the first tag. For example, this is
+useful when commenting out code for documenting why the code was disabled.
Sample usage::
<p>Rendered text with {{ pub_date|date:"c" }}</p>
- {% comment %}
+ {% comment "Optional note" %}
<p>Commented out text with {{ create_date|date:"c" }}</p>
{% endcomment %}