comparison xml/en/docs/http/ngx_http_core_module.xml @ 108:72524ae53106

Explicitly marked directives with the block syntax. Such directives will have curly braces around their syntax and defaults appear automatically. Other directives will have a semicolon after their syntax and defaults.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 20 Oct 2011 07:47:21 +0000
parents 56457a474903
children b9e5155d8f5d
comparison
equal deleted inserted replaced
107:ee725af08951 108:72524ae53106
656 656
657 </directive> 657 </directive>
658 658
659 659
660 <directive name="limit_except"> 660 <directive name="limit_except">
661 <syntax><argument>method</argument> ... { ... }</syntax> 661 <syntax block="yes"><argument>method</argument> ...</syntax>
662 <default/> 662 <default/>
663 <context>location</context> 663 <context>location</context>
664 664
665 <para> 665 <para>
666 Limits allowed HTTP methods inside a location. 666 Limits allowed HTTP methods inside a location.
984 984
985 </directive> 985 </directive>
986 986
987 987
988 <directive name="location"> 988 <directive name="location">
989 <syntax>[ 989 <syntax block="yes">[
990 <value>=</value> | 990 <value>=</value> |
991 <value>~</value> | 991 <value>~</value> |
992 <value>~*</value> | 992 <value>~*</value> |
993 <value>^~</value> 993 <value>^~</value>
994 ] <argument>uri</argument> 994 ] <argument>uri</argument>
995 { ... }</syntax> 995 </syntax>
996 <syntax><value>@</value><argument>name</argument> { ... }</syntax> 996 <syntax block="yes"><value>@</value><argument>name</argument></syntax>
997 <default/> 997 <default/>
998 <context>server</context> 998 <context>server</context>
999 <context>location</context> 999 <context>location</context>
1000 1000
1001 <para> 1001 <para>
1619 1619
1620 </directive> 1620 </directive>
1621 1621
1622 1622
1623 <directive name="server"> 1623 <directive name="server">
1624 <syntax>{ ... }</syntax> 1624 <syntax block="yes"/>
1625 <default/> 1625 <default/>
1626 <context>http</context> 1626 <context>http</context>
1627 1627
1628 <para> 1628 <para>
1629 Sets a configuration for the virtual server. 1629 Sets a configuration for the virtual server.
2014 2014
2015 </directive> 2015 </directive>
2016 2016
2017 2017
2018 <directive name="types"> 2018 <directive name="types">
2019 <syntax>{ ... }</syntax> 2019 <syntax block="yes"/>
2020 <default> 2020 <default>
2021 {
2022 text/html html; 2021 text/html html;
2023 image/gif gif; 2022 image/gif gif;
2024 image/jpeg jpg; 2023 image/jpeg jpg;
2025 }
2026 </default> 2024 </default>
2027 <context>http</context> 2025 <context>http</context>
2028 <context>server</context> 2026 <context>server</context>
2029 <context>location</context> 2027 <context>location</context>
2030 2028