incubator-airflow git commit: [AIRFLOW-1505] Document when Jinja substitution occurs

[cr...@apache.org]

Repository: incubator-airflow
Updated Branches:
  refs/heads/master 1cd6c4b0e -> 984a87c0c


[AIRFLOW-1505] Document when Jinja substitution occurs

Closes #2523 from TrevorEdwards/airflow-1505


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/984a87c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/984a87c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/984a87c0

Branch: refs/heads/master
Commit: 984a87c0cb685ea4dfa765cc4f4a23c9058b3965
Parents: 1cd6c4b
Author: Trevor Edwards <tr...@google.com>
Authored: Tue Aug 15 10:35:46 2017 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Tue Aug 15 10:35:46 2017 -0700

----------------------------------------------------------------------
 docs/concepts.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/984a87c0/docs/concepts.rst
----------------------------------------------------------------------
diff --git a/docs/concepts.rst b/docs/concepts.rst
index 33a6ea4..56a9bdb 100644
--- a/docs/concepts.rst
+++ b/docs/concepts.rst
@@ -782,7 +782,8 @@ Here, ``{{ ds }}`` is a macro, and because the ``env`` parameter of the
 as an environment variable named ``EXECUTION_DATE`` in your Bash script.
 
 You can use Jinja templating with every parameter that is marked as "templated"
-in the documentation.
+in the documentation. Template substitution occurs just before the pre_execute
+function of your operator is called.
 
 Packaged dags
 '''''''''''''