Hi All,
The following patches change existing Chinese kernel docs to rst format
and reorg them to make them alive in 'make htmldocs'.
you can view the generated htmldocs from:
http://176.122.172.82/translations/zh_CN/index.html
Or make and review docs on your self box:
make htmldocs SPHINXDIRS=translations/zh_CN
lynx Documentation/output/translations/zh_CN/index.html
Any comments are appreciated!
V3 changes:
1, fix a zh_CN/index.rst display issue
2, update .mailmap for zh_CN transolators'r email address
V2 changes:
1, change the disclaimer file to Chinese version,
2, replace the obsolete translator's email address in related files.
3, fix couple of format issues in couple files
Cheers!
Alex
Alex Shi (31):
docs/zh_CN: add disclaimer file
docs/zh_CN: move process related docs into process dir
docs/zh_CN: change Chinese index to know process dir
docs/zh_CN: add index file into process dir
docs/zh_CN: rename HOWTO into process directory
docs/zh_CN: howto format changes
docs/zh_CN: rename SubmittingPatches for html links
docs/zh_CN: format the submitting-patches doc to rst
docs/zh_CN: rename stable_kernel_rules doc
docs/zh_CN: rst format change for stable-kernel-rules
docs/zh_CN: rename email-clients.txt as email-clients.rst
docs/zh_CN: do rst format for email-clients.rst
docs/zh_CN: rename volatile-consider-harmful doc
docs/zh_CN: volatile doc format changes
docs/zh_CN: rename SubmittingDrivers
docs/zh_CN: format submitting drivers as rst
docs/zh_CN: rename magic-numbers as rst doc
docs/zh_CN: format the magic-number doc as rst
docs/zh_CN: rename stable_api_nonsense.txt as stable-api-nonsense.rst
docs/zh_CN: format stable-api-nonsense
docs/zh_CN: update Li Yang's email address
mailmap: update Li Yang's email address
docs/zh_CN: update Zhang Wei's email address
mailmap: update email address for Triplex
docs/zh_CN: update TripleX chung's email address
docs/zh_CN: fix rst format errors in howto.rst
docs/zh_CN: fix indent issue in stable-api-nonsense file
docs/zh_CN: fix indent issue in submitting-drivers
docs/zh_CN: fix rst format issue in submitting-patch
docs/zh_CN: remove zh-kernel.org in MAINTAINERS
mailmap: update my obsolete email address
.mailmap | 6 +
.../translations/zh_CN/disclaimer-zh_CN.rst | 9 ++
Documentation/translations/zh_CN/index.rst | 17 +-
.../translations/zh_CN/magic-number.txt | 153 ------------------
.../translations/zh_CN/oops-tracing.txt | 2 +-
.../zh_CN/{ => process}/coding-style.rst | 0
.../email-clients.rst} | 53 +++---
.../zh_CN/{HOWTO => process/howto.rst} | 69 +++++---
.../translations/zh_CN/process/index.rst | 53 ++++++
.../zh_CN/process/magic-number.rst | 151 +++++++++++++++++
.../stable-api-nonsense.rst} | 67 ++++----
.../stable-kernel-rules.rst} | 32 ++--
.../submitting-drivers.rst} | 34 ++--
.../submitting-patches.rst} | 60 ++++---
.../volatile-considered-harmful.rst} | 35 ++--
Documentation/translations/zh_CN/sparse.txt | 6 +-
MAINTAINERS | 1 -
17 files changed, 408 insertions(+), 340 deletions(-)
create mode 100644 Documentation/translations/zh_CN/disclaimer-zh_CN.rst
delete mode 100644 Documentation/translations/zh_CN/magic-number.txt
rename Documentation/translations/zh_CN/{ => process}/coding-style.rst (100%)
rename Documentation/translations/zh_CN/{email-clients.txt => process/email-clients.rst} (82%)
rename Documentation/translations/zh_CN/{HOWTO => process/howto.rst} (95%)
create mode 100644 Documentation/translations/zh_CN/process/index.rst
create mode 100644 Documentation/translations/zh_CN/process/magic-number.rst
rename Documentation/translations/zh_CN/{stable_api_nonsense.txt => process/stable-api-nonsense.rst} (80%)
rename Documentation/translations/zh_CN/{stable_kernel_rules.txt => process/stable-kernel-rules.rst} (76%)
rename Documentation/translations/zh_CN/{SubmittingDrivers => process/submitting-drivers.rst} (86%)
rename Documentation/translations/zh_CN/{SubmittingPatches => process/submitting-patches.rst} (92%)
rename Documentation/translations/zh_CN/{volatile-considered-harmful.txt => process/volatile-considered-harmful.rst} (81%)
--
2.19.1.856.g8858448bb
This a disclaimer file which will be included in Chinese files
as header. To reduce the same common contents copy.
Part of contents quoted from Federico Vaga's file:
Documentation/translations/it_IT/disclaimer-ita.rst.
Thanks a lot!
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
Cc: Federico Vaga <[email protected]>
---
Documentation/translations/zh_CN/disclaimer-zh_CN.rst | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 Documentation/translations/zh_CN/disclaimer-zh_CN.rst
diff --git a/Documentation/translations/zh_CN/disclaimer-zh_CN.rst b/Documentation/translations/zh_CN/disclaimer-zh_CN.rst
new file mode 100644
index 000000000000..5934369b2606
--- /dev/null
+++ b/Documentation/translations/zh_CN/disclaimer-zh_CN.rst
@@ -0,0 +1,9 @@
+:orphan:
+
+.. warning::
+ 此文件的目的是为让中文读者更容易阅读和理解，而不是作为一个分支。 因此，如果
+ 您对此文件有任何意见或更新，请先尝试更新原始英文文件。
+
+.. note::
+ 如果您发现本文档与原始文件有任何不同或者有翻译问题，请联系该文件的维护者，
+ 或者请求时奎亮的帮助：<[email protected]>。
--
2.19.1.856.g8858448bb
Much process documents spread here isn't neat. It's good to put them together
in their directory: process
So create 'process' directory and move docs:
email-clients stable_kernel_rules stable_api_nosense
submittingpatches submittingdrivers HOWTO
volatile-considered-harmful
there.
Signed-off-by: Alex Shi <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Coly Li <[email protected]>
---
Documentation/translations/zh_CN/{ => process}/HOWTO | 0
Documentation/translations/zh_CN/{ => process}/SubmittingDrivers | 0
Documentation/translations/zh_CN/{ => process}/SubmittingPatches | 0
Documentation/translations/zh_CN/{ => process}/coding-style.rst | 0
Documentation/translations/zh_CN/{ => process}/email-clients.txt | 0
Documentation/translations/zh_CN/{ => process}/magic-number.txt | 0
.../translations/zh_CN/{ => process}/stable_api_nonsense.txt | 0
.../translations/zh_CN/{ => process}/stable_kernel_rules.txt | 0
.../zh_CN/{ => process}/volatile-considered-harmful.txt | 0
9 files changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/{ => process}/HOWTO (100%)
rename Documentation/translations/zh_CN/{ => process}/SubmittingDrivers (100%)
rename Documentation/translations/zh_CN/{ => process}/SubmittingPatches (100%)
rename Documentation/translations/zh_CN/{ => process}/coding-style.rst (100%)
rename Documentation/translations/zh_CN/{ => process}/email-clients.txt (100%)
rename Documentation/translations/zh_CN/{ => process}/magic-number.txt (100%)
rename Documentation/translations/zh_CN/{ => process}/stable_api_nonsense.txt (100%)
rename Documentation/translations/zh_CN/{ => process}/stable_kernel_rules.txt (100%)
rename Documentation/translations/zh_CN/{ => process}/volatile-considered-harmful.txt (100%)
diff --git a/Documentation/translations/zh_CN/HOWTO b/Documentation/translations/zh_CN/process/HOWTO
similarity index 100%
rename from Documentation/translations/zh_CN/HOWTO
rename to Documentation/translations/zh_CN/process/HOWTO
diff --git a/Documentation/translations/zh_CN/SubmittingDrivers b/Documentation/translations/zh_CN/process/SubmittingDrivers
similarity index 100%
rename from Documentation/translations/zh_CN/SubmittingDrivers
rename to Documentation/translations/zh_CN/process/SubmittingDrivers
diff --git a/Documentation/translations/zh_CN/SubmittingPatches b/Documentation/translations/zh_CN/process/SubmittingPatches
similarity index 100%
rename from Documentation/translations/zh_CN/SubmittingPatches
rename to Documentation/translations/zh_CN/process/SubmittingPatches
diff --git a/Documentation/translations/zh_CN/coding-style.rst b/Documentation/translations/zh_CN/process/coding-style.rst
similarity index 100%
rename from Documentation/translations/zh_CN/coding-style.rst
rename to Documentation/translations/zh_CN/process/coding-style.rst
diff --git a/Documentation/translations/zh_CN/email-clients.txt b/Documentation/translations/zh_CN/process/email-clients.txt
similarity index 100%
rename from Documentation/translations/zh_CN/email-clients.txt
rename to Documentation/translations/zh_CN/process/email-clients.txt
diff --git a/Documentation/translations/zh_CN/magic-number.txt b/Documentation/translations/zh_CN/process/magic-number.txt
similarity index 100%
rename from Documentation/translations/zh_CN/magic-number.txt
rename to Documentation/translations/zh_CN/process/magic-number.txt
diff --git a/Documentation/translations/zh_CN/stable_api_nonsense.txt b/Documentation/translations/zh_CN/process/stable_api_nonsense.txt
similarity index 100%
rename from Documentation/translations/zh_CN/stable_api_nonsense.txt
rename to Documentation/translations/zh_CN/process/stable_api_nonsense.txt
diff --git a/Documentation/translations/zh_CN/stable_kernel_rules.txt b/Documentation/translations/zh_CN/process/stable_kernel_rules.txt
similarity index 100%
rename from Documentation/translations/zh_CN/stable_kernel_rules.txt
rename to Documentation/translations/zh_CN/process/stable_kernel_rules.txt
diff --git a/Documentation/translations/zh_CN/volatile-considered-harmful.txt b/Documentation/translations/zh_CN/process/volatile-considered-harmful.txt
similarity index 100%
rename from Documentation/translations/zh_CN/volatile-considered-harmful.txt
rename to Documentation/translations/zh_CN/process/volatile-considered-harmful.txt
--
2.19.1.856.g8858448bb
And add some description translation in index file.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
Documentation/translations/zh_CN/index.rst | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/Documentation/translations/zh_CN/index.rst b/Documentation/translations/zh_CN/index.rst
index 75956d669962..d3165535ec9e 100644
--- a/Documentation/translations/zh_CN/index.rst
+++ b/Documentation/translations/zh_CN/index.rst
@@ -3,10 +3,19 @@
\renewcommand\thesection*
\renewcommand\thesubsection*
-Chinese translations
-====================
+中文翻译
+========
+
+这些手册包含有关如何开发内核的整体信息。内核社区非常庞大，一年下来有数千名开发
+人员做出贡献。 与任何大型社区一样，知道如何完成任务将使得更改合并的过程变得更
+加容易。
.. toctree::
- :maxdepth: 1
+ :maxdepth: 2
+
+ process/index
+
+目录和表格
+----------
- coding-style
+* :ref:`genindex`
--
2.19.1.856.g8858448bb
to Make it readble for html etc docs making.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Yang <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/submitting-drivers.rst | 30 +++++++------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/submitting-drivers.rst b/Documentation/translations/zh_CN/process/submitting-drivers.rst
index 15e73562f710..c90ab5ae233d 100644
--- a/Documentation/translations/zh_CN/process/submitting-drivers.rst
+++ b/Documentation/translations/zh_CN/process/submitting-drivers.rst
@@ -1,30 +1,22 @@
-Chinese translated version of Documentation/process/submitting-drivers.rst
+.. _cn_submittingdrivers:
-If you have any comment or update to the content, please contact the
-original document maintainer directly. However, if you have a problem
-communicating in English you can also ask the Chinese maintainer for
-help. Contact the Chinese maintainer if this translation is outdated
-or if there is a problem with the translation.
+.. include:: ../disclaimer-zh_CN.rst
-Chinese maintainer: Li Yang <[email protected]>
----------------------------------------------------------------------
-Documentation/process/submitting-drivers.rst 的中文翻译
+:Original: :ref:`Documentation/process/submitting-drivers.rst
+ <submittingdrivers>`
如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
-译存在问题，请联系中文版维护者。
+译存在问题，请联系中文版维护者::
-中文版维护者： 李阳 Li Yang <[email protected]>
-中文版翻译者： 李阳 Li Yang <[email protected]>
-中文版校译者： 陈琦 Maggie Chen <[email protected]>
- 王聪 Wang Cong <[email protected]>
- 张巍 Zhang Wei <[email protected]>
-
-以下为正文
----------------------------------------------------------------------
+ 中文版维护者： 李阳 Li Yang <[email protected]>
+ 中文版翻译者： 李阳 Li Yang <[email protected]>
+ 中文版校译者： 陈琦 Maggie Chen <[email protected]>
+ 王聪 Wang Cong <[email protected]>
+ 张巍 Zhang Wei <[email protected]>
如何向 Linux 内核提交驱动程序
------------------------------
+=============================
这篇文档将会解释如何向不同的内核源码树提交设备驱动程序。请注意，如果你感
兴趣的是显卡驱动程序，你也许应该访问 XFree86 项目(http://www.xfree86.org/)
--
2.19.1.856.g8858448bb
to Make it available in html etc doc making
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Jia Wei Wei <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/{magic-number.txt => magic-number.rst} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/process/{magic-number.txt => magic-number.rst} (100%)
diff --git a/Documentation/translations/zh_CN/process/magic-number.txt b/Documentation/translations/zh_CN/process/magic-number.rst
similarity index 100%
rename from Documentation/translations/zh_CN/process/magic-number.txt
rename to Documentation/translations/zh_CN/process/magic-number.rst
--
2.19.1.856.g8858448bb
to Make it readble in html etc doc making. And fix the wrong
translation for 'number' in form.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Jia Wei Wei <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/magic-number.rst | 210 +++++++++---------
1 file changed, 104 insertions(+), 106 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/magic-number.rst b/Documentation/translations/zh_CN/process/magic-number.rst
index 7159cec04090..15c592518194 100644
--- a/Documentation/translations/zh_CN/process/magic-number.rst
+++ b/Documentation/translations/zh_CN/process/magic-number.rst
@@ -1,33 +1,29 @@
-Chinese translated version of Documentation/process/magic-number.rst
+.. _cn_magicnumbers:
-If you have any comment or update to the content, please post to LKML directly.
-However, if you have problem communicating in English you can also ask the
-Chinese maintainer for help. Contact the Chinese maintainer, if this
-translation is outdated or there is problem with translation.
+.. include:: ../disclaimer-zh_CN.rst
-Chinese maintainer: Jia Wei Wei <[email protected]>
----------------------------------------------------------------------
-Documentation/process/magic-number.rst的中文翻译
+:Original: :ref:`Documentation/process/magic-number.rst <magicnumbers>`
如果想评论或更新本文的内容，请直接发信到LKML。如果你使用英文交流有困难的话，也可
-以向中文版维护者求助。如果本翻译更新不及时或者翻译存在问题，请联系中文版维护者。
+以向中文版维护者求助。如果本翻译更新不及时或者翻译存在问题，请联系中文版维护者::
-中文版维护者： 贾威威 Jia Wei Wei <[email protected]>
-中文版翻译者： 贾威威 Jia Wei Wei <[email protected]>
-中文版校译者： 贾威威 Jia Wei Wei <[email protected]>
+ 中文版维护者： 贾威威 Jia Wei Wei <[email protected]>
+ 中文版翻译者： 贾威威 Jia Wei Wei <[email protected]>
+ 中文版校译者： 贾威威 Jia Wei Wei <[email protected]>
+
+Linux 魔术数
+============
-以下为正文
----------------------------------------------------------------------
这个文件是有关当前使用的魔术值注册表。当你给一个结构添加了一个魔术值，你也应该把这个魔术值添加到这个文件，因为我们最好把用于各种结构的魔术值统一起来。
使用魔术值来保护内核数据结构是一个非常好的主意。这就允许你在运行期检查(a)一个结构是否已经被攻击，或者(b)你已经给一个例行程序通过了一个错误的结构。后一种情况特别地有用---特别是当你通过一个空指针指向结构体的时候。tty源码，例如，经常通过特定驱动使用这种方法并且反复地排列特定方面的结构。
-使用魔术值的方法是在结构的开始处声明的，如下：
+使用魔术值的方法是在结构的开始处声明的，如下::
-struct tty_ldisc {
- int magic;
- ...
-};
+ struct tty_ldisc {
+ int magic;
+ ...
+ };
当你以后给内核添加增强功能的时候，请遵守这条规则！这样就会节省数不清的调试时间，特别是一些古怪的情况，例如，数组超出范围并且重新写了超出部分。遵守这个规则，这些情况可以被快速地，安全地避免。
@@ -58,93 +54,95 @@ struct tty_ldisc {
<[email protected]>
09 Jul 2003
-魔术名 地址 结构 所在文件
-===========================================================================
-PG_MAGIC 'P' pg_{read,write}_hdr include/linux/pg.h
-CMAGIC 0x0111 user include/linux/a.out.h
-MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h
-HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c
-APM_BIOS_MAGIC 0x4101 apm_user arch/x86/kernel/apm_32.c
-CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h
-DB_MAGIC 0x4442 fc_info drivers/net/iph5526_novram.c
-DL_MAGIC 0x444d fc_info drivers/net/iph5526_novram.c
-FASYNC_MAGIC 0x4601 fasync_struct include/linux/fs.h
-FF_MAGIC 0x4646 fc_info drivers/net/iph5526_novram.c
-ISICOM_MAGIC 0x4d54 isi_port include/linux/isicom.h
-PTY_MAGIC 0x5001 drivers/char/pty.c
-PPP_MAGIC 0x5002 ppp include/linux/if_pppvar.h
-SERIAL_MAGIC 0x5301 async_struct include/linux/serial.h
-SSTATE_MAGIC 0x5302 serial_state include/linux/serial.h
-SLIP_MAGIC 0x5302 slip drivers/net/slip.h
-STRIP_MAGIC 0x5303 strip drivers/net/strip.c
-X25_ASY_MAGIC 0x5303 x25_asy drivers/net/x25_asy.h
-SIXPACK_MAGIC 0x5304 sixpack drivers/net/hamradio/6pack.h
-AX25_MAGIC 0x5316 ax_disp drivers/net/mkiss.h
-TTY_MAGIC 0x5401 tty_struct include/linux/tty.h
-MGSL_MAGIC 0x5401 mgsl_info drivers/char/synclink.c
-TTY_DRIVER_MAGIC 0x5402 tty_driver include/linux/tty_driver.h
-MGSLPC_MAGIC 0x5402 mgslpc_info drivers/char/pcmcia/synclink_cs.c
-TTY_LDISC_MAGIC 0x5403 tty_ldisc include/linux/tty_ldisc.h
-USB_SERIAL_MAGIC 0x6702 usb_serial drivers/usb/serial/usb-serial.h
-FULL_DUPLEX_MAGIC 0x6969 drivers/net/ethernet/dec/tulip/de2104x.c
-USB_BLUETOOTH_MAGIC 0x6d02 usb_bluetooth drivers/usb/class/bluetty.c
-RFCOMM_TTY_MAGIC 0x6d02 net/bluetooth/rfcomm/tty.c
-USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port drivers/usb/serial/usb-serial.h
-CG_MAGIC 0x00090255 ufs_cylinder_group include/linux/ufs_fs.h
-RPORT_MAGIC 0x00525001 r_port drivers/char/rocket_int.h
-LSEMAGIC 0x05091998 lse drivers/fc4/fc.c
-GDTIOCTL_MAGIC 0x06030f07 gdth_iowr_str drivers/scsi/gdth_ioctl.h
-RIEBL_MAGIC 0x09051990 drivers/net/atarilance.c
-NBD_REQUEST_MAGIC 0x12560953 nbd_request include/linux/nbd.h
-RED_MAGIC2 0x170fc2a5 (any) mm/slab.c
-BAYCOM_MAGIC 0x19730510 baycom_state drivers/net/baycom_epp.c
-ISDN_X25IFACE_MAGIC 0x1e75a2b9 isdn_x25iface_proto_data
- drivers/isdn/isdn_x25iface.h
-ECP_MAGIC 0x21504345 cdkecpsig include/linux/cdk.h
-LSOMAGIC 0x27091997 lso drivers/fc4/fc.c
-LSMAGIC 0x2a3b4d2a ls drivers/fc4/fc.c
-WANPIPE_MAGIC 0x414C4453 sdla_{dump,exec} include/linux/wanpipe.h
-CS_CARD_MAGIC 0x43525553 cs_card sound/oss/cs46xx.c
-LABELCL_MAGIC 0x4857434c labelcl_info_s include/asm/ia64/sn/labelcl.h
-ISDN_ASYNC_MAGIC 0x49344C01 modem_info include/linux/isdn.h
-CTC_ASYNC_MAGIC 0x49344C01 ctc_tty_info drivers/s390/net/ctctty.c
-ISDN_NET_MAGIC 0x49344C02 isdn_net_local_s drivers/isdn/i4l/isdn_net_lib.h
-SAVEKMSG_MAGIC2 0x4B4D5347 savekmsg arch/*/amiga/config.c
-CS_STATE_MAGIC 0x4c4f4749 cs_state sound/oss/cs46xx.c
-SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c
-COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c
-I810_CARD_MAGIC 0x5072696E i810_card sound/oss/i810_audio.c
-TRIDENT_CARD_MAGIC 0x5072696E trident_card sound/oss/trident.c
-ROUTER_MAGIC 0x524d4157 wan_device [in wanrouter.h pre 3.9]
-SAVEKMSG_MAGIC1 0x53415645 savekmsg arch/*/amiga/config.c
-GDA_MAGIC 0x58464552 gda arch/mips/include/asm/sn/gda.h
-RED_MAGIC1 0x5a2cf071 (any) mm/slab.c
-EEPROM_MAGIC_VALUE 0x5ab478d2 lanai_dev drivers/atm/lanai.c
-HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state include/linux/hdlcdrv.h
-PCXX_MAGIC 0x5c6df104 channel drivers/char/pcxx.h
-KV_MAGIC 0x5f4b565f kernel_vars_s arch/mips/include/asm/sn/klkernvars.h
-I810_STATE_MAGIC 0x63657373 i810_state sound/oss/i810_audio.c
-TRIDENT_STATE_MAGIC 0x63657373 trient_state sound/oss/trident.c
-M3_CARD_MAGIC 0x646e6f50 m3_card sound/oss/maestro3.c
-FW_HEADER_MAGIC 0x65726F66 fw_header drivers/atm/fore200e.h
-SLOT_MAGIC 0x67267321 slot drivers/hotplug/cpqphp.h
-SLOT_MAGIC 0x67267322 slot drivers/hotplug/acpiphp.h
-LO_MAGIC 0x68797548 nbd_device include/linux/nbd.h
-OPROFILE_MAGIC 0x6f70726f super_block drivers/oprofile/oprofilefs.h
-M3_STATE_MAGIC 0x734d724d m3_state sound/oss/maestro3.c
-VMALLOC_MAGIC 0x87654320 snd_alloc_track sound/core/memory.c
-KMALLOC_MAGIC 0x87654321 snd_alloc_track sound/core/memory.c
-PWC_MAGIC 0x89DC10AB pwc_device drivers/usb/media/pwc.h
-NBD_REPLY_MAGIC 0x96744668 nbd_reply include/linux/nbd.h
-ENI155_MAGIC 0xa54b872d midway_eprom drivers/atm/eni.h
-CODA_MAGIC 0xC0DAC0DA coda_file_info include/linux/coda_fs_i.h
-DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram drivers/scsi/gdth.h
-YAM_MAGIC 0xF10A7654 yam_port drivers/net/hamradio/yam.c
-CCB_MAGIC 0xf2691ad2 ccb drivers/scsi/ncr53c8xx.c
-QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry drivers/scsi/arm/queue.c
-QUEUE_MAGIC_USED 0xf7e1cc33 queue_entry drivers/scsi/arm/queue.c
-HTB_CMAGIC 0xFEFAFEF1 htb_class net/sched/sch_htb.c
-NMI_MAGIC 0x48414d4d455201 nmi_s arch/mips/include/asm/sn/nmi.h
+===================== ================ ======================== ==========================================
+魔术数名 数字 结构 文件
+===================== ================ ======================== ==========================================
+PG_MAGIC 'P' pg_{read,write}_hdr ``include/linux/pg.h``
+CMAGIC 0x0111 user ``include/linux/a.out.h``
+MKISS_DRIVER_MAGIC 0x04bf mkiss_channel ``drivers/net/mkiss.h``
+HDLC_MAGIC 0x239e n_hdlc ``drivers/char/n_hdlc.c``
+APM_BIOS_MAGIC 0x4101 apm_user ``arch/x86/kernel/apm_32.c``
+CYCLADES_MAGIC 0x4359 cyclades_port ``include/linux/cyclades.h``
+DB_MAGIC 0x4442 fc_info ``drivers/net/iph5526_novram.c``
+DL_MAGIC 0x444d fc_info ``drivers/net/iph5526_novram.c``
+FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/fs.h``
+FF_MAGIC 0x4646 fc_info ``drivers/net/iph5526_novram.c``
+ISICOM_MAGIC 0x4d54 isi_port ``include/linux/isicom.h``
+PTY_MAGIC 0x5001 ``drivers/char/pty.c``
+PPP_MAGIC 0x5002 ppp ``include/linux/if_pppvar.h``
+SERIAL_MAGIC 0x5301 async_struct ``include/linux/serial.h``
+SSTATE_MAGIC 0x5302 serial_state ``include/linux/serial.h``
+SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h``
+STRIP_MAGIC 0x5303 strip ``drivers/net/strip.c``
+X25_ASY_MAGIC 0x5303 x25_asy ``drivers/net/x25_asy.h``
+SIXPACK_MAGIC 0x5304 sixpack ``drivers/net/hamradio/6pack.h``
+AX25_MAGIC 0x5316 ax_disp ``drivers/net/mkiss.h``
+TTY_MAGIC 0x5401 tty_struct ``include/linux/tty.h``
+MGSL_MAGIC 0x5401 mgsl_info ``drivers/char/synclink.c``
+TTY_DRIVER_MAGIC 0x5402 tty_driver ``include/linux/tty_driver.h``
+MGSLPC_MAGIC 0x5402 mgslpc_info ``drivers/char/pcmcia/synclink_cs.c``
+TTY_LDISC_MAGIC 0x5403 tty_ldisc ``include/linux/tty_ldisc.h``
+USB_SERIAL_MAGIC 0x6702 usb_serial ``drivers/usb/serial/usb-serial.h``
+FULL_DUPLEX_MAGIC 0x6969 ``drivers/net/ethernet/dec/tulip/de2104x.c``
+USB_BLUETOOTH_MAGIC 0x6d02 usb_bluetooth ``drivers/usb/class/bluetty.c``
+RFCOMM_TTY_MAGIC 0x6d02 ``net/bluetooth/rfcomm/tty.c``
+USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port ``drivers/usb/serial/usb-serial.h``
+CG_MAGIC 0x00090255 ufs_cylinder_group ``include/linux/ufs_fs.h``
+RPORT_MAGIC 0x00525001 r_port ``drivers/char/rocket_int.h``
+LSEMAGIC 0x05091998 lse ``drivers/fc4/fc.c``
+GDTIOCTL_MAGIC 0x06030f07 gdth_iowr_str ``drivers/scsi/gdth_ioctl.h``
+RIEBL_MAGIC 0x09051990 ``drivers/net/atarilance.c``
+NBD_REQUEST_MAGIC 0x12560953 nbd_request ``include/linux/nbd.h``
+RED_MAGIC2 0x170fc2a5 (any) ``mm/slab.c``
+BAYCOM_MAGIC 0x19730510 baycom_state ``drivers/net/baycom_epp.c``
+ISDN_X25IFACE_MAGIC 0x1e75a2b9 isdn_x25iface_proto_data ``drivers/isdn/isdn_x25iface.h``
+ECP_MAGIC 0x21504345 cdkecpsig ``include/linux/cdk.h``
+LSOMAGIC 0x27091997 lso ``drivers/fc4/fc.c``
+LSMAGIC 0x2a3b4d2a ls ``drivers/fc4/fc.c``
+WANPIPE_MAGIC 0x414C4453 sdla_{dump,exec} ``include/linux/wanpipe.h``
+CS_CARD_MAGIC 0x43525553 cs_card ``sound/oss/cs46xx.c``
+LABELCL_MAGIC 0x4857434c labelcl_info_s ``include/asm/ia64/sn/labelcl.h``
+ISDN_ASYNC_MAGIC 0x49344C01 modem_info ``include/linux/isdn.h``
+CTC_ASYNC_MAGIC 0x49344C01 ctc_tty_info ``drivers/s390/net/ctctty.c``
+ISDN_NET_MAGIC 0x49344C02 isdn_net_local_s ``drivers/isdn/i4l/isdn_net_lib.h``
+SAVEKMSG_MAGIC2 0x4B4D5347 savekmsg ``arch/*/amiga/config.c``
+CS_STATE_MAGIC 0x4c4f4749 cs_state ``sound/oss/cs46xx.c``
+SLAB_C_MAGIC 0x4f17a36d kmem_cache ``mm/slab.c``
+COW_MAGIC 0x4f4f4f4d cow_header_v1 ``arch/um/drivers/ubd_user.c``
+I810_CARD_MAGIC 0x5072696E i810_card ``sound/oss/i810_audio.c``
+TRIDENT_CARD_MAGIC 0x5072696E trident_card ``sound/oss/trident.c``
+ROUTER_MAGIC 0x524d4157 wan_device [in ``wanrouter.h`` pre 3.9]
+SAVEKMSG_MAGIC1 0x53415645 savekmsg ``arch/*/amiga/config.c``
+GDA_MAGIC 0x58464552 gda ``arch/mips/include/asm/sn/gda.h``
+RED_MAGIC1 0x5a2cf071 (any) ``mm/slab.c``
+EEPROM_MAGIC_VALUE 0x5ab478d2 lanai_dev ``drivers/atm/lanai.c``
+HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h``
+PCXX_MAGIC 0x5c6df104 channel ``drivers/char/pcxx.h``
+KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h``
+I810_STATE_MAGIC 0x63657373 i810_state ``sound/oss/i810_audio.c``
+TRIDENT_STATE_MAGIC 0x63657373 trient_state ``sound/oss/trident.c``
+M3_CARD_MAGIC 0x646e6f50 m3_card ``sound/oss/maestro3.c``
+FW_HEADER_MAGIC 0x65726F66 fw_header ``drivers/atm/fore200e.h``
+SLOT_MAGIC 0x67267321 slot ``drivers/hotplug/cpqphp.h``
+SLOT_MAGIC 0x67267322 slot ``drivers/hotplug/acpiphp.h``
+LO_MAGIC 0x68797548 nbd_device ``include/linux/nbd.h``
+OPROFILE_MAGIC 0x6f70726f super_block ``drivers/oprofile/oprofilefs.h``
+M3_STATE_MAGIC 0x734d724d m3_state ``sound/oss/maestro3.c``
+VMALLOC_MAGIC 0x87654320 snd_alloc_track ``sound/core/memory.c``
+KMALLOC_MAGIC 0x87654321 snd_alloc_track ``sound/core/memory.c``
+PWC_MAGIC 0x89DC10AB pwc_device ``drivers/usb/media/pwc.h``
+NBD_REPLY_MAGIC 0x96744668 nbd_reply ``include/linux/nbd.h``
+ENI155_MAGIC 0xa54b872d midway_eprom ``drivers/atm/eni.h``
+CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h``
+DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram ``drivers/scsi/gdth.h``
+YAM_MAGIC 0xF10A7654 yam_port ``drivers/net/hamradio/yam.c``
+CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c``
+QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry ``drivers/scsi/arm/queue.c``
+QUEUE_MAGIC_USED 0xf7e1cc33 queue_entry ``drivers/scsi/arm/queue.c``
+HTB_CMAGIC 0xFEFAFEF1 htb_class ``net/sched/sch_htb.c``
+NMI_MAGIC 0x48414d4d455201 nmi_s ``arch/mips/include/asm/sn/nmi.h``
+===================== ================ ======================== ==========================================
+
请注意，在声音记忆管理中仍然有一些特殊的为每个驱动定义的魔术值。查看include/sound/sndmagic.h来获取他们完整的列表信息。很多OSS声音驱动拥有自己从声卡PCI ID构建的魔术值-他们也没有被列在这里。
--
2.19.1.856.g8858448bb
Make it available for html etc docs making.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Bryan Wu <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
...ile-considered-harmful.txt => volatile-considered-harmful.rst} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/process/{volatile-considered-harmful.txt => volatile-considered-harmful.rst} (100%)
diff --git a/Documentation/translations/zh_CN/process/volatile-considered-harmful.txt b/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst
similarity index 100%
rename from Documentation/translations/zh_CN/process/volatile-considered-harmful.txt
rename to Documentation/translations/zh_CN/process/volatile-considered-harmful.rst
--
2.19.1.856.g8858448bb
Rename the file to make it available in html etc docs making.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Yang <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/{SubmittingDrivers => submitting-drivers.rst} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/process/{SubmittingDrivers => submitting-drivers.rst} (100%)
diff --git a/Documentation/translations/zh_CN/process/SubmittingDrivers b/Documentation/translations/zh_CN/process/submitting-drivers.rst
similarity index 100%
rename from Documentation/translations/zh_CN/process/SubmittingDrivers
rename to Documentation/translations/zh_CN/process/submitting-drivers.rst
--
2.19.1.856.g8858448bb
Make it available in htmldocs
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Yang <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
Documentation/translations/zh_CN/process/{HOWTO => howto.rst} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/process/{HOWTO => howto.rst} (100%)
diff --git a/Documentation/translations/zh_CN/process/HOWTO b/Documentation/translations/zh_CN/process/howto.rst
similarity index 100%
rename from Documentation/translations/zh_CN/process/HOWTO
rename to Documentation/translations/zh_CN/process/howto.rst
--
2.19.1.856.g8858448bb
And remove Enghlish explainations in the docs, which it isn't
necessary in Chinese doc.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: TripleX Chung <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/submitting-patches.rst | 36 +++++++------------
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/submitting-patches.rst b/Documentation/translations/zh_CN/process/submitting-patches.rst
index e9098da8f1a4..2a2989733c8d 100644
--- a/Documentation/translations/zh_CN/process/submitting-patches.rst
+++ b/Documentation/translations/zh_CN/process/submitting-patches.rst
@@ -1,31 +1,21 @@
-Chinese translated version of Documentation/process/submitting-patches.rst
+.. _cn_process_submittingpatches:
-If you have any comment or update to the content, please contact the
-original document maintainer directly. However, if you have a problem
-communicating in English you can also ask the Chinese maintainer for
-help. Contact the Chinese maintainer if this translation is outdated
-or if there is a problem with the translation.
+.. include:: ../disclaimer-zh_CN.rst
-Chinese maintainer: TripleX Chung <[email protected]>
----------------------------------------------------------------------
-Documentation/process/submitting-patches.rst 的中文翻译
+:Original: :ref:`Documentation/process/submitting-patches.rst <submittingpatches>`
如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
-译存在问题，请联系中文版维护者。
+译存在问题，请联系中文版维护者::
-中文版维护者： 钟宇 TripleX Chung <[email protected]>
-中文版翻译者： 钟宇 TripleX Chung <[email protected]>
-中文版校译者： 李阳 Li Yang <[email protected]>
- 王聪 Wang Cong <[email protected]>
+ 中文版维护者： 钟宇 TripleX Chung <[email protected]>
+ 中文版翻译者： 钟宇 TripleX Chung <[email protected]>
+ 中文版校译者： 李阳 Li Yang <[email protected]>
+ 王聪 Wang Cong <[email protected]>
-以下为正文
----------------------------------------------------------------------
- 如何让你的改动进入内核
- 或者
- 获得亲爱的 Linus Torvalds 的关注和处理
-----------------------------------
+如何让你的改动进入内核
+======================
对于想要将改动提交到 Linux 内核的个人或者公司来说，如果不熟悉“规矩”，
提交的流程会让人畏惧。本文档收集了一系列建议，这些建议可以大大的提高你
@@ -35,12 +25,12 @@ Documentation/process/submitting-patches.rst 的中文翻译
Documentation/process/submitting-drivers.rst 。
---------------------------
+---------------------------
第一节 - 创建并发送你的改动
---------------------------
+---------------------------
1) "diff -up"
------------
+-------------
使用 "diff -up" 或者 "diff -uprN" 来创建补丁。
--
2.19.1.856.g8858448bb
This patch renamed stable_kernel_rules.txt to stable-kernel-rules.rst
Make it available in htmldocs making.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: TripleX Chung <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../process/{stable_kernel_rules.txt => stable-kernel-rules.rst} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/process/{stable_kernel_rules.txt => stable-kernel-rules.rst} (100%)
diff --git a/Documentation/translations/zh_CN/process/stable_kernel_rules.txt b/Documentation/translations/zh_CN/process/stable-kernel-rules.rst
similarity index 100%
rename from Documentation/translations/zh_CN/process/stable_kernel_rules.txt
rename to Documentation/translations/zh_CN/process/stable-kernel-rules.rst
--
2.19.1.856.g8858448bb
to Make it readble with rst format.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: TripleX Chung <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/stable-kernel-rules.rst | 32 +++++++++----------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/stable-kernel-rules.rst b/Documentation/translations/zh_CN/process/stable-kernel-rules.rst
index db4ba5a0c39a..425d06f99ac2 100644
--- a/Documentation/translations/zh_CN/process/stable-kernel-rules.rst
+++ b/Documentation/translations/zh_CN/process/stable-kernel-rules.rst
@@ -1,31 +1,26 @@
-Chinese translated version of Documentation/process/stable-kernel-rules.rst
+.. _cn_stable_kernel_rules:
-If you have any comment or update to the content, please contact the
-original document maintainer directly. However, if you have a problem
-communicating in English you can also ask the Chinese maintainer for
-help. Contact the Chinese maintainer if this translation is outdated
-or if there is a problem with the translation.
+.. include:: ../disclaimer-zh_CN.rst
-Chinese maintainer: TripleX Chung <[email protected]>
----------------------------------------------------------------------
-Documentation/process/stable-kernel-rules.rst 的中文翻译
+:Original: :ref:`Documentation/process/stable-kernel-rules.rst <stable_kernel_rules>`
如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
-译存在问题，请联系中文版维护者。
+译存在问题，请联系中文版维护者::
+ 中文版维护者： 钟宇 TripleX Chung <[email protected]>
+ 中文版翻译者： 钟宇 TripleX Chung <[email protected]>
+ 中文版校译者：
+ - 李阳 Li Yang <[email protected]>
+ - Kangkai Yin <[email protected]>
-中文版维护者： 钟宇 TripleX Chung <[email protected]>
-中文版翻译者： 钟宇 TripleX Chung <[email protected]>
-中文版校译者： 李阳 Li Yang <[email protected]>
- Kangkai Yin <[email protected]>
-
-以下为正文
----------------------------------------------------------------------
+所有你想知道的事情 - 关于linux稳定版发布
+========================================
关于Linux 2.6稳定版发布，所有你想知道的事情。
关于哪些类型的补丁可以被接收进入稳定版代码树，哪些不可以的规则：
+----------------------------------------------------------------
- 必须是显而易见的正确，并且经过测试的。
- 连同上下文，不能大于100行。
@@ -41,6 +36,7 @@ Documentation/process/stable-kernel-rules.rst 的中文翻译
- 必须遵循Documentation/process/submitting-patches.rst里的规则。
向稳定版代码树提交补丁的过程：
+------------------------------
- 在确认了补丁符合以上的规则后，将补丁发送到[email protected]。
- 如果补丁被接受到队列里，发送者会收到一个ACK回复，如果没有被接受，收
@@ -49,6 +45,7 @@ Documentation/process/stable-kernel-rules.rst 的中文翻译
- 安全方面的补丁不要发到这个列表，应该发送到[email protected]。
审查周期：
+----------
- 当稳定版的维护者决定开始一个审查周期，补丁将被发送到审查委员会，以
及被补丁影响的领域的维护者（除非提交者就是该领域的维护者）并且抄送
@@ -63,4 +60,5 @@ Documentation/process/stable-kernel-rules.rst 的中文翻译
通常的审查周期。请联系内核安全小组以获得关于这个过程的更多细节。
审查委员会：
+------------
- 由一些自愿承担这项任务的内核开发者，和几个非志愿的组成。
--
2.19.1.856.g8858448bb
renamed: Documentation/translations/zh_CN/process/SubmittingPatches
-> Documentation/translations/zh_CN/process/submitting-patches.rst
For htmldoc links. And will change the doc format to rst.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: TripleX Chung <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/{SubmittingPatches => submitting-patches.rst} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/process/{SubmittingPatches => submitting-patches.rst} (100%)
diff --git a/Documentation/translations/zh_CN/process/SubmittingPatches b/Documentation/translations/zh_CN/process/submitting-patches.rst
similarity index 100%
rename from Documentation/translations/zh_CN/process/SubmittingPatches
rename to Documentation/translations/zh_CN/process/submitting-patches.rst
--
2.19.1.856.g8858448bb
make it readble as rst format for html etc doc making.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Bryan Wu <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../process/volatile-considered-harmful.rst | 35 ++++++++-----------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst b/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst
index 475125967197..48b32ce58ef1 100644
--- a/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst
+++ b/Documentation/translations/zh_CN/process/volatile-considered-harmful.rst
@@ -1,30 +1,23 @@
-Chinese translated version of Documentation/process/volatile-considered-harmful.rst
+.. _cn_volatile_considered_harmful:
-If you have any comment or update to the content, please contact the
-original document maintainer directly. However, if you have a problem
-communicating in English you can also ask the Chinese maintainer for
-help. Contact the Chinese maintainer if this translation is outdated
-or if there is a problem with the translation.
+.. include:: ../disclaimer-zh_CN.rst
-Maintainer: Jonathan Corbet <[email protected]>
-Chinese maintainer: Bryan Wu <[email protected]>
----------------------------------------------------------------------
-Documentation/process/volatile-considered-harmful.rst 的中文翻译
+:Original: :ref:`Documentation/process/volatile-considered-harmful.rst
+ <volatile_considered_harmful>`
如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
-译存在问题，请联系中文版维护者。
+译存在问题，请联系中文版维护者::
-英文版维护者： Jonathan Corbet <[email protected]>
-中文版维护者： 伍鹏 Bryan Wu <[email protected]>
-中文版翻译者： 伍鹏 Bryan Wu <[email protected]>
-中文版校译者： 张汉辉 Eugene Teo <[email protected]>
- 杨瑞 Dave Young <[email protected]>
-以下为正文
----------------------------------------------------------------------
+ 英文版维护者： Jonathan Corbet <[email protected]>
+ 中文版维护者： 伍鹏 Bryan Wu <[email protected]>
+ 中文版翻译者： 伍鹏 Bryan Wu <[email protected]>
+ 中文版校译者： 张汉辉 Eugene Teo <[email protected]>
+ 杨瑞 Dave Young <[email protected]>
+ 时奎亮 Alex Shi <[email protected]>
为什么不应该使用“volatile”类型
-------------------------------
+==============================
C程序员通常认为volatile表示某个变量可以在当前执行的线程之外被改变；因此，在内核
中用到共享数据结构时，常常会有C程序员喜欢使用volatile这类变量。换句话说，他们经
@@ -41,7 +34,7 @@ C程序员通常认为volatile表示某个变量可以在当前执行的线程
必要再使用volatile。如果仍然必须使用volatile，那么几乎可以肯定在代码的某处有一
个bug。在正确设计的内核代码中，volatile能带来的仅仅是使事情变慢。
-思考一下这段典型的内核代码：
+思考一下这段典型的内核代码::
spin_lock(&the_lock);
do_something_on(&shared_data);
@@ -66,7 +59,7 @@ volatile的存储类型最初是为那些内存映射的I/O寄存器而定义。
是必需的。
另一种引起用户可能使用volatile的情况是当处理器正忙着等待一个变量的值。正确执行一
-个忙等待的方法是：
+个忙等待的方法是::
while (my_variable != what_i_want)
cpu_relax();
--
2.19.1.856.g8858448bb
Make it available for html etc docs.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/{email-clients.txt => email-clients.rst} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename Documentation/translations/zh_CN/process/{email-clients.txt => email-clients.rst} (100%)
diff --git a/Documentation/translations/zh_CN/process/email-clients.txt b/Documentation/translations/zh_CN/process/email-clients.rst
similarity index 100%
rename from Documentation/translations/zh_CN/process/email-clients.txt
rename to Documentation/translations/zh_CN/process/email-clients.rst
--
2.19.1.856.g8858448bb
Make it readble as rst format.
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../zh_CN/process/email-clients.rst | 53 ++++++++-----------
1 file changed, 22 insertions(+), 31 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/email-clients.rst b/Documentation/translations/zh_CN/process/email-clients.rst
index ec31d97e8d0e..e8641a5899e4 100644
--- a/Documentation/translations/zh_CN/process/email-clients.rst
+++ b/Documentation/translations/zh_CN/process/email-clients.rst
@@ -1,33 +1,24 @@
-Chinese translated version of Documentation/process/email-clients.rst
+.. _cn_email_clients:
-If you have any comment or update to the content, please contact the
-original document maintainer directly. However, if you have a problem
-communicating in English you can also ask the Chinese maintainer for
-help. Contact the Chinese maintainer if this translation is outdated
-or if there is a problem with the translation.
+.. include:: ../disclaimer-zh_CN.rst
-Chinese maintainer: Harry Wei <[email protected]>
----------------------------------------------------------------------
-Documentation/process/email-clients.rst 的中文翻译
+:Original: :ref:`Documentation/process/email-clients.rst <email_clients>`
如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
-译存在问题，请联系中文版维护者。
+译存在问题，请联系中文版维护者::
-中文版维护者： 贾威威 Harry Wei <[email protected]>
-中文版翻译者： 贾威威 Harry Wei <[email protected]>
-中文版校译者： Yinglin Luan <[email protected]>
- Xiaochen Wang <[email protected]>
- yaxinsn <[email protected]>
-
-以下为正文
----------------------------------------------------------------------
+ 中文版维护者： 贾威威 Harry Wei <[email protected]>
+ 中文版翻译者： 贾威威 Harry Wei <[email protected]>
+ 中文版校译者： Yinglin Luan <[email protected]>
+ Xiaochen Wang <[email protected]>
+ yaxinsn <[email protected]>
Linux邮件客户端配置信息
-======================================================================
+=======================
普通配置
-----------------------------------------------------------------------
+--------
Linux内核补丁是通过邮件被提交的，最好把补丁作为邮件体的内嵌文本。有些维护者
接收附件，但是附件的内容格式应该是"text/plain"。然而，附件一般是不赞成的，
因为这会使补丁的引用部分在评论过程中变的很困难。
@@ -56,7 +47,7 @@ Linux内核补丁是通过邮件被提交的，最好把补丁作为邮件体的
一些邮件客户端提示
-----------------------------------------------------------------------
+------------------
这里给出一些详细的MUA配置提示，可以用于给Linux内核发送补丁。这些并不意味是
所有的软件包配置总结。
@@ -64,8 +55,8 @@ Linux内核补丁是通过邮件被提交的，最好把补丁作为邮件体的
TUI = 以文本为基础的用户接口
GUI = 图形界面用户接口
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Alpine (TUI)
+~~~~~~~~~~~~
配置选项：
在"Sending Preferences"部分：
@@ -76,8 +67,8 @@ Alpine (TUI)
当写邮件时，光标应该放在补丁会出现的地方，然后按下CTRL-R组合键，使指定的
补丁文件嵌入到邮件中。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Evolution (GUI)
+~~~~~~~~~~~~~~~
一些开发者成功的使用它发送补丁
@@ -89,8 +80,8 @@ Evolution (GUI)
你还可以"diff -Nru old.c new.c | xclip"，选择Preformat，然后使用中间键进行粘帖。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kmail (GUI)
+~~~~~~~~~~~
一些开发者成功的使用它发送补丁。
@@ -118,13 +109,13 @@ display"，这样内嵌附件更容易让读者看到。
并且希望这将会被处理。邮件是以只针对某个用户可读写的权限被保存的，所以如果你想把邮件复制到其他地方，
你不得不把他们的权限改为组或者整体可读。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Lotus Notes (GUI)
+~~~~~~~~~~~~~~~~~
不要使用它。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Mutt (TUI)
+~~~~~~~~~~
很多Linux开发人员使用mutt客户端，所以证明它肯定工作的非常漂亮。
@@ -146,8 +137,8 @@ Mutt不自带编辑器，所以不管你使用什么编辑器都不应该带有
它应该以默认设置的形式工作。
然而，把"send_charset"设置为"us-ascii::utf-8"也是一个不错的主意。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Pine (TUI)
+~~~~~~~~~~
Pine过去有一些空格删减问题，但是这些现在应该都被修复了。
@@ -158,8 +149,8 @@ Pine过去有一些空格删减问题，但是这些现在应该都被修复了
- "no-strip-whitespace-before-send"选项也是需要的。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Sylpheed (GUI)
+~~~~~~~~~~~~~~
- 内嵌文本可以很好的工作（或者使用附件）。
- 允许使用外部的编辑器。
@@ -168,8 +159,8 @@ Sylpheed (GUI)
- 在组成窗口中有一个很有用的ruler bar。
- 给地址本中添加地址就不会正确的了解显示名。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Thunderbird (GUI)
+~~~~~~~~~~~~~~~~~
默认情况下，thunderbird很容易损坏文本，但是还有一些方法可以强制它变得更好。
@@ -191,13 +182,13 @@ Thunderbird (GUI)
$EDITOR来读取或者合并补丁到文本中。要实现它，可以下载并且安装这个扩展，然后添加一个使用它的
按键View->Toolbars->Customize...最后当你书写信息的时候仅仅点击它就可以了。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
TkRat (GUI)
+~~~~~~~~~~~
可以使用它。使用"Insert file..."或者外部的编辑器。
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Gmail (Web GUI)
+~~~~~~~~~~~~~~~
不要使用它发送补丁。
--
2.19.1.856.g8858448bb
also with few contents changes
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Yang <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../translations/zh_CN/process/howto.rst | 37 ++++++++-----------
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/Documentation/translations/zh_CN/process/howto.rst b/Documentation/translations/zh_CN/process/howto.rst
index 5f6d09edc9ac..e4e800591ae9 100644
--- a/Documentation/translations/zh_CN/process/howto.rst
+++ b/Documentation/translations/zh_CN/process/howto.rst
@@ -1,32 +1,23 @@
-Chinese translated version of Documentation/process/howto.rst
+.. _cn_process_howto:
-If you have any comment or update to the content, please contact the
-original document maintainer directly. However, if you have a problem
-communicating in English you can also ask the Chinese maintainer for
-help. Contact the Chinese maintainer if this translation is outdated
-or if there is a problem with the translation.
+.. include:: ../disclaimer-zh_CN.rst
-Maintainer: Greg Kroah-Hartman <[email protected]>
-Chinese maintainer: Li Yang <[email protected]>
----------------------------------------------------------------------
-Documentation/process/howto.rst 的中文翻译
+:Original: :ref:`Documentation/process/howto.rst <process_howto>`
如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
-译存在问题，请联系中文版维护者。
+译存在问题，请联系中文版维护者::
-英文版维护者： Greg Kroah-Hartman <[email protected]>
-中文版维护者： 李阳 Li Yang <[email protected]>
-中文版翻译者： 李阳 Li Yang <[email protected]>
-中文版校译者： 钟宇 TripleX Chung <[email protected]>
- 陈琦 Maggie Chen <[email protected]>
- 王聪 Wang Cong <[email protected]>
-
-以下为正文
----------------------------------------------------------------------
+ 英文版维护者： Greg Kroah-Hartman <[email protected]>
+ 中文版维护者： 李阳 Li Yang <[email protected]>
+ 中文版翻译者： 李阳 Li Yang <[email protected]>
+ 中文版校译者:
+ 钟宇 TripleX Chung <[email protected]>
+ 陈琦 Maggie Chen <[email protected]>
+ 王聪 Wang Cong <[email protected]>
如何参与Linux内核开发
----------------------
+=====================
这是一篇将如何参与Linux内核开发的相关问题一网打尽的终极秘笈。它将指导你
成为一名Linux内核开发者，并且学会如何同Linux内核开发社区合作。它尽可能不
@@ -114,6 +105,7 @@ Linux内核代码中包含有大量的文档。这些文档对于学习如何与
"The Perfect Patch"
http://www.ozlabs.org/~akpm/stuff/tpp.txt
"Linux kernel patch submission format"
+
http://linux.yyz.us/patch-format.html
Documentation/process/stable-api-nonsense.rst
@@ -519,7 +511,8 @@ Linux内核社区并不喜欢一下接收大段的代码。修改需要被恰当
很多人已经做到了，而他们都曾经和现在的你站在同样的起点上。
----------------
+感谢
+----
感谢Paolo Ciarrocchi允许“开发流程”部分基于他所写的文章
(http://www.kerneltravel.net/newbie/2.6-development_process)，感谢Randy
Dunlap和Gerrit Huizenga完善了应该说和不该说的列表。感谢Pat Mochel, Hanna
--
2.19.1.856.g8858448bb
Signed-off-by: Alex Shi <[email protected]>
Cc: Harry Wei <[email protected]>
Cc: Jonathan Corbet <[email protected]>
Cc: Li Zefan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Coly Li <[email protected]>
---
.../translations/zh_CN/process/index.rst | 53 +++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 Documentation/translations/zh_CN/process/index.rst
diff --git a/Documentation/translations/zh_CN/process/index.rst b/Documentation/translations/zh_CN/process/index.rst
new file mode 100644
index 000000000000..03939e1a7b92
--- /dev/null
+++ b/Documentation/translations/zh_CN/process/index.rst
@@ -0,0 +1,53 @@
+.. raw:: latex
+
+ \renewcommand\thesection*
+ \renewcommand\thesubsection*
+
+.. include:: ../disclaimer-zh_CN.rst
+
+:Original: :ref:`Documentation/process/index.rst <process_index>`
+:Translator: Alex Shi <[email protected]>
+
+.. _cn_process_index:
+
+与Linux 内核社区一起工作
+========================
+
+那么你想成为Linux内核开发人员？ 欢迎！ 不但从技术意义上讲有很多关于内核的知识
+需要学，而且了解我们社区的工作方式也很重要。 阅读这些文章可以让您以更轻松地,
+麻烦最少的方式将更改合并到内核。
+
+以下是每位开发人员应阅读的基本指南。
+
+.. toctree::
+ :maxdepth: 1
+
+ howto
+ submitting-patches
+ coding-style
+ email-clients
+
+其它大多数开发人员感兴趣的社区指南：
+
+
+.. toctree::
+ :maxdepth: 1
+
+ submitting-drivers
+ stable-api-nonsense
+ stable-kernel-rules
+
+这些是一些总体技术指南，由于缺乏更好的地方，现在已经放在这里
+
+.. toctree::
+ :maxdepth: 1
+
+ magic-number
+ volatile-considered-harmful
+
+.. only:: subproject and html
+
+ 目录
+ ====
+
+ * :ref:`genindex`
--
2.19.1.856.g8858448bb
CC more active Chinese peoples.
Hi Harry,
Could you please give some comments as the patch series is updated to v3 and I can't see any problem of this series?
There could do more on the processing docs translation, but as the first step, we want comments from Chinese doc maintainer.
Thanks
Alex
On 2019/3/8 11:08 上午, Alex Shi wrote:
> Hi All,
>
> The following patches change existing Chinese kernel docs to rst format
> and reorg them to make them alive in 'make htmldocs'.
>
> you can view the generated htmldocs from:
> http://176.122.172.82/translations/zh_CN/index.html
>
> Or make and review docs on your self box:
>
> make htmldocs SPHINXDIRS=translations/zh_CN
> lynx Documentation/output/translations/zh_CN/index.html
>
> Any comments are appreciated!
>
> V3 changes:
> 1, fix a zh_CN/index.rst display issue
> 2, update .mailmap for zh_CN transolators'r email address
>
> V2 changes:
> 1, change the disclaimer file to Chinese version,
> 2, replace the obsolete translator's email address in related files.
> 3, fix couple of format issues in couple files
>
> Cheers!
> Alex
>
>
> Alex Shi (31):
> docs/zh_CN: add disclaimer file
> docs/zh_CN: move process related docs into process dir
> docs/zh_CN: change Chinese index to know process dir
> docs/zh_CN: add index file into process dir
> docs/zh_CN: rename HOWTO into process directory
> docs/zh_CN: howto format changes
> docs/zh_CN: rename SubmittingPatches for html links
> docs/zh_CN: format the submitting-patches doc to rst
> docs/zh_CN: rename stable_kernel_rules doc
> docs/zh_CN: rst format change for stable-kernel-rules
> docs/zh_CN: rename email-clients.txt as email-clients.rst
> docs/zh_CN: do rst format for email-clients.rst
> docs/zh_CN: rename volatile-consider-harmful doc
> docs/zh_CN: volatile doc format changes
> docs/zh_CN: rename SubmittingDrivers
> docs/zh_CN: format submitting drivers as rst
> docs/zh_CN: rename magic-numbers as rst doc
> docs/zh_CN: format the magic-number doc as rst
> docs/zh_CN: rename stable_api_nonsense.txt as stable-api-nonsense.rst
> docs/zh_CN: format stable-api-nonsense
> docs/zh_CN: update Li Yang's email address
> mailmap: update Li Yang's email address
> docs/zh_CN: update Zhang Wei's email address
> mailmap: update email address for Triplex
> docs/zh_CN: update TripleX chung's email address
> docs/zh_CN: fix rst format errors in howto.rst
> docs/zh_CN: fix indent issue in stable-api-nonsense file
> docs/zh_CN: fix indent issue in submitting-drivers
> docs/zh_CN: fix rst format issue in submitting-patch
> docs/zh_CN: remove zh-kernel.org in MAINTAINERS
> mailmap: update my obsolete email address
>
> .mailmap | 6 +
> .../translations/zh_CN/disclaimer-zh_CN.rst | 9 ++
> Documentation/translations/zh_CN/index.rst | 17 +-
> .../translations/zh_CN/magic-number.txt | 153 ------------------
> .../translations/zh_CN/oops-tracing.txt | 2 +-
> .../zh_CN/{ => process}/coding-style.rst | 0
> .../email-clients.rst} | 53 +++---
> .../zh_CN/{HOWTO => process/howto.rst} | 69 +++++---
> .../translations/zh_CN/process/index.rst | 53 ++++++
> .../zh_CN/process/magic-number.rst | 151 +++++++++++++++++
> .../stable-api-nonsense.rst} | 67 ++++----
> .../stable-kernel-rules.rst} | 32 ++--
> .../submitting-drivers.rst} | 34 ++--
> .../submitting-patches.rst} | 60 ++++---
> .../volatile-considered-harmful.rst} | 35 ++--
> Documentation/translations/zh_CN/sparse.txt | 6 +-
> MAINTAINERS | 1 -
> 17 files changed, 408 insertions(+), 340 deletions(-)
> create mode 100644 Documentation/translations/zh_CN/disclaimer-zh_CN.rst
> delete mode 100644 Documentation/translations/zh_CN/magic-number.txt
> rename Documentation/translations/zh_CN/{ => process}/coding-style.rst (100%)
> rename Documentation/translations/zh_CN/{email-clients.txt => process/email-clients.rst} (82%)
> rename Documentation/translations/zh_CN/{HOWTO => process/howto.rst} (95%)
> create mode 100644 Documentation/translations/zh_CN/process/index.rst
> create mode 100644 Documentation/translations/zh_CN/process/magic-number.rst
> rename Documentation/translations/zh_CN/{stable_api_nonsense.txt => process/stable-api-nonsense.rst} (80%)
> rename Documentation/translations/zh_CN/{stable_kernel_rules.txt => process/stable-kernel-rules.rst} (76%)
> rename Documentation/translations/zh_CN/{SubmittingDrivers => process/submitting-drivers.rst} (86%)
> rename Documentation/translations/zh_CN/{SubmittingPatches => process/submitting-patches.rst} (92%)
> rename Documentation/translations/zh_CN/{volatile-considered-harmful.txt => process/volatile-considered-harmful.rst} (81%)
>
On Mon, 11 Mar 2019 14:31:08 +0800
Alex Shi <[email protected]> wrote:
> What's the normal process of the Chinese kernel doc pick up? Will you
> send a pull request to Corbet? or Corbet pick it them with your comment?
Please repost the series with acks and comments applied - preferably after
the close of the merge window - and I'll apply them then.
Thanks,
jon