Merge branch 'main' into more-optimize-recommendations

prisma · Dec 13, 2024 · 18dbb8a · 18dbb8a
2 parents 4e42f8c + 412cfff
commit 18dbb8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/content/200-orm/100-prisma-schema/10-overview/03-generators.mdx b/content/200-orm/100-prisma-schema/10-overview/03-generators.mdx
@@ -57,6 +57,12 @@ If you use macOS ARM64 (`darwin-arm64`), then the binary file that was compiled
 
 ## Community generators
 
+:::note
+
+Existing generators or new ones should not be affected if you are using the [`prismaSchemaFolder`](/orm/reference/preview-features/client-preview-features#currently-active-preview-features) preview feature to manage multiple schema files, unless a generator reads the schema manually.
+
+:::
+
 The following is a list of community created generators. 
 
 - [`prisma-dbml-generator`](https://notiz.dev/blog/prisma-dbml-generator/): Transforms the Prisma schema into [Database Markup Language](https://dbml.dbdiagram.io/home/) (DBML) which allows for an easy visual representation

diff --git a/...-client/000-setup-and-configuration/050-databases-connections/200-pgbouncer.mdx b/...-client/000-setup-and-configuration/050-databases-connections/200-pgbouncer.mdx
@@ -30,7 +30,7 @@ To use Prisma Client with PgBouncer, add the `?pgbouncer=true` flag to the Postg
 
 ```shell
 postgresql://USER:PASSWORD@HOST:PORT/DATABASE?pgbouncer=true
-``` ```
+```
 
 :::info
 `PORT` specified for PgBouncer pooling is sometimes different from the default `5432` port. Check your database provider docs for the correct port number.
-Original file line number
+Diff line change
@@ Expand Up @@
     ```shell
     postgresql://USER:PASSWORD@HOST:PORT/DATABASE?pgbouncer=true
-    ``` ```
+    ```
     :::info
     `PORT` specified for PgBouncer pooling is sometimes different from the default `5432` port. Check your database provider docs for the correct port number.
@@ Expand Down @@