From 40d73490733a1665596eee8b547278231db3b8e3 Mon Sep 17 00:00:00 2001 From: Sophie Alpert Date: Wed, 28 Aug 2024 17:58:32 -0700 Subject: [PATCH 1/2] Parallel structure --- src/content/reference/react/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/reference/react/index.md b/src/content/reference/react/index.md index 5663af392a..a68ddc014d 100644 --- a/src/content/reference/react/index.md +++ b/src/content/reference/react/index.md @@ -15,7 +15,7 @@ The React reference documentation is broken down into functional subsections: Programmatic React features: * [Hooks](/reference/react/hooks) - Use different React features from your components. -* [Components](/reference/react/components) - Documents built-in components that you can use in your JSX. +* [Components](/reference/react/components) - Built-in components that you can use in your JSX. * [APIs](/reference/react/apis) - APIs that are useful for defining components. * [Directives](/reference/rsc/directives) - Provide instructions to bundlers compatible with React Server Components. From 55b3ccf4096423a65e8db7ec2469ee86033955d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E7=A7=8B?= Date: Sat, 31 Aug 2024 16:28:56 +0800 Subject: [PATCH 2/2] fix conflicts --- src/content/reference/react/index.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/content/reference/react/index.md b/src/content/reference/react/index.md index 00d2ae4015..774dd40aa2 100644 --- a/src/content/reference/react/index.md +++ b/src/content/reference/react/index.md @@ -14,17 +14,10 @@ React 参考文档分为以下内容： 编程式 React 功能： -<<<<<<< HEAD * [Hook](/reference/react/hooks) —— 在组件中使用不同的 React 特性。 -* [组件](/reference/react/components) —— 记录了可以在 JSX 中使用的内置组件。 +* [组件](/reference/react/components) —— 可以在 JSX 中使用的内置组件。 * [API](/reference/react/apis) —— 用于定义组件的有用 API。 * [指示符](/reference/rsc/directives) —— 为与 React 服务器组件兼容的捆绑器提供指示。 -======= -* [Hooks](/reference/react/hooks) - Use different React features from your components. -* [Components](/reference/react/components) - Built-in components that you can use in your JSX. -* [APIs](/reference/react/apis) - APIs that are useful for defining components. -* [Directives](/reference/rsc/directives) - Provide instructions to bundlers compatible with React Server Components. ->>>>>>> 40d73490733a1665596eee8b547278231db3b8e3 ## React DOM {/*react-dom*/}