From c008bb7b9db11d74a44b718a78ff42c77f7c4db8 Mon Sep 17 00:00:00 2001
From: Lorenzo Lewis <lorenzo_lewis@icloud.com>
Date: Thu, 13 Jun 2024 16:56:05 +0200
Subject: [PATCH 1/3] Promote Dev Toolbar Link (#8511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Houston (Bot) <108291165+astrobot-houston@users.noreply.github.com>
Co-authored-by: Reuben Tier <64310361+TheOtterlord@users.noreply.github.com>
Co-authored-by: HiDeoo <494699+HiDeoo@users.noreply.github.com>
Co-authored-by: Luiz Ferraz <luiz@lferraz.com>
Co-authored-by: Jasper 張 <hey@jasperteo.com>
---
 src/content/docs/en/install-and-setup.mdx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/content/docs/en/install-and-setup.mdx b/src/content/docs/en/install-and-setup.mdx
index 1a73b2eb043d0..99515f3a8831e 100644
--- a/src/content/docs/en/install-and-setup.mdx
+++ b/src/content/docs/en/install-and-setup.mdx
@@ -156,6 +156,11 @@ Explore the guides below to customize your development experience.
     title="Editor Setup"
     description="Customize your code editor to improve the Astro developer experience and unlock new features."
     href="/en/editor-setup/"
+  />
+  <LinkCard
+    title="Dev Toolbar"
+    description="Explore the helpful features of the dev toolbar."
+    href="/en/guides/dev-toolbar/"
   />
    <LinkCard
     title="TypeScript"
@@ -172,11 +177,6 @@ Explore the guides below to customize your development experience.
     description="Set and use environment variables in your project."
     href="/en/guides/environment-variables/"
   />
-    <LinkCard
-    title="Dev Toolbar"
-    description="Explore the helpful features of the dev toolbar."
-    href="/en/guides/dev-toolbar/"
-  />
 </CardGrid>
 
 ## Build and preview your site
@@ -429,4 +429,4 @@ If you prefer not to use our automatic `create astro` CLI tool, you can set up y
 
 8. You can now [start the Astro dev server](#start-the-astro-dev-server) and see a live preview of your project while you build!
 
-</Steps>
\ No newline at end of file
+</Steps>

From 2fb9e21fba53986a9d7cf78252043ebac76ff1ee Mon Sep 17 00:00:00 2001
From: Sarah Rainsberger <sarah@rainsberger.ca>
Date: Thu, 13 Jun 2024 12:46:30 -0300
Subject: [PATCH 2/3] [install-and-setup] add basic typescript content (#8513)

Co-authored-by: Reuben Tier <64310361+TheOtterlord@users.noreply.github.com>
Co-authored-by: Atharva <atharvapise19@gmail.com>
---
 src/content/docs/en/install-and-setup.mdx | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/content/docs/en/install-and-setup.mdx b/src/content/docs/en/install-and-setup.mdx
index 99515f3a8831e..73b52774be926 100644
--- a/src/content/docs/en/install-and-setup.mdx
+++ b/src/content/docs/en/install-and-setup.mdx
@@ -162,23 +162,16 @@ Explore the guides below to customize your development experience.
     description="Explore the helpful features of the dev toolbar."
     href="/en/guides/dev-toolbar/"
   />
-   <LinkCard
-    title="TypeScript"
-    description="Configure Astro's built-in TypeScript support to be as strict or relaxed as you like!"
-    href="/en/guides/typescript/"
-  />
-  <LinkCard
-    title="Import Aliases"
-    description="Create convenient shortcuts for your file imports."
-    href="/en/guides/aliases/"
-  />
-  <LinkCard
-    title="Environment Variables"
-    description="Set and use environment variables in your project."
-    href="/en/guides/environment-variables/"
-  />
 </CardGrid>
 
+### TypeScript in Astro
+
+Astro ships with built-in support for [TypeScript](https://www.typescriptlang.org/), which can help prevent errors at runtime by defining the shapes of objects and components in your code.
+
+You don't need to write TypeScript code in your Astro projects to benefit from it. Astro always treats your component code as TypeScript, and the [Astro VSCode Extension](/en/editor-setup/) will infer as much as it can to provide autocompletion, hints, and errors in your editor.
+
+<ReadMore>Read more about using and configuring [TypeScript in Astro](/en/guides/typescript/)</ReadMore>
+
 ## Build and preview your site
 
 To check the version of your site that will be created at build time, quit the dev server (<kbd>Ctrl</kbd> + <kbd>C</kbd>) and run the appropriate build command for your package manager in your terminal:

From 38737f55347b2a8d22b78b73397655510cc5d7a1 Mon Sep 17 00:00:00 2001
From: Makarov <tsavpyn@outlook.com>
Date: Fri, 14 Jun 2024 02:01:02 +0800
Subject: [PATCH 3/3] i18n(zh-cn): update untranslate word in
 directives-reference.mdx (#8514)

For more info see chat history
@ https://discord.com/channels/830184174198718474/973149689610371093/1250832177663443034

Co-authored-by: Yan <61414485+yanthomasdev@users.noreply.github.com>
---
 src/content/docs/zh-cn/reference/directives-reference.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/zh-cn/reference/directives-reference.mdx b/src/content/docs/zh-cn/reference/directives-reference.mdx
index 749ad6ca0db22..ecea2cafb43e4 100644
--- a/src/content/docs/zh-cn/reference/directives-reference.mdx
+++ b/src/content/docs/zh-cn/reference/directives-reference.mdx
@@ -36,7 +36,7 @@ import ReadMore from '~/components/ReadMore.astro'
 - `string`：添加到 `class` 元素
 - `Object`：添加到键值对到 `class` 元素
 - `Array`：扁平化
-- `false`, `null`, or `undefined`: skipped
+- `false`, `null`, or `undefined`: 跳过
 
 ```astro
 <!-- 原先 -->