diff --git a/en/developer/frameworks/articles/search/02-aggregations/02-base-search-aggregations-code.markdown b/en/developer/frameworks/articles/search/02-aggregations/02-base-search-aggregations-code.markdown index 2c4c7a528b4..28788167394 100644 --- a/en/developer/frameworks/articles/search/02-aggregations/02-base-search-aggregations-code.markdown +++ b/en/developer/frameworks/articles/search/02-aggregations/02-base-search-aggregations-code.markdown @@ -20,7 +20,7 @@ information to the search request in a similar way between all aggregations. aggregations.percentiles("percentiles", Field.PRIORITY); ``` - To discover what fields each aggregation must have (e.g., `Sting name, + To discover what fields each aggregation must have (e.g., `String name, String field` in the case of the above `PercentilesAggregation`), see the [`Aggregations` interface](https://github.com/liferay/liferay-portal/blob/7.2.0-ga1/modules/apps/portal-search/portal-search-api/src/main/java/com/liferay/portal/search/aggregation/Aggregations.java). diff --git a/en/developer/frameworks/articles/segmentation-and-personalization/04-segment-criteria-contributors.markdown b/en/developer/frameworks/articles/segmentation-and-personalization/04-segment-criteria-contributors.markdown index 8c74d2ae659..1d993420078 100644 --- a/en/developer/frameworks/articles/segmentation-and-personalization/04-segment-criteria-contributors.markdown +++ b/en/developer/frameworks/articles/segmentation-and-personalization/04-segment-criteria-contributors.markdown @@ -27,7 +27,7 @@ Follow the instructions below to get started. 2. Create the following packages within the module: - - `com.liferay.segments.criteria.extension.sample.internal.odata.retreiver` + - `com.liferay.segments.criteria.extension.sample.internal.odata.retriever` - `com.liferay.segments.criteria.extension.sample.internal.odata.entity` - `com.liferay.segments.criteria.extension.sample.internal.criteria.contributor` @@ -87,7 +87,7 @@ Next, you'll create the OData Retriever. Next, create the `ODataRetriever` which gets the data using the relevant filter. -1. Inside the `...internal.odata.retreiver` package, create +1. Inside the `...internal.odata.retriever` package, create `KBArticleODataRetriever.java` which implements `ODataRetriever`: ```java @@ -191,7 +191,7 @@ editor, and contributes a query to filter users based on the articles they authored. 1. In the `...internal.criteria.contributor` package, create a - `UserKBArticleSegmentCritieriaContributor` class that implements + `UserKBArticleSegmentCriteriaContributor` class that implements `SegmentsCriteriaContributor`. ```java diff --git a/en/developer/frameworks/articles/workflow/01-workflow-intro.markdown b/en/developer/frameworks/articles/workflow/01-workflow-intro.markdown index c4e9007e0a5..75709df51c4 100644 --- a/en/developer/frameworks/articles/workflow/01-workflow-intro.markdown +++ b/en/developer/frameworks/articles/workflow/01-workflow-intro.markdown @@ -35,7 +35,7 @@ workflow: `long statusByUserId` is the ID of the user that set the status (for example, the initial User that hit the Submit for Publication button to add a new -Asset. +Asset). `String statusByUserName` is the User Name of the User that set the status of the Asset. diff --git a/en/developer/frameworks/images/application-decorator-barebone.png b/en/developer/frameworks/images/application-decorator-barebone.png index 4b1d119aa04..d6dc3e71b27 100644 Binary files a/en/developer/frameworks/images/application-decorator-barebone.png and b/en/developer/frameworks/images/application-decorator-barebone.png differ diff --git a/en/developer/frameworks/images/application-decorator-borderless.png b/en/developer/frameworks/images/application-decorator-borderless.png index d6dc3e71b27..4b1d119aa04 100644 Binary files a/en/developer/frameworks/images/application-decorator-borderless.png and b/en/developer/frameworks/images/application-decorator-borderless.png differ diff --git a/en/user/articles/05-setting-up/01-system-settings/03-server-administration/02-server-admin-external-services.markdown b/en/user/articles/05-setting-up/01-system-settings/03-server-administration/02-server-admin-external-services.markdown index 9794f9df135..61ff09401b8 100644 --- a/en/user/articles/05-setting-up/01-system-settings/03-server-administration/02-server-admin-external-services.markdown +++ b/en/user/articles/05-setting-up/01-system-settings/03-server-administration/02-server-admin-external-services.markdown @@ -26,7 +26,7 @@ for other file types: As of Liferay 7.1, OpenOffice/LibreOffice is configured in OSGi Configuration Admin instead of portal properties. To adjust the these settings, go to *Control -Panel* &arr; *Configuration*&arr; *System Settings* &arr; *Connectors* → +Panel* → *Configuration* → *System Settings* → *Connectors* → *OpenOffice Integration*. You can also adjust these settings by deploying a `com.liferay.document.library.document.conversion.internal.configuration.OpenOfficeConfiguration.config`