Skip to content

Commit 61d9514

Browse files
Merge branch 'main' into fix/add-uk-region-ip
2 parents 53e3371 + 7f2f4eb commit 61d9514

File tree

9 files changed

+20
-16
lines changed

9 files changed

+20
-16
lines changed

sites/platform/config/_default/config.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,5 @@ security:
119119
http:
120120
methods:
121121
- GET
122+
123+
enableRobotsTXT: true

sites/platform/src/administration/users.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ As an organization owner or an organization user with the **Manage users** permi
244244

245245
Users with the **Manage users** (`members`) permission can add, edit, or remove _any_ user's permissions except their own.
246246

247-
Users with the **Manage billing** (`billing`) permission automatically are granted **List projects** (`projects:list`) permission.
248-
That is, they are able to see all organization projects once given billing rights.
247+
Users with the **Manage billing** (`billing`) or **Manage Plans** (`plans`) permission automatically are granted **List projects** (`projects:list`) permission.
248+
That is, they are able to see all organization projects once given billing or plans rights.
249249

250250
{{< /note >}}
251251

sites/platform/src/guides/django/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ title: "Django"
33
weight: -200
44
sectionBefore: Python
55
description: |
6-
Everything you need to get started with [Django](https://www.djangoproject.com/), a Python framework for web development, on {{% vendor/name %}}.
6+
Everything you need to get started with Django, a Python framework for web development, on {{% vendor/name %}}.
77
---
88

9-
{{% description %}}
9+
Everything you need to get started with [Django](https://www.djangoproject.com/), a Python framework for web development, on {{% vendor/name %}}.
1010

1111
Anything included in these guides applies to not only to Django, but also [Wagtail](https://wagtail.org/), the content management system built with Django.
1212

sites/platform/src/guides/gatsby/_index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ title: "Gatsby"
33
weight: -90
44
sectionBefore: Javascript/Node.js
55
description: |
6-
Everything you need to get started with [Gatsby](https://www.gatsbyjs.com/), the open source framework based on React, on {{% vendor/name %}}.
6+
Everything you need to get started with Gatsby, the open source framework based on React, on {{% vendor/name %}}.
77
---
88

9-
{{% description %}}
9+
Everything you need to get started with [Gatsby](https://www.gatsbyjs.com/), the open source framework based on React, on {{% vendor/name %}}.
1010

11-
{{% guides/link-philosophy %}}
11+
{{% guides/link-philosophy %}}

sites/platform/src/guides/laravel/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: "Laravel"
33
weight: -140
44
description: |
5-
Everything you need to get started with [Laravel](https://laravel.com/) on {{% vendor/name %}}.
5+
Everything you need to get started with Laravel on {{% vendor/name %}}.
66
---
77

8-
{{% description %}}
8+
Everything you need to get started with [Laravel](https://laravel.com/) on {{% vendor/name %}}.
99

1010
{{% guides/link-philosophy %}}

sites/platform/src/guides/nextjs/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: "Next.js"
33
weight: -80
44
description: |
5-
Everything you need to get started with [Next.js](https://nextjs.org/), a React framework for building websites and web apps, on {{% vendor/name %}}.
5+
Everything you need to get started with Next.js, a React framework for building websites and web apps, on {{% vendor/name %}}.
66
---
77

8-
{{% description %}}
8+
Everything you need to get started with [Next.js](https://nextjs.org/), a React framework for building websites and web apps, on {{% vendor/name %}}.
99

1010
{{% guides/link-philosophy %}}

sites/platform/src/guides/strapi/_index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: "Strapi"
33
weight: -70
44
description: |
5-
Everything you need to get started with [Strapi](https://www.strapi.io/), the open source headless CMS based on NodeJS, on {{% vendor/name %}}.
5+
Everything you need to get started with Strapi, the open source headless CMS based on NodeJS, on {{% vendor/name %}}.
66
---
77

8-
{{% description %}}
8+
Everything you need to get started with [Strapi](https://www.strapi.io/), the open source headless CMS based on NodeJS, on {{% vendor/name %}}.
99

10-
{{% guides/link-philosophy %}}
10+
{{% guides/link-philosophy %}}

sites/platform/src/guides/symfony/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ title: "Symfony"
33
weight: -150
44
partner: true
55
description: |
6-
Everything you need to get started with [Symfony](https://www.symfony.com/), a [PHP](/development/templates.md#php) framework for web development, on {{% vendor/name %}}.
6+
Everything you need to get started with Symfony, a PHP framework for web development, on {{% vendor/name %}}.
77
---
8-
{{% description %}}
8+
Everything you need to get started with [Symfony](https://www.symfony.com/), a [PHP](/development/templates.md#php) framework for web development, on {{% vendor/name %}}.
99

1010
[comment]: <> (See an example Symfony project in the official [Symfony template repository]&#40;https://github.com/symfonycorp/platformsh-symfony-template&#41;, which you can use as a starting point for your own project.)
1111

sites/upsun/config/_default/config.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,5 @@ security:
126126
http:
127127
methods:
128128
- GET
129+
130+
enableRobotsTXT: true

0 commit comments

Comments
 (0)