diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74eb4fe149..ef1ebf4bf8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,7 +52,7 @@ The core team will review your pull request and will either merge it, request ch ## Contribution Prerequisites -- You have [Node](https://nodejs.org/en/) at v10.x.x only and [Yarn](https://yarnpkg.com/en/) at v1.2.0+. +- You have [Node](https://nodejs.org/en/) at v10.10.0+ only and [Yarn](https://yarnpkg.com/en/) at v1.2.0+. - You are familiar with Git. ## Development Workflow diff --git a/README.md b/README.md index 8d4dbb27e8..ebb57e2600 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ Complete installation requirements can be found in the documentation under = 10.x +- NodeJS >= 10.10 - NPM >= 6.x **Database:** diff --git a/docs/3.0.0-beta.x/concepts/models.md b/docs/3.0.0-beta.x/concepts/models.md index 61420edf26..9c7ba6a0c7 100644 --- a/docs/3.0.0-beta.x/concepts/models.md +++ b/docs/3.0.0-beta.x/concepts/models.md @@ -341,7 +341,7 @@ xhr.send( ::: tab "One-to-Many" id="one-to-many" -One-to-Many relationships are useful when an entry can be liked to multiple entries of another Content Type. And an entry of the other Content Type can be linked to only one entry. +One-to-Many relationships are useful when an entry can be linked to multiple entries of another Content Type. And an entry of the other Content Type can be linked to only one entry. #### Example @@ -400,7 +400,7 @@ xhr.send( ::: tab "Many-to-Many" id="many-to-many" -Many-to-Many relationships are useful when an entry can be liked to multiple entries of another Content Type. And an entry of the other Content Type can be linked to many entries. +Many-to-Many relationships are useful when an entry can be linked to multiple entries of another Content Type. And an entry of the other Content Type can be linked to many entries. #### Example diff --git a/docs/v3.x/admin-panel/customization.md b/docs/v3.x/admin-panel/customization.md index 82f531eac6..b026acd09e 100644 --- a/docs/v3.x/admin-panel/customization.md +++ b/docs/v3.x/admin-panel/customization.md @@ -20,7 +20,7 @@ module.exports = { enabled: false, }, admin: { - path: '/dashboard', + url: '/dashboard', }, }; ``` diff --git a/docs/v3.x/assets/deployment/caddy-monotone.svg b/docs/v3.x/assets/deployment/caddy-monotone.svg new file mode 100644 index 0000000000..e28ca38974 --- /dev/null +++ b/docs/v3.x/assets/deployment/caddy-monotone.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/v3.x/concepts/middlewares.md b/docs/v3.x/concepts/middlewares.md index 4364d2b2f4..ffabd4d6d7 100644 --- a/docs/v3.x/concepts/middlewares.md +++ b/docs/v3.x/concepts/middlewares.md @@ -153,6 +153,7 @@ The session doesn't work with `mongo` as a client. The package that we should us - [`csp`](https://en.wikipedia.org/wiki/Content_Security_Policy) - `enabled` (boolean): Enable or disable CSP to avoid Cross Site Scripting (XSS) and data injection attacks. + - `policy` (string): Configures the `Content-Security-Policy` header. If not specified uses default value. Default value: `undefined`. - [`p3p`](https://en.wikipedia.org/wiki/P3P) - `enabled` (boolean): Enable or disable p3p. - [`hsts`](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) diff --git a/docs/v3.x/concepts/models.md b/docs/v3.x/concepts/models.md index 61ac0b311c..820d5b16ae 100644 --- a/docs/v3.x/concepts/models.md +++ b/docs/v3.x/concepts/models.md @@ -1168,5 +1168,5 @@ module.exports = { ``` ::: tip -When calling a lifecycle function directly, you will need to make sur you call it with the expected parameters. +When calling a lifecycle function directly, you will need to make sure you call it with the expected parameters. ::: diff --git a/docs/v3.x/concepts/webhooks.md b/docs/v3.x/concepts/webhooks.md index cb27a5ca8c..7a53652fc6 100644 --- a/docs/v3.x/concepts/webhooks.md +++ b/docs/v3.x/concepts/webhooks.md @@ -2,8 +2,7 @@ ## What is a webhook -A webhook is a way for an application to notify other applications that an event occurred. -Using a webhook is a good way to tell third party providers to start some processing (CI, build, deployment ...). +Webhook is a construct used by an application to notify other applications that an event occurred. More precisely, webhook is a user-defined HTTP callback. Using a webhook is a good way to tell third party providers to start some processing (CI, build, deployment ...). The way a webhook works is by delivering information to a receiving application through HTTP requests (typically POST requests). diff --git a/docs/v3.x/deployment/digitalocean.md b/docs/v3.x/deployment/digitalocean.md index ced92d6a4a..4539a0947e 100644 --- a/docs/v3.x/deployment/digitalocean.md +++ b/docs/v3.x/deployment/digitalocean.md @@ -176,7 +176,7 @@ module.exports = ({ env }) => ({ settings: { client: 'postgres', host: env('DATABASE_HOST', '127.0.0.1'), - port: env.int('DATABASE_PORT', 27017), + port: env.int('DATABASE_PORT', 5432), database: env('DATABASE_NAME', 'strapi'), username: env('DATABASE_USERNAME', ''), password: env('DATABASE_PASSWORD', ''), diff --git a/docs/v3.x/getting-started/deployment.md b/docs/v3.x/getting-started/deployment.md index 7683daac20..83e1797db8 100644 --- a/docs/v3.x/getting-started/deployment.md +++ b/docs/v3.x/getting-started/deployment.md @@ -77,7 +77,7 @@ Additional guides for optional software additions that compliment or improve the