diff --git a/doc/source/index.rst b/doc/source/index.rst
index 5e043d6f0..2a0ec6453 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -41,7 +41,7 @@ User guide
 .. toctree::
    :maxdepth: 2
 
-   admin/dsl_v2
+   user/dsl_v2
 
 **CLI**
 
diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
index 2f1b31d2e..4ac1b6060 100644
--- a/doc/source/quickstart.rst
+++ b/doc/source/quickstart.rst
@@ -62,7 +62,7 @@ This simple workflow iterates through a list of names in ``task1`` (using
 then stores the word "Done" as a result of the second task (`task2`).
 
 To learn more about the Mistral Workflows and what you can do, read the
-:doc:`Mistral Workflow Language specification <admin/dsl_v2>`
+:doc:`Mistral Workflow Language specification <user/dsl_v2>`
 
 Upload the workflow
 -------------------
diff --git a/doc/source/terminology/workbooks.rst b/doc/source/terminology/workbooks.rst
index ff1e30fda..bf004fa15 100644
--- a/doc/source/terminology/workbooks.rst
+++ b/doc/source/terminology/workbooks.rst
@@ -80,4 +80,4 @@ the original workbook.
 * **actions** - Dictionary containing ad-hoc action definitions. *Optional*.
 
 For more details about Mistral Workflow Language itself, please see
-:doc:`Mistral Workflow Language specification </admin/dsl_v2>`
+:doc:`Mistral Workflow Language specification </user/dsl_v2>`
diff --git a/doc/source/terminology/workflows.rst b/doc/source/terminology/workflows.rst
index 10174bc09..c68843011 100644
--- a/doc/source/terminology/workflows.rst
+++ b/doc/source/terminology/workflows.rst
@@ -137,4 +137,4 @@ YAML example
           requires: [create_vm, associate_ip]
 
 For more details about Mistral Workflow Language itself, please see
-:doc:`Mistral Workflow Language specification </admin/dsl_v2>`
+:doc:`Mistral Workflow Language specification </user/dsl_v2>`
diff --git a/doc/source/admin/dsl_v2.rst b/doc/source/user/dsl_v2.rst
similarity index 99%
rename from doc/source/admin/dsl_v2.rst
rename to doc/source/user/dsl_v2.rst
index d598247b2..5a27c70e9 100644
--- a/doc/source/admin/dsl_v2.rst
+++ b/doc/source/user/dsl_v2.rst
@@ -879,6 +879,9 @@ std.javascript
 
 Evaluates given JavaScript code.
 
+**NOTE**: std.js is an alias for std.javascript i.e, std.js can be used in
+place of std.javascript.
+
 Input parameters:
 
 -  **script** - The text of JavaScript snippet that needs to be