Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md
index c35d1da5a88..8834deb8d50 100644
--- a/doc/user/asciidoc.md
+++ b/doc/user/asciidoc.md
@@ -91,6 +91,8 @@ stem:[sqrt(4) = 2]
 
 ### Attributes
 
+**User-defined attributes**
+
 ```asciidoc
 // define attributes in the document header
 :name: value
@@ -104,6 +106,15 @@ C{pp} is not required, only Ruby.
 Use a leading backslash to output a word enclosed in curly braces, like \{name}.
 ```
 
+**Environment attributes**
+
+GitLab sets the following environment attributes:
+
+| Attribute       | Description                                                                                                            |
+| :-------------- | :--------------------------------------------------------------------------------------------------------------------- |
+| `docname`       | Root name of the source document (no leading path or file extension).                                                  |
+| `outfilesuffix` | File extension corresponding to the backend output (defaults to `.adoc` to make inter-document cross references work). |
+
 ### Links
 
 ```asciidoc