resolve merge conflict

Author: commit111

blog/2024-02-12-announcing-defang-public-beta.md

@@ -12,7 +12,7 @@ Ever since we shipped our Private Beta in the summer of 2023, we have been worki
 
 And so, today with our Public Beta, we are addressing this request. With today’s release of [Defang BYOC](https://docs.defang.io/docs/concepts/defang-byoc) (Bring-your-own-Cloud), you can now enjoy all the benefits of Defang **and** deploy applications to your own AWS account! Our Private Beta experience is still available as [Defang Playground](https://docs.defang.io/docs/concepts/defang-playground) for you to quickly and easily prototype applications and deploy them to our hosted environment.
 
-You can learn more about Defang [here](https://docs.defang.io/docs/intro). Also check out our [tutorials](https://docs.defang.io/docs/category/tutorials), [samples](https://docs.defang.io/docs/samples), and [FAQ](https://docs.defang.io/docs/faq) to know more.
+You can learn more about Defang [here](https://docs.defang.io/docs/intro). Also check out our [tutorials](https://docs.defang.io/docs/category/tutorials), [samples](https://docs.defang.io/docs/samples), and [FAQ](https://docs.defang.io/docs/category/faq) to know more.
 
 **Try the Public Beta!**
 

blog/2024-08-30-august-product-updates.md

@@ -6,7 +6,7 @@ tags:
     Cloud,
     NoDevOps,
     BYOC,
-    Digital Ocean,
+    DigitalOcean,
     CLI,
     AI,
     Debugging,
@@ -64,7 +64,7 @@ Register here!
 We're working on a number of new features to make Defang even better. Here are some of the most exciting ones:
 
 - **Managed Postgres**: We're working on getting Defang to provision managed Postgres services for you, so you can easily store and query data in your applications.
-- **Digital Ocean BYOC**: We're working on adding Digital Ocean BYOC to give you even more choice over where you deploy your applications.
+- **DigitalOcean BYOC**: We're working on adding DigitalOcean BYOC to give you even more choice over where you deploy your applications.
 
 ---
 

blog/2024-09-30-september-product-updates.md

@@ -7,7 +7,7 @@ tags:
     NoDevOps,
     BYOC,
     Postgres,
-    Digital Ocean,
+    DigitalOcean,
     CLI,
     AI,
     Debugging,
@@ -49,7 +49,8 @@ Also in Sep, Defang was included in the [Google for Startups Accelerator Canada.
 
 ## Defang Coffee Chat
 
-Mark your calendars! If you’re eager to learn more about what’s coming next, join us for our Defang Coffee Chat on Oct 23rd. We’ll be sharing our future roadmap, answering your questions, and gathering your feedback.
+Mark your calendars! If you’re eager to learn more about what’s coming next, join us for our Defang Coffee Chat on Oct 23rd 2024.
+We’ll be sharing our future roadmap, answering your questions, and gathering your feedback.
 
 <Button href="https://lu.ma/hlnq84xq" variant="contained" size="large" target="_blank">
 Register here!

blog/2024-11-13-october-product-updates.md

@@ -7,7 +7,7 @@ tags:
     NoDevOps,
     BYOC,
     Postgres,
-    Digital Ocean,
+    DigitalOcean,
     AWS,
     CLI,
     AI,
@@ -57,12 +57,13 @@ The team is now heads-down dotting the i’s and crossing the t’s so we can re
 
 ## Defang Coffee Chat ☕
 
-If you're excited about what's coming next and want to hear more about our vision for the future, join us for our Coffee Chat on November 27th. We'll be sharing more about our roadmap and what we're working on next.
+If you're excited about what's coming next and want to hear more about our vision for the future, join us for our Coffee Chat on November 27th 2024.
+We'll be sharing more about our roadmap and what we're working on next.
 
 <Button href="https://lu.ma/4n54sy2v" variant="contained" size="large" target="_blank">
 Register here!
 </Button>
 
 ---
 
-As always, we appreciate your feedback and are committed to making Defang the easiest way to develop, deploy, and debug your cloud applications. Go build something awesome! 🚀
+As always, we appreciate your feedback and are committed to making Defang the easiest way to develop, deploy, and debug your cloud applications. Go build something awesome! 🚀

docs/concepts/_category_.json

@@ -1,9 +1,8 @@
 {
   "label": "Concepts",
-  "position": 300,
+  "position": 500,
   "link": {
     "type": "generated-index",
     "description": "Some concepts to help explain how the Defang system is organized and tooling that will help you manage your applications."
   }
 }
-

docs/concepts/debug.md

@@ -6,10 +6,10 @@ sidebar_position: 650
 
 # Debug
 
-Defang includes an AI-driven tool to help you debug your cloud applications. The AI assistant will use your service logs as well as the files in your project to help you identify and resolve issues.
+Defang includes an AI-driven tool to help you debug your cloud applications. The AI agent will use your service logs as well as the files in your project to help you identify and resolve issues.
 
 :::warning
-The AI debugging assistant is currently in preview and is currently limited in its capabilities. We plan to expand the capabilities of the AI assistant in the future.
+The AI debugging agent is currently in preview and is currently limited in its capabilities. We plan to expand the capabilities of the AI agent in the future.
 :::
 
 ## How it works

docs/concepts/defang-byoc.md

@@ -29,10 +29,6 @@ $ export DEFANG_PROVIDER=digitalocean
 
 ## AWS
 
-:::info
-The Public Beta of the v1 Defang BYOC AWS Provider is released as of Feb 1 2024.
-:::
-
 Please read the [AWS Provider](../providers/aws/aws.md) documentation for more details about how the AWS provider works and how to get started.
 
 ## DigitalOcean

docs/concepts/deployment-modes.md

@@ -0,0 +1,25 @@
+---
+title: Defang Deployment Modes
+description: Defang provides three deployment modes which allow you to balance cost and resiliency.
+sidebar_position: 501
+---
+
+# Defang Deployment Modes
+
+Defang provides three deployment modes: development, staging, and production. These modes allow you to balance cost and resiliency according to your needs.
+
+* **Development**: This mode is used for development and testing purposes. It typically involves less stringent resource allocations and may include debugging tools and verbose logging to aid in development.
+* **Staging**: This mode serves as a pre-production environment where applications are tested in conditions that closely mimic production. It helps in identifying issues that might not be apparent in the development environment.
+* **Production**: This mode is used for live deployments. It involves optimized configurations for performance, security, and reliability. Resource allocations are typically higher, and debugging tools are minimized to ensure stability.
+
+## Deployment Mode Comparison
+
+| Feature | Development | Staging | Production |
+|-|-|-|-|
+| Build Resources | Builds will be run with 2x vCPUs | Builds will be run with 2x vCPUs | Builds will be run with 4x vCPUs |
+| Databases | Defang will provision resources optimized for burstable memory | | Defang will provision resources optimized for production |
+| Static Resources | | | Defang will provision a CDN |
+| Deployment | Previous deployments will be spun down before new deployments are spun up. | | Rolling updates will be used to deploy new versions. Defang will gradually replace services while maintaining at least the original number of replicas. |
+| Logging | Logs retained for 1 day to save costs. | | Logs retained for 30 days for compliance. |
+| Networking | | | Defang will provision a NAT gateway. |
+| DNS | Defang will provision shorter TTLs | | Defang will provision longer TTLs |

docs/concepts/generate.md

@@ -6,17 +6,17 @@ sidebar_position: 100
 
 # Generate
 
-Defang includes an AI-driven assistant that translates natural language prompts to an outline for your project that you can then refine. The AI assistant is available through the [Defang CLI](../getting-started/installing.md).
+Defang includes an AI-driven agent that translates natural language prompts to an outline for your project that you can then refine. The AI agent is available through the [Defang CLI](../getting-started/installing.md).
 
 :::info
-The AI assistant is currently in preview and only supports a limited set of prompts, varying in complexity. We plan to expand the capabilities of the AI assistant in the future.
+The AI agent is currently in preview and only supports a limited set of prompts, varying in complexity. We plan to expand the capabilities of the AI agent in the future.
 :::
 
-We are working on expanding the range of supported prompts and improving the accuracy of the AI assistant. If you have any feedback or suggestions, please let us know by [opening an issue](https://github.com/DefangLabs/defang/issues/new).
+We are working on expanding the range of supported prompts and improving the accuracy of the AI agent. If you have any feedback or suggestions, please let us know by [opening an issue](https://github.com/DefangLabs/defang/issues/new).
 
 ## Example Prompts
 
-Here are some example prompts that the AI assistant can help you with:
+Here are some example prompts that the AI agent can help you with:
 
 ```
 A basic service with 2 REST endpoints. The default endpoint will be for health check and should return a JSON object like this: { "status": "OK" }. The /echo endpoint will echo back all request parameters in the response.

docs/concepts/managed-storage/managed-postgres.md

@@ -38,6 +38,9 @@ You can also set the following optional environment variables to configure the m
 You can connect to the managed Postgres instance using the name of your service as the hostname, `POSTGRES_USER`, `POSTGRES_DB`, and `POSTGRES_PASSWORD` environment variables.
 
 ### Example
+:::info 
+For a smoother experience with Defang, we recommend using Postgres 14 for your container images. This version provides easier access and improved usability.
+:::
 
 ```yaml
   app:
@@ -55,7 +58,7 @@ You can connect to the managed Postgres instance using the name of your service
       # reference config variables by using ${<config name>}
       CONNECTURL: postgresql://postgres:${POSTGRES_PASSWORD}@database:5432/postgres?sslmode=require
   database:
-    image: postgres:15
+    image: postgres:14
     x-defang-postgres: true
     ports:
       - mode: host
@@ -69,6 +72,7 @@ You can connect to the managed Postgres instance using the name of your service
 
 ```
 
+<!-- 
 ### Major Version Updating of Engine
 
 To update the database engine you can simply update the image to a later version in your compose file and apply it via ```defang compose up --provider=aws```. In the example below, we change from Postgres 15 to 16.
@@ -85,4 +89,4 @@ to
 ```
 database:
   image: postgres:16
-```
+``` -->