diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 12:42:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 12:42:50 -0700 |
| commit | 8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf (patch) | |
| tree | 0d7fca2a5fb43fa75b51c4cdaaee493e44d56d62 /Documentation/translations/zh_CN/sparse.txt | |
| parent | 2646719a48c21ba0cae82a3f57382a9573fd8400 (diff) | |
| parent | d9defe448f4c7b88ca2ae636a321ef8970fa718d (diff) | |
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/sparse.txt')
| -rw-r--r-- | Documentation/translations/zh_CN/sparse.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/translations/zh_CN/sparse.txt b/Documentation/translations/zh_CN/sparse.txt index 2f728962a8e2..47fc4a06ebe8 100644 --- a/Documentation/translations/zh_CN/sparse.txt +++ b/Documentation/translations/zh_CN/sparse.txt @@ -6,7 +6,7 @@ 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. -Chinese maintainer: Li Yang <leo@zh-kernel.org> +Chinese maintainer: Li Yang <leoyang.li@nxp.com> --------------------------------------------------------------------- Documentation/dev-tools/sparse.rst 的中文翻译 @@ -14,8 +14,8 @@ Documentation/dev-tools/sparse.rst 的中文翻译 交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻 译存在问题，请联系中文版维护者。 -中文版维护者： 李阳 Li Yang <leo@zh-kernel.org> -中文版翻译者： 李阳 Li Yang <leo@zh-kernel.org> +中文版维护者： 李阳 Li Yang <leoyang.li@nxp.com> +中文版翻译者： 李阳 Li Yang <leoyang.li@nxp.com> 以下为正文 |