Merge branch 'current' into v5-schema

dbt-labs · Nov 14, 2023 · b44d5c4 · b44d5c4
2 parents 4c6ff0e + 242b54e
commit b44d5c4
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 49 deletions.
diff --git a/website/docs/reference/resource-configs/enabled.md b/website/docs/reference/resource-configs/enabled.md
@@ -20,6 +20,17 @@ default_value: true
 }>
 <TabItem value="models">
 
+<File name='dbt_project.yml'>
+
+```yml
+models:
+  [<resource-path>](/reference/resource-configs/resource-path):
+    +enabled: true | false
+
+```
+
+</File>
+
 <File name='models/<modelname>.sql'>
 
 ```sql
@@ -35,10 +46,15 @@ select ...
 
 </File>
 
+</TabItem>
+
+
+<TabItem value="seeds">
+
 <File name='dbt_project.yml'>
 
 ```yml
-models:
+seeds:
   [<resource-path>](/reference/resource-configs/resource-path):
     +enabled: true | false
 
@@ -48,24 +64,19 @@ models:
 
 </TabItem>
 
-
-<TabItem value="seeds">
+<TabItem value="snapshots">
 
 <File name='dbt_project.yml'>
 
 ```yml
-seeds:
+snapshots:
   [<resource-path>](/reference/resource-configs/resource-path):
     +enabled: true | false
 
 ```
 
 </File>
 
-</TabItem>
-
-<TabItem value="snapshots">
-
 <File name='snapshots/<filename>.sql'>
 
 ```sql
@@ -83,21 +94,21 @@ select ...
 
 </File>
 
+</TabItem>
+
+<TabItem value="tests">
+
 <File name='dbt_project.yml'>
 
 ```yml
-snapshots:
+tests:
   [<resource-path>](/reference/resource-configs/resource-path):
     +enabled: true | false
 
 ```
 
 </File>
 
-</TabItem>
-
-<TabItem value="tests">
-
 <File name='tests/<filename>.sql'>
 
 ```sql
@@ -125,17 +136,6 @@ select ...
 
 </File>
 
-<File name='dbt_project.yml'>
-
-```yml
-tests:
-  [<resource-path>](/reference/resource-configs/resource-path):
-    +enabled: true | false
-
-```
-
-</File>
-
 </TabItem>
 
 <TabItem value="sources">

diff --git a/website/docs/reference/resource-configs/group.md b/website/docs/reference/resource-configs/group.md
@@ -29,26 +29,29 @@ Support for grouping models was added in dbt Core v1.5
 
 <VersionBlock firstVersion="1.5">
 
-<File name='models/schema.yml'>
+<File name='dbt_project.yml'>
 
 ```yml
-version: 2
-
 models:
-  - name: MODEL_NAME
-    group: GROUP_NAME
+
+  [<resource-path>](resource-path):
+    +group: GROUP_NAME
+
 ```
 
+
 </File>
 
-<File name='dbt_project.yml'>
+<File name='models/schema.yml'>
 
 ```yml
+version: 2
+
 models:
-  [<resource-path>](resource-path):
-    +group: GROUP_NAME
-```
+  - name: MODEL_NAME
+    group: GROUP
 
+```
 
 </File>
 
@@ -277,23 +280,27 @@ Support for grouping semantic models has been added in dbt Core v1.7.
 
 <VersionBlock firstVersion="1.7">
 
-<File name='models/semantic_models.yml'>
+<File name='dbt_project.yml'>
 
 ```yaml
-semantic_models:
-  - name: SEMANTIC_MODEL_NAME
-    group: GROUP_NAME
+
+semantic-models:
+  [<resource-path>](resource-path):
+    [+](plus-prefix)group: GROUP_NAME
 
 ```
 
 </File>
 
-<File name='dbt_project.yml'>
+<File name='models/semantic_models.yml'>
 
 ```yaml
-semantic-models:
-  [<resource-path>](resource-path):
-    [+](plus-prefix)group: GROUP_NAME
+
+semantic_models:
+  - name: SEMANTIC_MODEL_NAME
+    group: GROUP_NAME
+
+
 ```
 
 </File>

diff --git a/website/snippets/core-versions-table.md b/website/snippets/core-versions-table.md
@@ -12,11 +12,3 @@
 | [**v1.0**](/docs/dbt-versions/core-upgrade/upgrading-to-v1.0) ⚠️ | Dec 3, 2021     | Deprecated ⛔️  | Deprecated ⛔️           | 
 |  **v0.X** ⛔️                                               | (Various dates) | Deprecated ⛔️  | Deprecated ⛔️            | 
 _*All versions of dbt Core since v1.0 are available in dbt Cloud until further notice. Versions that are EOL do not receive any fixes. For the best support, we recommend upgrading to a version released within the past 12 months._
-### Planned future releases
-
-_Future release dates are tentative and subject to change._
-
-| dbt Core | Planned Release | Critical & dbt Cloud Support Until  |
-|----------|-----------------|-------------------------------------|
-| **v1.8** | _Jan 2024_      | _Jan 2025_                          |
-| **v1.9** | _Apr 2024_      | _Apr 2025_                          |