Skip to content

Commit 3fa359e

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 41487e9 + 99bc08c commit 3fa359e

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

docs/cloud/faq.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Each project gets one free domain, and unlimited subdomains; additional domains
6565

6666
### Which Git providers do you support?
6767

68-
We currently support connecting GitHub, Gitlab, and BitBucket repositories.
68+
We currently support connecting GitHub, GitLab, and Bitbucket repositories.
6969

7070
<a id="min-versions"></a>
7171

@@ -76,7 +76,7 @@ Your `composer.lock` file determines what version of Craft gets installed; your
7676

7777
<a id="trials"></a>
7878

79-
### Is there are a trial for Craft Cloud?
79+
### Is there a trial for Craft Cloud?
8080

8181
Yes, all Craft Cloud projects start with a free 7-day trial.
8282
Read more about trials in our [Billing](billing.md) article.
@@ -91,9 +91,9 @@ Read more about [region support](regions.md).
9191

9292
<a id="encryption"></a>
9393

94-
### Is data encrypted at-rest?
94+
### Is data encrypted at rest?
9595

96-
Yes—your [assets](assets.md) and database are both encrypted at-rest.
96+
Yes—your [assets](assets.md) and database are both encrypted at rest.
9797
More information is available in our dedicated [databases](databases.md) and [security](security.md) articles.
9898

9999
<a id="firewall"></a>
@@ -103,15 +103,15 @@ More information is available in our dedicated [databases](databases.md) and [se
103103
All Craft Cloud projects are protected by our Cloudflare WAF, with a “reasonable” setup of default rules.
104104
We make specific changes to the firewall as needs arise.
105105

106-
Some customers have their own Cloudflare accounts in front of ours, allowing them to manage specific WAF rules before requests make it to Craft Cloud.
106+
Some customers have their own Cloudflare accounts in front of ours, allowing them to manage specific WAF rules before requests reach Craft Cloud.
107107
Cloudflare refers to this as the “[Orange-to-Orange](https://developers.cloudflare.com/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/how-it-works/)” scenario; more information about this setup is available in the [Craft Cloud for Cloudflare](users.md) article.
108108

109109
<a id="htaccess"></a>
110110

111111
### Can I edit my .htaccess or nginx config file?
112112

113113
Nope, sorry!
114-
Craft Cloud is serverless, and doesn’t use a traditional HTTP server like nginx or Apache.
114+
Craft Cloud is serverless and doesn’t use a traditional HTTP server like nginx or Apache.
115115

116116
However, [redirects and rewrites](redirects.md) can be configured via your `craft-cloud.yaml` file.
117117

@@ -145,9 +145,9 @@ If you are migrating a site to Cloud, make sure its database can be neatly impor
145145

146146
Currently, there is no automatic way to do this.
147147

148-
As a result of each environment being connected to a git repository, you can revert problematic commits and re-deploy.
149-
If changes were made to the database that need to be rolled back (say, via a migration), the database will need to be restored to an appropriate point.
150-
Migrations are only run once Cloud has finished building your application image.
148+
As a result of each environment being connected to a git repository, you can revert problematic commits and redeploy.
149+
If changes to the database need to be rolled back (e.g., via a migration), the database will need to be restored to an appropriate point.
150+
Migrations are run only after Cloud finishes building your application image.
151151
Failed builds are never deployed!
152152

153153
Read more about [deployments](deployment.md) and our [build pipeline](builds.md).
@@ -197,8 +197,8 @@ Read all about [deployments](deployment.md) and the [build pipeline](builds.md).
197197

198198
### How can I statically cache the front end of my site?
199199

200-
Craft Cloud has a built-in [static caching](static-caching.md) system that is designed to work seamlessly with Craft CMS.
201-
On-disk and rewrite-based caches will not work, as the Cloud filesystem is ephemeraland files in the “web root” aren’t directly exposed to the web.
200+
Craft Cloud includes a built-in [static caching](static-caching.md) system that works seamlessly with Craft CMS.
201+
On-disk and rewrite-based caches will not work, as the Cloud filesystem is ephemeral, and files in the “web root” aren’t directly exposed to the web.
202202

203203
<a id="local-dev"></a>
204204

@@ -229,7 +229,7 @@ No. The WAF rules are designed to protect the Craft Cloud infrastructure against
229229

230230
As part of the [shared responsibility model](security.md), we would not disable those purposefully.
231231

232-
If you want to pentest your application, you can do that locally or on a separate, non-Craft Cloud installation.
232+
If you want to pentest your application outside of that context, you can do so locally or on a separate, non-Craft Cloud installation.
233233

234234
## Billing + Legal
235235

0 commit comments

Comments
 (0)