Skip to content

Commit 6a626fe

Browse files
committed
Merge branch 'master' into beta
2 parents c272d7f + ea3ed30 commit 6a626fe

File tree

133 files changed

+240
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+240
-262
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center"><a href="https://www.prisma.io"><img src="https://i.imgur.com/QgwDieO.png" alt="Prisma" height="230px"></a></p>
22

3-
[Website](https://www.prisma.io)[Docs](https://www.prisma.io/docs/)[Blog](https://www.prisma.io/blog)[Forum](https://www.prisma.io/forum)[Slack](https://slack.prisma.io/)[Twitter](https://twitter.com/prisma)[OSS](https://oss.prisma.io/)[Learn](https://www.howtographql.com)
3+
[Website](https://www.prisma.io)[Docs](https://www.prisma.io/docs/)[Examples](https://github.com/prisma/prisma-examples/)[Blog](https://www.prisma.io/blog)[Forum](https://www.prisma.io/forum)[Slack](https://slack.prisma.io/)[Twitter](https://twitter.com/prisma)[OSS](https://oss.prisma.io/)[Learn](https://www.howtographql.com)
44

55
[![CircleCI](https://circleci.com/gh/prisma/prisma.svg?style=shield)](https://circleci.com/gh/prisma/prisma) [![Slack Status](https://slack.prisma.io/badge.svg)](https://slack.prisma.io) [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/prisma)
66

@@ -195,7 +195,7 @@ Here is what you can do next:
195195

196196
- [Build an app with Prisma client](https://www.prisma.io/docs/-t201/)
197197
- [Check out some examples](#examples)
198-
- [Read more about how Prisma works](https://www.prisma.io/docs/-j9ff/).
198+
- [Read more about how Prisma works](https://www.prisma.io/docs/-j9ff/)
199199

200200
## Examples
201201

docs/1.0/03-Tutorials/04-Cluster-Deployment/02-Digital-Ocean-(Docker-Machine).md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ networks:
145145
driver: bridge
146146

147147
volumes:
148-
db-persistence:
148+
db-persistence: ~
149149
```
150150
151151
In `.env`, replace `SECRET_1` and `SECRET_2` (occurs twice) with a long and secure random string.

docs/1.1/03-Tutorials/04-Cluster-Deployment/01-Digital-Ocean-(Docker-Machine).md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ networks:
182182
driver: bridge
183183
184184
volumes:
185-
db-persistence:
185+
db-persistence: ~
186186
```
187187

188188
</Instruction>

docs/1.1/04-Reference/05-Clusters/02-Docker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ networks:
8383
driver: bridge
8484

8585
volumes:
86-
db-persistence:
86+
db-persistence: ~
8787
```
8888
8989
> **Note**: In an upcoming release, [`prisma-database` will be renamed to just `prisma`](https://github.com/graphcool/prisma/issues/1791).

docs/1.10/03-Tutorials2/01-Setup-Prisma/02-Create-New-DB/01-MySQL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ services:
109109
volumes:
110110
- mysql:/var/lib/mysql
111111
volumes:
112-
mysql:
112+
mysql: ~
113113
```
114114
115115
</Instruction>

docs/1.10/03-Tutorials2/01-Setup-Prisma/02-Create-New-DB/02-Postgres.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110
volumes:
111111
- postgres:/var/lib/postgresql/data
112112
volumes:
113-
postgres:
113+
postgres: ~
114114
```
115115
116116
</Instruction>

docs/1.10/03-Tutorials2/06-Deploy-Prisma-Servers/01-Digital-Ocean-(Docker-Machine).md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ networks:
186186
driver: bridge
187187
188188
volumes:
189-
db-persistence:
189+
db-persistence: ~
190190
```
191191

192192
</Instruction>

docs/1.10/04-Reference/05-Prisma-Servers-&-DBs/02-Database-Connectors/02-MySQL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
volumes:
3838
- mysql:/var/lib/mysql
3939
volumes:
40-
mysql:
40+
mysql: ~
4141
```
4242
4343
## Get started

docs/1.10/04-Reference/05-Prisma-Servers-&-DBs/02-Database-Connectors/03-Postgres.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
volumes:
3939
- postgres:/var/lib/postgresql/data
4040
volumes:
41-
postgres:
41+
postgres: ~
4242
```
4343
4444
## Get started

docs/1.11/03-Tutorials2/01-Setup-Prisma/02-Create-New-DB/01-MySQL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ services:
109109
volumes:
110110
- mysql:/var/lib/mysql
111111
volumes:
112-
mysql:
112+
mysql: ~
113113
```
114114
115115
</Instruction>

0 commit comments

Comments
 (0)