Resolve merge conflict

.github/pull_request_template.md

@@ -10,7 +10,7 @@ To learn more about the writing conventions used in the dbt Labs docs, see the [
 <!--
 Uncomment if you're publishing docs for a prerelease version of dbt (delete if not applicable):
 - [ ] Add versioning components, as described in [Versioning Docs](https://github.com/dbt-labs/docs.getdbt.com/blob/current/contributing/single-sourcing-content.md#versioning-entire-pages)
-- [ ] Add a note to the prerelease version [Migration Guide](https://github.com/dbt-labs/docs.getdbt.com/tree/current/website/docs/guides/migration/versions)
+- [ ] Add a note to the prerelease version [Migration Guide](https://github.com/dbt-labs/docs.getdbt.com/tree/current/website/docs/docs/dbt-versions/core-upgrade)
 -->
 - [ ] Review the [Content style guide](https://github.com/dbt-labs/docs.getdbt.com/blob/current/contributing/content-style-guide.md) and [About versioning](https://github.com/dbt-labs/docs.getdbt.com/blob/current/contributing/single-sourcing-content.md#adding-a-new-version) so my content adheres to these guidelines.
 - [ ] Add a checklist item for anything that needs to happen before this PR is merged, such as "needs technical review" or "change base branch."

.github/workflows/crawler.yml

@@ -0,0 +1,33 @@
+name: Algolia Crawler
+on:
+  pull_request:
+    types: 
+      - closed
+
+jobs:
+  algolia_recrawl:
+    # Comment out the if check below if running on every merge to current branch
+    if: |
+      contains(github.event.pull_request.labels.*.name, 'trigger-crawl') 
+      && github.event.pull_request.merged == true
+    name: Trigger Algolia Crawl
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout repo
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      # Wait 8 minutes to allow Vercel build to complete
+      - run: sleep 480
+
+      # Once deploy URL is found, trigger Algolia crawl
+      - name: Run Algolia Crawler
+        uses: algolia/algoliasearch-crawler-github-actions@v1
+        id: crawler_push
+        with:
+          crawler-user-id: ${{ secrets.CRAWLER_USER_ID }}
+          crawler-api-key: ${{ secrets.CRAWLER_API_KEY }}
+          algolia-app-id: ${{ secrets.ALGOLIA_APP_ID }}
+          algolia-api-key: ${{ secrets.ALGOLIA_API_KEY }}
+          site-url: 'https://docs.getdbt.com'
+          crawler-name: ${{ secrets.CRAWLER_NAME }}

contributing/content-style-guide.md

@@ -229,7 +229,7 @@ When referring to different sections of the IDE, use the name of the section and
 
 People make use of titles in many places like table headers, section headings (such as an H2, H3, or H4), page titles, sidebars, and so much more.
 
-When generating titles or updating them, use sentence case. It sets a more conversational tone to the docs—making the content more approachable and creating a friendly feel.
+When generating titles or updating them, use sentence case. It sets a more conversational tone to the docs— making the content more approachable and creating a friendly feel.
 
 We've defined five content types you can use when contributing to the docs (as in, writing or authoring). Learn more about title guidelines for [each content type](https://github.com/dbt-labs/docs.getdbt.com/blob/current/contributing/content-types.md).
 
@@ -239,7 +239,7 @@ Placeholder text is something that the user should replace with their own text.
 
 Use all capital letters([screaming snake case](https://fission.codes/blog/screaming-snake-case/)) to indicate text that changes in the user interface or that the user needs to supply in a command or code snippet. Avoid surrounding it in brackets or braces, which someone might copy and use, producing an error.
 
-Identify what the user should replace the placeholder text with in the paragraph preceding the code snippet or command.
+Identify what the user should replace the placeholder text within the paragraph preceding the code snippet or command.
 
 :white_check_mark: The following is an example of configuring a connection to a Redshift database. In your YAML file, you must replace `CLUSTER_ID` with the ID assigned to you during setup:
 
@@ -276,7 +276,7 @@ Guidelines for making lists are:
 - There are at least two items.
 - All list items follow a consistent, grammatical structure (like each item starts with a verb, each item begins with a capitalized word, each item is a sentence fragment).
 - Lists items don't end in commas, semicolons, or conjunctions (like "and", "or"). However, you can use periods if they’re complete sentences.
-- Introduce the list with a heading or, if it's within text, as a complete sentence or as a sentence fragment followed by a colon.
+- Introduce the list with a heading or, if it's within the text, as a complete sentence or as a sentence fragment followed by a colon.
 
 If the list starts getting lengthy and dense, consider presenting the same content in a different format such as a table, as separate subsections, or a new guide.
 
@@ -286,7 +286,7 @@ A bulleted list with introductory text:
 
 > A dbt project is a directory of `.sql` and .yml` files. The directory must contain at a minimum:
 >
-> - Models: A model is a single `.sql` file. Each model contains a single `select` statement that either transforms raw data into a dataset that is ready for analytics, or, more often, is an intermediate step in such a transformation.
+> - Models: A model is a single `.sql` file. Each model contains a single `select` statement that either transforms raw data into a dataset that is ready for analytics or, more often, is an intermediate step in such a transformation.
 > - A project file: A `dbt_project.yml` file, which configures and defines your dbt project.
 
 A bulleted list with sentence fragments:
@@ -307,10 +307,10 @@ A numbered list following an H2 heading:
 ## Tables
 Tables provide a great way to present complex information and can help the content be more scannable for users, too.
 
-There are many ways to construct a table, like row spanning and cell splitting. Make sure the content is clear, concise, and presents well on the web page (like avoid awkward word wrapping).
+There are many ways to construct a table, such as row spanning and cell splitting. The content should be clear, concise, and presented well on the web page (for example, avoid awkward word wrapping).
 
 Guidelines for making tables are:
-- Introduce the table with a heading or, if it's within text, as a complete sentence or as a sentence fragment followed by a colon.
+- Introduce the table with a heading or, if it's within the text, as a complete sentence or as a sentence fragment followed by a colon.
 - Use a header row
 - Use sentence case for all content, including the header row
 - Content can be complete sentences, sentence fragments, or single words (like `Currency`)
@@ -338,7 +338,7 @@ A table following an H3 heading:
 > | Name | Description | Values |
 > | -----| ----------- | ------ |
 > | `-help` | Displays information on how to use the command. | Doesn't take any values. |
-> | `-readable` | Print output in human readable format. | <ul><li>`true`</li><li>`false`</li></ul> |
+> | `-readable` | Print output in human-readable format. | <ul><li>`true`</li><li>`false`</li></ul> |
 > | `-file` | Print output to file instead of stdout. | Name of the file. |
 
 ## Cards
@@ -349,7 +349,7 @@ You can configure a card in 2, 3, 4, or 5-column grids. To maintain a good user
 
 There won't be many instances where you need to display 4 or 5 cards on the docs site. While we recommend you use 2 or 3-column grids, you can use 4 or 5-column grids in the following scenarios:
 
-- For cards that contain little text and limited to under 15 words. (This is to make sure the text isn't squished)
+- For cards that contain little text and are limited to 15 words or less. This is to make sure the text isn't squished.
 - Always have the `hide_table_of_contents:` frontmatter set to `true` (This hides the right table of contents). 
 
 Otherwise, the text will appear squished and provide users with a bad experience.
@@ -371,16 +371,16 @@ To create cards in markdown, you need to:
 - Add the props within the card component, including `title`,`body`,`link`,`icon`.
 - Close out the div by using `</div>`
 
-Refer to the following prop list for detailed explanation and examples:
+Refer to the following prop list for detailed explanations and examples:
 
 | Prop | Type | Info | Example |
 | ---- | ---- | ---- | ------- |
 | `title` | required | The title should be clear and explain an action the user should take or a product/feature. | `title: dbt Cloud IDE`
 | `body` | required | The body contains the actionable or informative text for the user. You can include `<a href="` link within the body of the text. However, if you do this, you must not include the `link` prop set as that'll override any `<a href's` within the body text.  | `body="The IDE is the easiest and most efficient way to develop dbt models`
 | `link` | optional | Add a link to the entire card component so when users click on the card, it'll trigger the link. Adding a link prop means it'll override any links within the body and if users click on the card, they'll be directed to the link set by the link prop. | `link="/docs/cloud/dbt-cloud-ide/develop-in-the-cloud`
-| `icon` | optional but recommended | You can add an icon to the card comonent by using any icons found in the [icons](https://github.com/dbt-labs/docs.getdbt.com/tree/current/website/static/img/icons) directory. <br /> * Icons are added in .svg format and you must add icons in two locations: website/static/img/icons and website/static/img/icons/white. This is so users can view the icons in dark or light mode on the docs.getdbt.com site. | ` icon="pencil-paper"/>` |
+| `icon` | optional but recommended | You can add an icon to the card component by using any icons found in the [icons](https://github.com/dbt-labs/docs.getdbt.com/tree/current/website/static/img/icons) directory. <br /> * Icons are added in .svg format and you must add icons in two locations: website/static/img/icons and website/static/img/icons/white. This is so users can view the icons in dark or light mode on the docs.getdbt.com site. | ` icon="pencil-paper"/>` |
 
-The following is an example of a 4 card column:
+The following is an example of a 4-card column:
 
 ```
 <div className="grid--4-col">
@@ -488,9 +488,16 @@ Avoid ending a sentence with a preposition unless the rewritten sentence would s
 
 Product names, trademarks, services, and tools should be written as proper nouns, unless otherwise specified by the company or trademark owner.
 
+As of October 2023, avoid using "dbt CLI" or "CLI" terminology when referring to the dbt Cloud CLI or dbt Core.  However, if referring to the command line as a tool, CLI is acceptable.
+
+dbt officially provides two command line tools for running dbt commands:
+
+- [dbt Cloud CLI](/docs/cloud/cloud-cli-installation) &mdash; This tool allows you to develop locally and execute dbt commands against your dbt Cloud development environment from your local command line.
+- [dbt Core](https://github.com/dbt-labs/dbt-core) &mdash; This open-source tool is designed for local installation, enabling you to use dbt Core on the command line and communicate with databases through adapters.
+
 ### Terms to use or avoid
 
-Use industry-specific terms and research new/improved terminology. Also refer to the Inclusive Language section of this style guide for inclusive and accessible language and style. 
+Use industry-specific terms and research new/improved terminology. Also, refer to the Inclusive Language section of this style guide for inclusive and accessible language and style. 
 
 **DO NOT** use jargon or language familiar to a small subset of readers or assume that your readers understand ALL technical terms.
 
@@ -507,11 +514,13 @@ sign in | log in, login
 sign up | signup
 terminal | shell
 username | login
+dbt Cloud CLI | CLI, dbt CLI
+dbt Core | CLI, dbt CLI
 </div></b>
 
 ## Links
 
-Links embedded in documentation are about trust. Users trust that we will lead them to sites or pages related to their reading content. In order to maintain that trust, it's important that links are transparent, up-to-date, and lead to legitimate resources.
+Links embedded in the documentation are about trust. Users trust that we will lead them to sites or pages related to their reading content. In order to maintain that trust, it's important that links are transparent, up-to-date, and lead to legitimate resources.
 
 ### Internal links
 

website/blog/2021-11-23-how-to-upgrade-dbt-versions.md

@@ -62,7 +62,7 @@ As noted above, the project is on 0.16.0 right now. 0.17.2 is the final patch re
 >
 > Practically, it also lets you lock in "checkpoints" of known-stable setups. If you need to pause your migration work to deal with an urgent request, you can safely deploy what you've finished so far instead of having a bunch of unrelated half-finished changes.
 
-Review the migration guides to get an initial indication of what changes you might need to make. For example, in [the migration guide for 0.17.0](/guides/migration/versions), there are several significant changes to dbt's functionality, but it's unlikely that all of them will apply to your project. We'll cover this more later.
+Review the migration guides to get an initial indication of what changes you might need to make. For example, in [the migration guide for 0.17.0](/docs/dbt-versions/core-upgrade), there are several significant changes to dbt's functionality, but it's unlikely that all of them will apply to your project. We'll cover this more later.
 
 ## Step 2: `Add require-dbt-version` to your `dbt_project.yml` file.
 
@@ -126,9 +126,9 @@ In this case, our example project probably has dbt 0.3.0 installed. By reviewing
 
 ### Step 5b. Fix errors, then warnings
 
-Obviously, errors that stop you from running your dbt project at all are the most important to deal with. Let's assume that our project used a too-broadly-scoped variable in a macro file, support for which was removed in v0.17. The [migration guide explains what to do instead](/guides/migration/versions), and it's a pretty straightforward fix.
+Obviously, errors that stop you from running your dbt project at all are the most important to deal with. Let's assume that our project used a too-broadly-scoped variable in a macro file, support for which was removed in v0.17. The [migration guide explains what to do instead](/docs/dbt-versions/core-upgrade), and it's a pretty straightforward fix.
 
-Once your errors are out of the way, have a look at warnings. For example, 0.17 introduced `config-version: 2` to `dbt_project.yml`. Although it's backwards compatible for now, we know that support for the old version will be removed in a future version of dbt so we might as well deal with it now. Again, the migration guide explains [what we need to do](/guides/migration/versions), and how to take full advantage of the new functionality in the future.
+Once your errors are out of the way, have a look at warnings. For example, 0.17 introduced `config-version: 2` to `dbt_project.yml`. Although it's backwards compatible for now, we know that support for the old version will be removed in a future version of dbt so we might as well deal with it now. Again, the migration guide explains [what we need to do](/docs/dbt-versions/core-upgrade), and how to take full advantage of the new functionality in the future.
 
 ### Stay focused
 

website/blog/2022-08-31-august-product-update.md

@@ -22,7 +22,7 @@ You’ll hear more in [Tristan’s keynote](https://coalesce.getdbt.com/agenda/k
 
 ## **What's new**
 
-- **dbt Core v1.3 beta:** Do you use Python for analytics? The first beta prerelease of dbt Core v1.3—including support for dbt models written in Python—is [ready to explore](https://docs.getdbt.com/guides/migration/versions/upgrading-to-v1.3)! Check it out, and read more about dbt supported Python models [in our docs](/docs/build/python-models).
+- **dbt Core v1.3 beta:** Do you use Python for analytics? The first beta prerelease of dbt Core v1.3—including support for dbt models written in Python—is [ready to explore](https://docs.getdbt.com/docs/dbt-versions/core-upgrade/upgrading-to-v1.3)! Check it out, and read more about dbt supported Python models [in our docs](/docs/build/python-models).
 - **Technology Partner Program:** We just launched our new [Technology Partner Program](https://www.getdbt.com/blog/dbt-labs-technology-partner-program/) with 40+ friends in the Modern Data Stack to provide consistent support for seamless integrations joint-users can trust. Check our new [dbt Cloud integrations page](http://www.getdbt.com/product/integrations) for what’s available today!
 - **Single-tenant users:** dbt Cloud v1.1.60 is now available on dbt Cloud Enterprise.
 

website/dbt-versions.js

@@ -1,8 +1,7 @@
 exports.versions = [
   {
     version: "1.7",
-    EOLDate: "2024-07-31",
-    isPrerelease: "true"
+    EOLDate: "2024-10-30",
   },
   {
     version: "1.6",

website/docs/docs/build/project-variables.md

@@ -28,7 +28,7 @@ Jinja is not supported within the `vars` config, and all values will be interpre
 :::info New in v0.17.0
 
 The syntax for specifying vars in the `dbt_project.yml` file has changed in
-dbt v0.17.0. See the [migration guide](/guides/migration/versions)
+dbt v0.17.0. See the [migration guide](/docs/dbt-versions/core-upgrade)
 for more information on these changes.
 
 :::

website/docs/docs/cloud/about-cloud/regions-ip-addresses.md

@@ -25,3 +25,13 @@ dbt Cloud is [hosted](/docs/cloud/about-cloud/architecture) in multiple regions
 There are two ways to view your dbt Cloud IP addresses:
 - If no projects exist in the account, create a new project, and the IP addresses will be displayed during the **Configure your environment** steps.
 - If you have an existing project, navigate to **Account Settings** and ensure you are in the **Projects** pane. Click on a project name, and the **Project Settings** window will open. Locate the **Connection** field and click on the name. Scroll down to the **Settings**, and the first text block lists your IP addresses. 
+
+### Static IP addresses
+
+dbt Cloud, like many cloud services, relies on underlying AWS cloud infrastructure for operations. While we can offer static URLs for access, we cannot provide a list of IP addresses to configure connections due to the nature of AWS cloud services.
+
+* Dynamic IP addresses — dbt Cloud infrastructure uses Amazon Web Services (AWS). dbt Cloud offers static URLs for streamlined access, but the dynamic nature of cloud services means the underlying IP addresses change occasionally. AWS manages the IP ranges and may change them according to their operational and security needs.
+
+* Using hostnames for consistent access — To ensure uninterrupted access, we recommend that you dbt Cloud services using hostnames. Hostnames provide a consistent reference point, regardless of any changes in underlying IP addresses. We are aligning with an industry-standard practice employed by organizations such as Snowflake.
+
+* Optimizing VPN connections &mdash: You should integrate a proxy alongside VPN for users who leverage VPN connections. This strategy enables steady IP addresses for your connections, facilitating smooth traffic flow through the VPN and onward to dbt Cloud. By employing a proxy and a VPN, you can direct traffic through the VPN and then to dbt Cloud. It's crucial to set up the proxy if you need to integrate with additional services.

website/docs/docs/cloud/manage-access/set-up-sso-saml-2.0.md

@@ -89,7 +89,7 @@ them to complete setup in dbt Cloud.
 
 ### Finish setup
 
-After creating the Okta application, follow the instructions in the [dbt Cloud Setup](#dbt-cloud-setup)
+After creating the application, follow the instructions in the [dbt Cloud Setup](#dbt-cloud-setup)
 section to complete the integration.
 
 ## Okta integration

website/docs/docs/cloud/secure/about-privatelink.md

@@ -5,6 +5,10 @@ description: "Configuring PrivateLink for AWS"
 sidebar_label: "About PrivateLink"
 ---
 
+import SetUpPages from '/snippets/_available-tiers-privatelink.md';
+
+<SetUpPages features={'/snippets/_available-tiers-privatelink.md'}/>
+
 PrivateLink enables a private connection from any dbt Cloud Multi-Tenant environment to your data platform hosted on AWS using [AWS PrivateLink](https://aws.amazon.com/privatelink/) technology. PrivateLink allows dbt Cloud customers to meet security and compliance controls as it allows connectivity between dbt Cloud and your data platform without traversing the public internet. This feature is supported in most regions across NA, Europe, and Asia, but [contact us](https://www.getdbt.com/contact/) if you have questions about availability. 
 
 ### Cross-region PrivateLink