Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2611485pxj; Sat, 19 Jun 2021 18:15:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdfYiVu/CsqdvXoekDyUWqxteWw+l4HYblM+Y2tCFpBFU2RLYJw7MXe7AXu24yChtZ5SH2 X-Received: by 2002:a02:7348:: with SMTP id a8mr10493174jae.116.1624151726800; Sat, 19 Jun 2021 18:15:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624151726; cv=none; d=google.com; s=arc-20160816; b=MqECxJ5JQrOIWwoERbELRUbf3WKgUZQofu272A6rbhbFCCvn8zExzjBeh1PNwMdrk0 ePR4UWrpmimJnEWzBRIbFwysSHa52mswRsj7yrwDe0a1l2H8SnOHAbROq0ZNwsDAIMDd nTOUCfbqYY24oYsbEw2LfrMezPWXfbtJHKzfPrjSIUgxpSKz0FI/kxg1zOYdcBweVS5g COKYXhV2npM5n5V/YDlXj6nYBbBERst74YHMlF/bnhLbNfhAZJR0QAmoP1b51GOyvreL iA0qKobZeMpcwEqrwHyUyKqbazgoRFnohNjeUPV/diCVqJFviEfi4NwZCflHjkFcURgu 8TGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=NZZmnie2TOBTPxHap59K1IwV7xqyLJiN+a1ziPTtffE=; b=MnqJ3mjqCOjBqGXgO624Sli+Vtor5m/BxV/y1T3GehGSFhKH4ZhisEO/rwsxdKYVjg sqapBvZVlpstHjAzI2+j9BUTs2TSpQIHqtywhA9ZwyjKWw9jhLoMxtLWqgL2aSCAPH6R I5C+fLRy4z1tMRMM35MVH9UD/0NALtjS99IzAAeZ8o+chTzIqVQalEev5CAy/DPfHujj 3iVBYTRzdStOVtW5QnPNIf0b4cOufcb7W06MeoSjot5dvblorcZjkFGJCdBnsLi3la2M +1InPIAp9vEgUdMsGKPXsW78volbmw7vBxR6sf0Uf0xfog8/Tzh5l1qsxNSKYvK1g8qm BaBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@email.cn header.s=dkim header.b="bJo++/o0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l1si7310251ilk.81.2021.06.19.18.15.14; Sat, 19 Jun 2021 18:15:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@email.cn header.s=dkim header.b="bJo++/o0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230215AbhFTBJs (ORCPT + 99 others); Sat, 19 Jun 2021 21:09:48 -0400 Received: from m32-153.88.com ([43.250.32.153]:41379 "EHLO email.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229591AbhFTBJr (ORCPT ); Sat, 19 Jun 2021 21:09:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=email.cn; s=dkim; h=From:To:Date; bh=NZZmnie2TOBTPxHap59K1IwV7xqyLJiN+a1zi PTtffE=; b=bJo++/o0V5gxWD7sIdAruJnrufSX8tB92n9ryNjZLSQ9Zetfv9R96 dv33szFTvdhqmX935RudUm84hhwQjgGZ4f3tPYSsRYLMvOrd02kqyNg5gbXnLEn0 trVvMN3NfRpuXjZbNKJgi43ChDAQMs7A//4WpTB5Za9lAf+Lbab+XE= Received: from localhost.localdomain (unknown [113.251.9.208]) by v_coremail2-frontend-2 (Coremail) with SMTP id GiKnCgAX7vzVlM5gdnQfAA--.50794S2; Sun, 20 Jun 2021 09:07:34 +0800 (CST) From: Hu Haowen To: alexs@kernel.org, corbet@lwn.net Cc: bobwxc@email.cn, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] docs/zh_CN: add a missing space character Date: Sun, 20 Jun 2021 09:07:33 +0800 Message-Id: <20210620010733.25002-1-src.res@email.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID: GiKnCgAX7vzVlM5gdnQfAA--.50794S2 X-Coremail-Antispam: 1UD129KBjvJXoWxZF4xuFy7Cr45CF48Kw1fXrb_yoW5AryfpF W29F9xK3W8Cwn09r4rKw48JFWrJasrCFW3GFn7A3sxWF1v9rWUZryag3WUKryagryxAa4k XF4FkFy3CryIvFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUgK1xkIjI8I6I8E6xAIw20EY4v20xvaj40_JFC_Wr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l 84ACjcxK6I8E87Iv6xkF7I0E14v26r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E74AGY7Cv6cx26F4UJr1UMcvjeVCFs4IE7xkE bVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc2xSY4AK67 AK6w4l42xK82IYc2Ij64vIr41l42xK82IY6x8ErcxFaVAv8VWxJr1UJwCFx2IqxVCFs4IE 7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI 8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWU CwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r 1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBI daVFxhVjvjDU0xZFpf9x0JjaKZXUUUUU= X-Originating-IP: [113.251.9.208] X-CM-SenderInfo: hvufh21hv6vzxdlohubq/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org "LinusTorvalds" is not pretty. Replace it with "Linus Torvalds". Signed-off-by: Hu Haowen --- Documentation/translations/zh_CN/process/2.Process.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/translations/zh_CN/process/2.Process.rst b/Documentation/translations/zh_CN/process/2.Process.rst index 229629e305ca..636f74b11c65 100644 --- a/Documentation/translations/zh_CN/process/2.Process.rst +++ b/Documentation/translations/zh_CN/process/2.Process.rst @@ -47,7 +47,7 @@ (顺便说一句,值得注意的是,合并窗口期间集成的更改并不是凭空产生的;它们是经 提前收集、测试和分级的。稍后将详细描述该过程的工作方式。) -合并窗口持续大约两周。在这段时间结束时,LinusTorvalds将声明窗口已关闭,并 +合并窗口持续大约两周。在这段时间结束时,Linus Torvalds将声明窗口已关闭,并 释放第一个“rc”内核。例如,对于目标为5.6的内核,在合并窗口结束时发生的释放 将被称为5.6-rc1。-rc1 版本是一个信号,表示合并新特性的时间已经过去,稳定下一 个内核的时间已经到来。 @@ -152,7 +152,7 @@ Greg Kroah-Hartman领导。稳定团队将使用5.x.y编号方案不定期地发 驱动程序维护者接受,那么您应该坚持不懈地将补丁更新到当前内核使其可被正常 应用,并不断地发送它以供审查和合并。 -- 合并到主线。最终,一个成功的补丁将被合并到由LinusTorvalds管理的主线存储库 +- 合并到主线。最终,一个成功的补丁将被合并到由Linus Torvalds管理的主线存储库 中。此时可能会出现更多的评论和/或问题;对开发人员来说应对这些问题并解决 出现的任何问题仍很重要。 @@ -168,7 +168,7 @@ Greg Kroah-Hartman领导。稳定团队将使用5.x.y编号方案不定期地发 补丁如何进入内核 ---------------- -只有一个人可以将补丁合并到主线内核存储库中:LinusTorvalds。但是,在进入 +只有一个人可以将补丁合并到主线内核存储库中:Linus Torvalds。但是,在进入 2.6.38内核的9500多个补丁中,只有112个(大约1.3%)是由Linus自己直接选择的。 内核项目已经发展到一个没有一个开发人员可以在没有支持的情况下检查和选择每个 补丁的规模。内核开发人员处理这种增长的方式是使用围绕信任链构建的助理系统。 -- 2.25.1