Skip to content

Commit

Permalink
Merge branch '11.1' into 11.x
Browse files Browse the repository at this point in the history
  • Loading branch information
fashxp committed Jan 22, 2024
2 parents 46d5316 + 47bb4a2 commit cbf2e28
Show file tree
Hide file tree
Showing 17 changed files with 93 additions and 77 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ argument to `captureStart()`.

## HTTP/2 Push Support

See [HTTP/2 Push Support on the HeadLink page](./01_HeadLink.md#page_HTTP-2-Push-Support).
See [HTTP/2 Push Support on the HeadLink page](./01_HeadLink.md#http2-push-support).
4 changes: 3 additions & 1 deletion doc/02_MVC/04_Routing_and_URLs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ The path of Pimcore Documents also defines its public URL. In addition to the pa


#### 4. URL Slugs of Data Objects
With the special data type [URL Slug](../../05_Objects/01_Object_Classes/01_Data_Types/65_Others.md#page_URL-Slug) URLs for data objects can be defined. These need to be unique and are evaluated in the fourth priority for the current site. See [URL Slug](../../05_Objects/01_Object_Classes/01_Data_Types/65_Others.md#page_URL-Slug) for details.
With the special data type [URL Slug](../../05_Objects/01_Object_Classes/01_Data_Types/65_Others.md#url-slug) URLs for
data objects can be defined. These need to be unique and are evaluated in the fourth priority for the current site.
See [URL Slug](../../05_Objects/01_Object_Classes/01_Data_Types/65_Others.md#url-slug) for details.


#### 5. Static Routes / Custom Routes:
Expand Down
2 changes: 1 addition & 1 deletion doc/03_Documents/09_Working_with_PHP_API.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ If you'd like to get also all the unpublished documents, set the following flag:
| `getItems()` | int $offset, int $itemsCountPerPage | as arguments you have to specify the limit of rows and the offset. |
| `loadIdList()` | | Returns complete array with id as a row. |

If you want to know more about the paginator usage with lists, you should visit [Working with Objects via PHP API part](../05_Objects/03_Working_with_PHP_API.md#zendPaginatorListing)
If you want to know more about the paginator usage with lists, you should visit [Working with Objects via PHP API part](../05_Objects/03_Working_with_PHP_API.md#working-with-knpcomponentpagerpaginator).


### Advanced Example
Expand Down
4 changes: 2 additions & 2 deletions doc/04_Assets/01_Working_with_PHP_API.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ $list->setOrder("DESC");
$list->load();
```

Please also have a look at [object listings](../05_Objects/03_Working_with_PHP_API.md#objectsListing)
and [document listings](../03_Documents/09_Working_with_PHP_API.md#documentsListing).
Please also have a look at [object listings](../05_Objects/03_Working_with_PHP_API.md#object-listings)
and [document listings](../03_Documents/09_Working_with_PHP_API.md#document-listings).


## Custom Settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ $webpThumbnail->getHtml();
{{ image.thumbnail('exampleScaleWidth').imageTag({'alt': 'top priority alt text'}) }}
```

Additionally there are some special parameters to [customize generated image HTML code](../../03_Documents/01_Editables/14_Image.md#page_Configuration).
Additionally, there are some special parameters to [customize generated image HTML code](../../03_Documents/01_Editables/14_Image.md#configuration).

## Lazy Loading

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For a sample configuration file have a look at the [sample configuration](21_Cus

Format and location of the custom view configuration depends on your environment.
Per default the symfony-config is used.
If you want to change the default behaviour, have a look at the [environment](../../../21_Deployment/03_Configuration_Environments.md#page_Configuration-Storage-Locations-Fallbacks) configuration options.
If you want to change the default behaviour, have a look at the [environment](../../../21_Deployment/03_Configuration_Environments.md#configuration-storage-locations--fallbacks) configuration options.

## Advanced Features / Configurations

Expand Down
2 changes: 1 addition & 1 deletion doc/06_Multi_Language_i18n/07_Admin_Translations.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ and after the string, if `Debug Admin-Translations (wrapped in +)` is activated
But you can use the admin translation also in your custom templates.
Admin translations use the same translator component (Symfony) but on a different domain.

Admin translations underlay the same case sensitivity logic as [shared translations](./04_Shared_Translations.md#page_Translations_case_sensitivity).
Admin translations underlay the same case sensitivity logic as [shared translations](./04_Shared_Translations.md#translations-case-sensitivity).

#### Example: Translate Options of a Select Editable in the language of the current user

Expand Down
2 changes: 1 addition & 1 deletion doc/18_Tools_and_Features/13_Perspectives.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You can restrict the access to certain perspectives via the user settings.

Format and location of the perspective configuration depends on your environment.
Per default the symfony-config is used.
If you want to change the default behaviour, have a look at the [environment](../21_Deployment/03_Configuration_Environments.md#page_Configuration-Storage-Locations-Fallbacks) configuration options.
If you want to change the default behaviour, have a look at the [environment](../21_Deployment/03_Configuration_Environments.md#configuration-storage-locations--fallbacks) configuration options.

Please refer to the [example configuration](14_Perspective_Example.md) for further details on how this can be set up.

Expand Down
Loading

0 comments on commit cbf2e28

Please sign in to comment.