Skip to content

Commit fa6705a

Browse files
authored
Merge pull request github#3228 from shati-patel/docs-qhelp
Docs: Change "Qhelp" to "Query help"
2 parents 6726a23 + 92aee59 commit fa6705a

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

docs/language/learn-ql/writing-queries/query-help.rst

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Each query help file provides detailed information about the purpose and use of
2626
Structure
2727
=========
2828

29-
Query help files are written using an XML format called Qhelp (``.qhelp``). Query help files must have the same base name as the query they describe, and must be located in the same directory. The basic structure is as follows:
29+
Query help files are written using a custom XML format, and stored in a file with a ``.qhelp`` extension. Query help files must have the same base name as the query they describe, and must be located in the same directory. The basic structure is as follows:
3030

3131
.. code-block:: xml
3232
@@ -44,32 +44,32 @@ Section-level elements
4444

4545
Section-level elements are used to group the information in the help file into sections. Many sections have a heading, either defined by a ``title`` attribute or a default value. The following section-level elements are optional child elements of the ``qhelp`` element.
4646

47-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
48-
| Element | Attributes | Children | Purpose of section |
49-
+====================+====================================+========================+===============================================================================================================================================+
50-
| ``example`` | None | Any block element | Demonstrate an example of code that violates the rule implemented by the query with guidance on how to fix it. Default heading. |
51-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
52-
| ``fragment`` | None | Any block element | See :ref:`Qhelp inclusion <qhelp-inclusion>` below. No heading. |
53-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
54-
| ``hr`` | None | None | A horizontal rule. No heading. |
55-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
56-
| ``include`` | ``src`` The Qhelp file to include. | None | Include a Qhelp file at the ___location of this element. See :ref:`Qhelp inclusion <qhelp-inclusion>` below. No heading. |
57-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
58-
| ``overview`` | None | Any block element | Overview of the purpose of the query. Typically this is the first section in a query document. No heading. |
59-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
60-
| ``recommendation`` | None | Any block element | Recommend how to address any alerts that this query identifies. Default heading. |
61-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
62-
| ``references`` | None | ``li`` elements | Reference list. Typically this is the last section in a query document. Default heading. |
63-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
64-
| ``section`` | ``title`` Title of the section | Any block element | General-purpose section with a heading defined by the ``title`` attribute. |
65-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
66-
| ``semmleNotes`` | None | Any block element | Semmle-specific notes about the query. This section is used only for queries that implement a rule defined by a third party. Default heading. |
67-
+--------------------+------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
47+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
48+
| Element | Attributes | Children | Purpose of section |
49+
+====================+=========================================+========================+===============================================================================================================================================+
50+
| ``example`` | None | Any block element | Demonstrate an example of code that violates the rule implemented by the query with guidance on how to fix it. Default heading. |
51+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
52+
| ``fragment`` | None | Any block element | See :ref:`Query help inclusion <qhelp-inclusion>` below. No heading. |
53+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
54+
| ``hr`` | None | None | A horizontal rule. No heading. |
55+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
56+
| ``include`` | ``src`` The query help file to include. | None | Include a query help file at the ___location of this element. See :ref:`Query help inclusion <qhelp-inclusion>` below. No heading. |
57+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
58+
| ``overview`` | None | Any block element | Overview of the purpose of the query. Typically this is the first section in a query document. No heading. |
59+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
60+
| ``recommendation`` | None | Any block element | Recommend how to address any alerts that this query identifies. Default heading. |
61+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
62+
| ``references`` | None | ``li`` elements | Reference list. Typically this is the last section in a query document. Default heading. |
63+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
64+
| ``section`` | ``title`` Title of the section | Any block element | General-purpose section with a heading defined by the ``title`` attribute. |
65+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
66+
| ``semmleNotes`` | None | Any block element | Semmle-specific notes about the query. This section is used only for queries that implement a rule defined by a third party. Default heading. |
67+
+--------------------+-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
6868

6969
Block elements
7070
==============
7171

