From 8e040d5ee4a334ae3f78758a8696680bf4df8aff Mon Sep 17 00:00:00 2001
From: zhu <496783284@qq.com>
Date: Fri, 25 Jun 2021 14:33:04 +0800
Subject: Fix typos: "合" -> "和"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css_flow_layout/block_and_inline_layout_in_normal_flow/index.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'files/zh-cn/web')

diff --git a/files/zh-cn/web/css/css_flow_layout/block_and_inline_layout_in_normal_flow/index.html b/files/zh-cn/web/css/css_flow_layout/block_and_inline_layout_in_normal_flow/index.html
index e977a07acb..a95be88548 100644
--- a/files/zh-cn/web/css/css_flow_layout/block_and_inline_layout_in_normal_flow/index.html
+++ b/files/zh-cn/web/css/css_flow_layout/block_and_inline_layout_in_normal_flow/index.html
@@ -20,7 +20,7 @@ translation_of: Web/CSS/CSS_Flow_Layout/Block_and_Inline_Layout_in_Normal_Flow
 <p>对于内联格式区域中的元素：</p>
 
 <blockquote>
-<p>“在内联格式区域中，盒子会从包含块的顶部开始，按序水平排列。只有水平外边距、边框合内边距会被保留。这些盒子可以以不同的方式在垂直方向上对齐：可以底部对齐或顶部对其，或者按文字底部进行对齐。我们把包含一串盒子的矩形区域称为一个线条框。（The rectangular area that contains the boxes that form a line is called a line box.）” - 9.4.2</p>
+<p>“在内联格式区域中，盒子会从包含块的顶部开始，按序水平排列。只有水平外边距、边框和内边距会被保留。这些盒子可以以不同的方式在垂直方向上对齐：可以底部对齐或顶部对其，或者按文字底部进行对齐。我们把包含一串盒子的矩形区域称为一个线条框。（The rectangular area that contains the boxes that form a line is called a line box.）” - 9.4.2</p>
 </blockquote>
 
 <p>需要注意的是，CSS 2.1规范将文档的书写模式定义为从上到下横板排布，这从块级盒子的垂直间距这一属性就能看出来（Note that the CSS 2.1 specification describes documents as being in a horizontal, top to bottom writing mode. For example, by describing vertical distance between block boxes.）。在竖版书写模式工作时，块元素和内联元素的行为是相同的，关于这个我们将在未来的流布局与书写模式指南中进行探讨。</p>
-- 
cgit v1.2.3-54-g00ecf