Merge branch 'current' into mwong-macro-yml

website/docs/docs/build/semantic-models.md

@@ -9,9 +9,7 @@ tags: [Metrics, Semantic Layer]
 pagination_next: "docs/build/dimensions"
 ---
 
-import PropsCallout from '/snippets/_config-prop-callout.md';
-
-Semantic models serve as the foundation for defining data in MetricFlow, which powers the dbt Semantic Layer. You can think of semantic models as nodes in your semantic graph, connected via entities as edges. MetricFlow takes semantic models defined in YAML configuration files as inputs and creates a semantic graph that can be used to query metrics.
+Semantic models are the foundation for data definition in MetricFlow, which powers the dbt Semantic Layer:
 
 - Think of semantic models as nodes connected by entities in a semantic graph.
 - MetricFlow uses YAML configuration files to create this graph for querying metrics.
@@ -20,19 +18,7 @@ Semantic models serve as the foundation for defining data in MetricFlow, which p
 - Configure semantic models in a YAML file within your dbt project directory.
 - Organize them under a `metrics:` folder or within project sources as needed. 
 
-<VersionBlock firstVersion="1.7">
-
-You can configure semantic models in your dbt project directory in a [`properties.yml` file](/reference/configs-and-properties#where-can-i-define-properties). Depending on your project structure, you can nest semantic models under a `metrics:` folder or organize them under project sources. 
-
-</VersionBlock>
-
-<VersionBlock lastVersion="1.6">
-
-You can configure semantic models in your dbt project directory in a [`properties.yml` file](/reference/configs-and-properties#where-can-i-define-properties), however, you cannot actually define their properties within the `dbt_project.yml` file. <PropsCallout title={frontMatter.title}/> 
-
-Depending on your project structure, you can nest semantic models under a `metrics:` folder or organize them under project sources.
-
-</VersionBlock>
+<Lightbox src="/img/docs/dbt-cloud/semantic-layer/semantic_foundation.jpg" width="70%" title="A semantic model is made up of different components: Entities, Measures, and Dimensions."/>
 
 Semantic models have 6 components and this page explains the definitions with some examples:
 

website/docs/reference/dbt_project.yml.md

@@ -20,10 +20,87 @@ Starting from dbt v1.5 and higher, you can specify your dbt Cloud project ID in
 dbt uses YAML in a few different places. If you're new to YAML, it would be worth taking the time to learn how arrays, dictionaries, and strings are represented.
 :::
 
+
 Something to note, you can't set up a "property" in the `dbt_project.yml` file if it's not a config (an example is [macros](/reference/macro-properties)). This applies to all types of resources. Refer to [Configs and properties](/reference/configs-and-properties) for more detail.
 
 The following example is a list of all available configurations in the `dbt_project.yml` file:
 
+
+<VersionBlock firstVersion="1.6">
+
+<File name='dbt_project.yml'>
+
+```yml
+[name](/reference/project-configs/name): string
+
+[config-version](/reference/project-configs/config-version): 2
+[version](/reference/project-configs/version): version
+
+[profile](/reference/project-configs/profile): profilename
+
+[model-paths](/reference/project-configs/model-paths): [directorypath]
+[seed-paths](/reference/project-configs/seed-paths): [directorypath]
+[test-paths](/reference/project-configs/test-paths): [directorypath]
+[analysis-paths](/reference/project-configs/analysis-paths): [directorypath]
+[macro-paths](/reference/project-configs/macro-paths): [directorypath]
+[snapshot-paths](/reference/project-configs/snapshot-paths): [directorypath]
+[docs-paths](/reference/project-configs/docs-paths): [directorypath]
+[asset-paths](/reference/project-configs/asset-paths): [directorypath]
+
+[target-path](/reference/project-configs/target-path): directorypath
+[log-path](/reference/project-configs/log-path): directorypath
+[packages-install-path](/reference/project-configs/packages-install-path): directorypath
+
+[clean-targets](/reference/project-configs/clean-targets): [directorypath]
+
+[query-comment](/reference/project-configs/query-comment): string
+
+[require-dbt-version](/reference/project-configs/require-dbt-version): version-range | [version-range]
+
+[dbt-cloud](/docs/cloud/cloud-cli-installation):
+  [project-id](/docs/cloud/configure-cloud-cli#configure-the-dbt-cloud-cli): project_id # Required
+  [defer-env-id](/docs/cloud/about-cloud-develop-defer#defer-in-dbt-cloud-cli): environment_id # Optional
+
+[quoting](/reference/project-configs/quoting):
+  database: true | false
+  schema: true | false
+  identifier: true | false
+
+models:
+  [<model-configs>](/reference/model-configs)
+
+seeds:
+  [<seed-configs>](/reference/seed-configs)
+
+snapshots:
+  [<snapshot-configs>](/reference/snapshot-configs)
+
+sources:
+  [<source-configs>](source-configs)
+
+tests:
+  [<test-configs>](/reference/test-configs)
+
+vars:
+  [<variables>](/docs/build/project-variables)
+
+[on-run-start](/reference/project-configs/on-run-start-on-run-end): sql-statement | [sql-statement]
+[on-run-end](/reference/project-configs/on-run-start-on-run-end): sql-statement | [sql-statement]
+
+[dispatch](/reference/project-configs/dispatch-config):
+  - macro_namespace: packagename
+    search_order: [packagename]
+
+[restrict-access](/docs/collaborate/govern/model-access): true | false
+
+```
+
+</File>
+</VersionBlock>
+
+<VersionBlock lastVersion="1.5">
+
+
 <File name='dbt_project.yml'>
 
 ```yml

website/docs/reference/resource-configs/docs.md

@@ -33,6 +33,7 @@ models:
   - name: model_name
     docs:
       show: true | false
+      node_color: "black"
 ```
 
 </File>