diff options
author | Linus Torvalds | 2019-05-08 21:42:50 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-05-08 21:42:50 +0200 |
commit | 8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf (patch) | |
tree | 0d7fca2a5fb43fa75b51c4cdaaee493e44d56d62 /Documentation/translations/zh_CN/oops-tracing.txt | |
parent | Merge tag 'kbuild-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masa... (diff) | |
parent | docs/livepatch: Unify style of livepatch documentation in the ReST format (diff) | |
download | kernel-qcow2-linux-8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf.tar.gz kernel-qcow2-linux-8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf.tar.xz kernel-qcow2-linux-8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf.zip |
Merge tag 'docs-5.2' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet:
"A reasonably busy cycle for docs, including:
- Lots of work on the Chinese and Italian translations
- Some license-rules clarifications from Christoph
- Various build-script fixes
- A new document on memory models
- RST conversion of the live-patching docs
- The usual collection of typo fixes and corrections"
* tag 'docs-5.2' of git://git.lwn.net/linux: (140 commits)
docs/livepatch: Unify style of livepatch documentation in the ReST format
docs: livepatch: convert docs to ReST and rename to *.rst
scripts/documentation-file-ref-check: detect broken :doc:`foo`
scripts/documentation-file-ref-check: don't parse Next/ dir
LICENSES: Rename other to deprecated
LICENSES: Clearly mark dual license only licenses
docs: Don't reference the ZLib license in license-rules.rst
docs/vm: Minor editorial changes in the THP and hugetlbfs
docs/vm: add documentation of memory models
doc:it_IT: translation alignment
doc: fix typo in PGP guide
dontdiff: update with Kconfig build artifacts
docs/zh_CN: fix typos in 1.Intro.rst file
docs/zh_CN: redirect CoC docs to Chinese version
doc: mm: migration doesn't use FOLL_SPLIT anymore
docs: doc-guide: remove the extension from .rst files
doc: kselftest: Fix KBUILD_OUTPUT usage instructions
docs: trace: fix some Sphinx warnings
docs: speculation.txt: mark example blocks as such
docs: ntb.txt: add blank lines to clean up some Sphinx warnings
...
Diffstat (limited to 'Documentation/translations/zh_CN/oops-tracing.txt')
-rw-r--r-- | Documentation/translations/zh_CN/oops-tracing.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/translations/zh_CN/oops-tracing.txt b/Documentation/translations/zh_CN/oops-tracing.txt index a893f04dfd5d..93fa061cf9e4 100644 --- a/Documentation/translations/zh_CN/oops-tracing.txt +++ b/Documentation/translations/zh_CN/oops-tracing.txt @@ -16,7 +16,7 @@ Documentation/admin-guide/bug-hunting.rst 的中文翻译 中文版维护者: 杨瑞 Dave Young <hidave.darkstar@gmail.com> 中文版翻译者: 杨瑞 Dave Young <hidave.darkstar@gmail.com> -中文版校译者: 李阳 Li Yang <leo@zh-kernel.org> +中文版校译者: 李阳 Li Yang <leoyang.li@nxp.com> 王聪 Wang Cong <xiyou.wangcong@gmail.com> 以下为正文 |