72-
The following elements are optional child elements of the ``section``, ``example``, ``fragment``, ``recommendation``, ``overview`` and ``semmleNotes`` elements.
72+
The following elements are optional child elements of the ``section``, ``example``, ``fragment``, ``recommendation``, ``overview``, and ``semmleNotes`` elements.
7373

7474
.. table::
7575
:widths: 7 20 10 25
@@ -84,7 +84,7 @@ The following elements are optional child elements of the ``section``, ``example
8484
| | | ``height`` Optional, height of the image. | | |
8585
| | | ``width`` Optional, the width of the image. | | |
8686
+----------------+----------------------------------------------------------+--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
87-
| ``include`` | ``src`` The Qhelp file to include. | None | Include a Qhelp file at the ___location of this element. See :ref:`Qhelp inclusion <qhelp-inclusion>` below for more information. |
87+
| ``include`` | ``src`` The query help file to include. | None | Include a query help file at the ___location of this element. See :ref:`Query help inclusion <qhelp-inclusion>` below for more information. |
8888
+----------------+----------------------------------------------------------+--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8989
| ``ol`` | None | ``li`` | Display an ordered list. See List elements below. |
9090
+----------------+----------------------------------------------------------+--------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -105,12 +105,12 @@ The following elements are optional child elements of the ``section``, ``example
105105
List elements
106106
=============
107107

108-
Qhelp files support two types of block elements for lists: ``ul`` and ``ol``. Both block elements support only one child elements of the type ``li``. Each ``li`` element contains either inline content or a block element.
108+
Query help files support two types of block elements for lists: ``ul`` and ``ol``. Both block elements support only one child elements of the type ``li``. Each ``li`` element contains either inline content or a block element.
109109

110110
Table elements
111111
==============
112112

113-
The ``table`` block element is used to include a table in a Qhelp file. Each table includes a number of rows, each of which includes a number of cells. The data in the cells will be rendered as a grid.
113+
The ``table`` block element is used to include a table in a query help file. Each table includes a number of rows, each of which includes a number of cells. The data in the cells will be rendered as a grid.
114114

115115
+-----------+------------+--------------------+-------------------------------------------+
116116
| Element | Attributes | Children | Purpose |
@@ -159,12 +159,12 @@ Inline content is used to define the content for paragraphs, list items, table c
159159

160160
.. _qhelp-inclusion:
161161

162-
Qhelp inclusion
163-
===============
162+
Query help inclusion
163+
====================
164164

165-
To enable the reuse of content between different help topics, shared content can be stored in one Qhelp file and then included in a number of other Qhelp files using the ``include`` element. The shared content can stored either in the same directory as the including files, or in ``SEMMLE_DIST/docs/include``.
165+
To reuse content between different help topics, you can store shared content in one query help file and then include it in a number of other query help files using the ``include`` element. The shared content can be stored either in the same directory as the including files, or in ``SEMMLE_DIST/docs/include``.
166166

167-
The ``include`` element can be used as a section or block element, the content of the Qhelp file defined by the ``src`` attribute must contain elements that are appropriate to the ___location of the ``include`` element.
167+
The ``include`` element can be used as a section or block element. The content of the query help file defined by the ``src`` attribute must contain elements that are appropriate to the ___location of the ``include`` element.
168168

169169
Section-level include elements
170170
------------------------------
@@ -177,7 +177,7 @@ Section-level ``include`` elements can be located beneath the top-level ``qhelp`
177177
<include src="XSS.qhelp" />
178178
</qhelp>
179179
180-
In this example, the `XSS.qhelp <https://github.com/Semmle/ql/blob/master/csharp/ql/src/Security%20Features/CWE-079/XSS.qhelp>`__ file must conform to the standard for a full Qhelp file as described above. That is, the ``qhelp`` element may only contain non-``fragment``, section-level elements.
180+
In this example, the `XSS.qhelp <https://github.com/Semmle/ql/blob/master/csharp/ql/src/Security%20Features/CWE-079/XSS.qhelp>`__ file must conform to the standard for a full query help file as described above. That is, the ``qhelp`` element may only contain non-``fragment``, section-level elements.
181181

182182
Block-level include elements
183183
----------------------------

0 commit comments

Comments
 (0)