Skip to content

Commit 0f0d6e7

Browse files
authored
Merge pull request #17670 from craftcms/docs/general-config-tables
Docs: Tables in GeneralConfig.php
2 parents de7d3ef + e097d7d commit 0f0d6e7

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

src/config/GeneralConfig.php

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,16 +1979,16 @@ class GeneralConfig extends BaseConfig
19791979
* @var string The string preceding a number which Craft will look for when determining if the current request is for a particular page in
19801980
* a paginated list of pages.
19811981
*
1982-
* Example Value | Example URI
1983-
* ------------- | -----------
1984-
* `p` | `/news/p5`
1985-
* `page` | `/news/page5`
1986-
* `page/` | `/news/page/5`
1987-
* `?page` | `/news?page=5`
1982+
* | Example Value | Example URI |
1983+
* | --- | --- |
1984+
* | `p` | `/news/p5` |
1985+
* | `page` | `/news/page5` |
1986+
* | `page/` | `/news/page/5` |
1987+
* | `?page` | `/news?page=5` |
19881988
*
1989-
* ::: tip
1990-
* If you want to set this to `?p` (e.g. `/news?p=5`), you’ll also need to change your <config5:pathParam> setting which defaults to `p`.
1991-
* If your server is running Apache, you’ll need to update the redirect code in your `.htaccess` file to match your new `pathParam` value.
1989+
* ::: warning
1990+
* Craft may override this setting if it conflicts with <config5:pathParam>. If you want to set this to `?p` (e.g. `/news?p=5`), you’ll also need to change your <config5:pathParam> setting (which defaults to `p`).
1991+
* Then, if your server is running Apache, you’ll need to update the redirect code in your `.htaccess` file to match your new `pathParam` value.
19921992
* :::
19931993
*
19941994
* ::: code
@@ -3126,8 +3126,9 @@ class GeneralConfig extends BaseConfig
31263126
* The symbols are as follows:
31273127
*
31283128
* | Symbol | Example | Category |
3129-
* | `$` | `$Date Field$` | Site |
3130-
* | `@` | `@Entry Type@` | Application |
3129+
* | --- | --- | --- |
3130+
* | `$` | `$Date Field$` | Site (front-end, `site.php`) |
3131+
* | `@` | `@Entry Type@` | Application (Craft, `app.php`) |
31313132
* | `%` | `%Object Template% | Other (plugin or custom source) |
31323133
*
31333134
* Translations _may_ be nested or surrounded by multiple symbols.
@@ -5536,16 +5537,16 @@ public function optimizeImageFilesize(bool $value = true): self
55365537
* The string preceding a number which Craft will look for when determining if the current request is for a particular page in
55375538
* a paginated list of pages.
55385539
*
5539-
* Example Value | Example URI
5540-
* ------------- | -----------
5541-
* `p` | `/news/p5`
5542-
* `page` | `/news/page5`
5543-
* `page/` | `/news/page/5`
5544-
* `?page` | `/news?page=5`
5540+
* | Example Value | Example URI |
5541+
* | --- | --- |
5542+
* | `p` | `/news/p5` |
5543+
* | `page` | `/news/page5` |
5544+
* | `page/` | `/news/page/5` |
5545+
* | `?page` | `/news?page=5` |
55455546
*
5546-
* ::: tip
5547-
* If you want to set this to `?p` (e.g. `/news?p=5`), you’ll also need to change your <config5:pathParam> setting which defaults to `p`.
5548-
* If your server is running Apache, you’ll need to update the redirect code in your `.htaccess` file to match your new `pathParam` value.
5547+
* ::: warning
5548+
* Craft may override this setting if it conflicts with <config5:pathParam>. If you want to set this to `?p` (e.g. `/news?p=5`), you’ll also need to change your <config5:pathParam> setting (which defaults to `p`).
5549+
* Then, if your server is running Apache, you’ll need to update the redirect code in your `.htaccess` file to match your new `pathParam` value.
55495550
* :::
55505551
*
55515552
* ```php
@@ -6856,8 +6857,9 @@ public function transformSvgs(bool $value = true): self
68566857
* The symbols are as follows:
68576858
*
68586859
* | Symbol | Example | Category |
6859-
* | `$` | `$Date Field$` | Site |
6860-
* | `@` | `@Entry Type@` | Application |
6860+
* | --- | --- | --- |
6861+
* | `$` | `$Date Field$` | Site (front-end, `site.php`) |
6862+
* | `@` | `@Entry Type@` | Application (Craft, `app.php`) |
68616863
* | `%` | `%Object Template% | Other (plugin or custom source) |
68626864
*
68636865
* Translations _may_ be nested or surrounded by multiple symbols.

0 commit comments

Comments
 (0)