Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp3013753imc; Wed, 13 Mar 2019 06:54:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzuCF/2kMGJ7PpELTjrVzhT2HWy09f9EEJC5lASP3e+VV3tTpp5AsyAVfklj8h50yFeDkUN X-Received: by 2002:a62:1f58:: with SMTP id f85mr44102368pff.39.1552485272728; Wed, 13 Mar 2019 06:54:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552485272; cv=none; d=google.com; s=arc-20160816; b=B3eSM7fsZv5OawZFV61rzLJq49/2ZCQE3J4Q+npJi1+ou4cPpSCYguUrkASjNSRfSV wu7QdpaYxgeVZtmdCBtsPhvfy9HIaXzCf1uIrGf40jW6I2ZuHy6GoLETrOTwUF2+ZnE7 NvZGeLh67yC6JbfUWTRZVYBt5/+K1XcJj3e7JvW32OTO20bmQqglimyA8gRf5LAOGnXC Udzl4rqs3D6FmymO9qCO+TOkTw7da9PMF2/Up/fF0Sxvhftn5LrB7+f157VePPiEcFrU goFqQzOHv5zasBMBVxupsUjdt/6W+ye7Ev0Z6DIpT4l6xlauAoNpEjoFewao/1b30WFh cS0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=gJtogpPbnZjQbW2X3K3Zqwl1Wm10lR1A+yXpy84ZuUg=; b=p3YvfU8AGog2H2313v1t3tuar3NsfMlvGGUXAF8ck7o8kTGKmM0cRbK88lWfgegj51 j3oLUivzH3fesOLCzmBGpn/yhmhbZl5q6SMqpCTHZF6X80brO1bis4YK1A+i1aimcGFJ GRZH3bMhUtMxwFCcESxWx5y7+cUZgGglM7rrqRfnt6LykT601e+P1Voq/rxsY+/T7DIy ACwgRsaACnF0C+9GiFZFNJ0imqS0EqR4OcNzO+mAZl7qujOM25hb+yBqJYQIpoJhRkTg zzFItYnj2b9XJKcOD5yettPJpBTYJNYZBXK89zQ+j6RkxzXjWVnKNVdEr3orDQ2oflga 9XqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z20si8470675plo.392.2019.03.13.06.54.16; Wed, 13 Mar 2019 06:54:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727251AbfCMNxV (ORCPT + 99 others); Wed, 13 Mar 2019 09:53:21 -0400 Received: from out30-57.freemail.mail.aliyun.com ([115.124.30.57]:52243 "EHLO out30-57.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727078AbfCMNxV (ORCPT ); Wed, 13 Mar 2019 09:53:21 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07487;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0TMdXUwD_1552485036; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0TMdXUwD_1552485036) by smtp.aliyun-inc.com(127.0.0.1); Wed, 13 Mar 2019 21:50:37 +0800 From: Alex Shi To: corbet@lwn.net, harryxiyou@gmail.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alex Shi , Li Yang , TripleX Chung Subject: [PATCH v5 30/31] docs/zh_CN: fix rst format issue in submitting-patch Date: Wed, 13 Mar 2019 21:50:00 +0800 Message-Id: <20190313135001.260905-31-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.856.g8858448bb In-Reply-To: <20190313135001.260905-1-alex.shi@linux.alibaba.com> References: <20190313135001.260905-1-alex.shi@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tame 'make htmldocs' to avoid indent and code section error complains. Signed-off-by: Alex Shi Cc: Harry Wei Cc: Jonathan Corbet Cc: Li Yang Cc: TripleX Chung Signed-off-by: Weiwei Jia --- .../zh_CN/process/submitting-patches.rst | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Documentation/translations/zh_CN/process/submitting-patches.rst b/Documentation/translations/zh_CN/process/submitting-patches.rst index 47cdca62cfa2..66c64acf86c1 100644 --- a/Documentation/translations/zh_CN/process/submitting-patches.rst +++ b/Documentation/translations/zh_CN/process/submitting-patches.rst @@ -39,7 +39,7 @@ Documentation/process/submitting-drivers.rst 。 参数生成。而且,请使用 '-p' 参数,那样会显示每个改动所在的C函数,使得 产生的补丁容易读得多。补丁应该基于内核源代码树的根目录,而不是里边的任 何子目录。 -为一个单独的文件创建补丁,一般来说这样做就够了: +为一个单独的文件创建补丁,一般来说这样做就够了:: SRCTREE= linux-2.6 MYFILE= drivers/net/mydriver.c @@ -51,7 +51,7 @@ Documentation/process/submitting-drivers.rst 。 diff -up $SRCTREE/$MYFILE{.orig,} > /tmp/patch 为多个文件创建补丁,你可以解开一个没有修改过的内核源代码树,然后和你自 -己的代码树之间做 diff 。例如: +己的代码树之间做 diff 。例如:: MYSRC= /devel/linux-2.6 @@ -141,6 +141,7 @@ MAINTAINERS 文件里的)发送一个手册页(man-pages)补丁,或者 对于小的补丁,你也许会CC到 Adrian Bunk 管理的搜集琐碎补丁的邮件列表 (Trivial Patch Monkey)trivial@kernel.org,那里专门收集琐碎的补丁。下面这样 的补丁会被看作“琐碎的”补丁: + 文档的拼写修正。 修正会影响到 grep(1) 的拼写。 警告信息修正(频繁的打印无用的警告是不好的。) @@ -241,8 +242,10 @@ Linus 和 linux-kernel 邮件列表的 e-mail 流量都很高,一个通常的 "sign-off" 是在补丁的注释的最后的简单的一行文字,认证你编写了它或者其他 人有权力将它作为开放源代码的补丁传递。规则很简单:如果你能认证如下信息 : - 开发者来源证书 1.1 - 对于本项目的贡献,我认证如下信息: +开发者来源证书 1.1 +^^^^^^^^^^^^^^^^^^ +对于本项目的贡献,我认证如下信息: + (a)这些贡献是完全或者部分的由我创建,我有权利以文件中指出 的开放源代码许可证提交它;或者 (b)这些贡献基于以前的工作,据我所知,这些以前的工作受恰当的开放 @@ -295,7 +298,7 @@ e-mail 标题中的“一句话概述”扼要的描述 e-mail 中的补丁。 丁。用户将希望通过 google 来搜索"一句话概述"来找到那些讨论这个补丁的文 章。 -一些标题的例子: +一些标题的例子:: Subject: [patch 2/5] ext2: improve scalability of bitmap searching Subject: [PATCHv2 001/207] x86: fix eflags tracking @@ -338,7 +341,7 @@ Nuff 说过,如果你的代码和这个偏离太多,那么它有可能会被 在头文件里,有条件地定义 "static inline" 函数,或者宏,在代码里用这些东 西。让编译器把那些"空操作"优化掉。 -一个简单的例子,不好的代码: +一个简单的例子,不好的代码:: dev = alloc_etherdev (sizeof(struct funky_private)); if (!dev) @@ -349,12 +352,14 @@ Nuff 说过,如果你的代码和这个偏离太多,那么它有可能会被 清理后的例子: -(头文件里) +(头文件里):: + #ifndef CONFIG_NET_FUNKINESS static inline void init_funky_net (struct net_device *d) {} #endif -(代码文件里) +(代码文件里):: + dev = alloc_etherdev (sizeof(struct funky_private)); if (!dev) return -ENODEV; @@ -399,4 +404,3 @@ Kernel Documentation/process/coding-style.rst: Linus Torvalds's mail on the canonical patch format: --- -- 2.19.1.856.g8858448bb