From: Yanteng Si <si.yanteng@linux.dev>
To: Dongliang Mu <dzm91@hust.edu.cn>, Alex Shi <alexs@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Randy Dunlap <rdunlap@infradead.org>, Weijie Yuan <wy@wyuan.org>,
Chen-Yu Yeh <chenyou910331@gmail.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 8/9] docs/zh_CN: update networking/xfrm/xfrm_proc.rst translation
Date: Fri, 30 Oct 2026 09:07:24 +0800 [thread overview]
Message-ID: <c641a11c-39c8-40c4-b162-10f3a3db57ff@linux.dev> (raw)
In-Reply-To: <20261029124429.294868-9-dzm91@hust.edu.cn>
在 2026/10/29 20:44, Dongliang Mu 写道:
> Move the XFRM proc translation to its current upstream location and
> adjust the disclaimer include. Add an XFRM chapter index and update
> the networking index to follow the English layout.
>
> Track the English xfrm_proc.rst through commit 03e23b18c720
> ("net: Move XFRM documentation into its own subdirectory").
>
> Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
Reviewed-by: Yanteng Si <si.yanteng@linux.dev>
> ---
> .../translations/zh_CN/networking/index.rst | 238 +++++++++---------
> .../zh_CN/networking/xfrm/index.rst | 20 ++
> .../zh_CN/networking/{ => xfrm}/xfrm_proc.rst | 4 +-
> 3 files changed, 138 insertions(+), 124 deletions(-)
> create mode 100644 Documentation/translations/zh_CN/networking/xfrm/index.rst
> rename Documentation/translations/zh_CN/networking/{ => xfrm}/xfrm_proc.rst (96%)
>
> diff --git a/Documentation/translations/zh_CN/networking/index.rst b/Documentation/translations/zh_CN/networking/index.rst
> index bf22d22b64db..9f28240d6b14 100644
> --- a/Documentation/translations/zh_CN/networking/index.rst
> +++ b/Documentation/translations/zh_CN/networking/index.rst
> @@ -2,8 +2,6 @@
>
> .. include:: ../disclaimer-zh_CN.rst
>
> -:Original: Documentation/networking/index.rst
> -
> :翻译:
>
> 王亚鑫 Wang Yaxin <wang.yaxin@zte.com.cn>
> @@ -13,142 +11,140 @@
> 网络
> ====
>
> -有关网络设备（netdev）开发过程的详细指南，请参考：:ref:`netdev-FAQ`
> +有关网络设备（netdev）开发流程的具体指南，请参阅 :ref:`netdev-FAQ`。
>
> 目录：
>
> .. toctree::
> - :maxdepth: 1
> + :maxdepth: 2
>
> msg_zerocopy
> + alias
> driver
> + generic-hdlc
> ipv6
> + mptcp-sysctl
> napi
> - secid
> - vxlan
> netif-msg
> - xfrm_proc
> netmem
> - alias
> - mptcp-sysctl
> - generic-hdlc
> + secid
> sriov
> team
> timestamping
> + vxlan
> + xfrm/index
>
> Todolist:
>
> -* af_xdp
> -* bareudp
> -* batman-adv
> -* can
> -* can_ucan_protocol
> -* device_drivers/index
> -* diagnostic/index
> -* dsa/index
> -* devlink/index
> -* ethtool-netlink
> -* ieee802154
> -* iso15765-2
> -* j1939
> -* kapi
> -* failover
> -* net_dim
> -* net_failover
> -* page_pool
> -* phy
> -* sfp-phylink
> -* bridge
> -* snmp_counter
> -* checksum-offloads
> -* segmentation-offloads
> -* scaling
> -* tls
> -* tls-offload
> -* tls-handshake
> -* nfc
> -* 6lowpan
> -* 6pack
> -* arcnet-hardware
> -* arcnet
> -* atm
> -* ax25
> -* bonding
> -* cdc_mbim
> -* dccp
> -* dctcp
> -* devmem
> -* dns_resolver
> -* eql
> -* fib_trie
> -* filter
> -* generic_netlink
> -* netlink_spec/index
> -* gen_stats
> -* gtp
> -* ila
> -* ioam6-sysctl
> -* ip_dynaddr
> -* ipsec
> -* ip-sysctl
> -* ipvlan
> -* ipvs-sysctl
> -* kcm
> -* l2tp
> -* lapb-module
> -* mac80211-injection
> -* mctp
> -* mpls-sysctl
> -* mptcp
> -* multiqueue
> -* multi-pf-netdev
> -* net_cachelines/index
> -* netconsole
> -* netdev-features
> -* netdevices
> -* netfilter-sysctl
> -* nexthop-group-resilient
> -* nf_conntrack-sysctl
> -* nf_flowtable
> -* oa-tc6-framework
> -* openvswitch
> -* operstates
> -* packet_mmap
> -* phonet
> -* phy-link-topology
> -* pktgen
> -* plip
> -* ppp_generic
> -* proc_net_tcp
> -* pse-pd/index
> -* radiotap-headers
> -* rds
> -* regulatory
> -* representors
> -* rxrpc
> -* sctp
> -* seg6-sysctl
> -* smc-sysctl
> -* statistics
> -* strparser
> -* switchdev
> -* sysfs-tagging
> -* tc-actions-env-rules
> -* tc-queue-filters
> -* tcp_ao
> -* tcp-thin
> -* tipc
> -* tproxy
> -* tuntap
> -* udplite
> -* vrf
> -* x25
> -* x25-iface
> -* xfrm_device
> -* xfrm_sync
> -* xfrm_sysctl
> -* xdp-rx-metadata
> -* xsk-tx-metadata
> +* af_xdp
> +* bareudp
> +* batman-adv
> +* can
> +* can_ucan_protocol
> +* device_drivers/index
> +* diagnostic/index
> +* dsa/index
> +* devlink/index
> +* ethtool-netlink
> +* ieee802154
> +* iso15765-2
> +* j1939
> +* kapi
> +* failover
> +* net_dim
> +* net_failover
> +* page_pool
> +* phy
> +* sfp-phylink
> +* bridge
> +* snmp_counter
> +* checksum-offloads
> +* segmentation-offloads
> +* scaling
> +* tls
> +* tls-offload
> +* tls-handshake
> +* nfc
> +* 6lowpan
> +* arcnet-hardware
> +* arcnet
> +* atm
> +* bonding
> +* cdc_mbim
> +* dctcp
> +* devmem
> +* dns_resolver
> +* eql
> +* fib_trie
> +* filter
> +* generic_netlink
> +* ../netlink/specs/index
> +* gen_stats
> +* gtp
> +* ila
> +* ioam6-sysctl
> +* iou-zcrx
> +* ip_dynaddr
> +* ipsec
> +* ip-sysctl
> +* ipvlan
> +* ipvs-sysctl
> +* kcm
> +* l2tp
> +* lapb-module
> +* mac80211-injection
> +* mctp
> +* mpls-sysctl
> +* mptcp
> +* multiqueue
> +* multi-pf-netdev
> +* net_cachelines/index
> +* netconsole
> +* netdev-features
> +* netdevices
> +* netfilter-sysctl
> +* nexthop-group-resilient
> +* nf_conntrack-sysctl
> +* nf_flowtable
> +* oa-tc6-framework
> +* openvswitch
> +* operstates
> +* packet_mmap
> +* phonet
> +* phy-link-topology
> +* phy-port
> +* pktgen
> +* plip
> +* ppp_generic
> +* proc_net_tcp
> +* pse-pd/index
> +* psp
> +* radiotap-headers
> +* rds
> +* regulatory
> +* representors
> +* rxrpc
> +* sctp
> +* seg6-sysctl
> +* skbuff
> +* smc-sysctl
> +* statistics
> +* strparser
> +* switchdev
> +* sysfs-tagging
> +* tc-actions-env-rules
> +* tc-queue-filters
> +* tcp_ao
> +* tcp-thin
> +* tipc
> +* tproxy
> +* tuntap
> +* udplite
> +* vrf
> +* x25
> +* x25-iface
> +* xdp-rx-metadata
> +* xsk-tx-metadata
>
> .. only:: subproject and html
>
> diff --git a/Documentation/translations/zh_CN/networking/xfrm/index.rst b/Documentation/translations/zh_CN/networking/xfrm/index.rst
> new file mode 100644
> index 000000000000..b366c908eb25
> --- /dev/null
> +++ b/Documentation/translations/zh_CN/networking/xfrm/index.rst
> @@ -0,0 +1,20 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +.. include:: ../../disclaimer-zh_CN.rst
> +
> +
> +=========
> +XFRM 框架
> +=========
> +
> +.. toctree::
> + :maxdepth: 2
> +
> + xfrm_proc
> +
> +Todolist：
> +
> +* xfrm_device
> +* xfrm_migrate_state
> +* xfrm_sync
> +* xfrm_sysctl
> diff --git a/Documentation/translations/zh_CN/networking/xfrm_proc.rst b/Documentation/translations/zh_CN/networking/xfrm/xfrm_proc.rst
> similarity index 96%
> rename from Documentation/translations/zh_CN/networking/xfrm_proc.rst
> rename to Documentation/translations/zh_CN/networking/xfrm/xfrm_proc.rst
> index a2ae86c44707..eb4ece66df49 100644
> --- a/Documentation/translations/zh_CN/networking/xfrm_proc.rst
> +++ b/Documentation/translations/zh_CN/networking/xfrm/xfrm_proc.rst
> @@ -1,8 +1,6 @@
> .. SPDX-License-Identifier: GPL-2.0
>
> -.. include:: ../disclaimer-zh_CN.rst
> -
> -:Original: Documentation/networking/xfrm_proc.rst
> +.. include:: ../../disclaimer-zh_CN.rst
>
> :翻译:
>
next prev parent reply other threads:[~2026-10-30 1:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-29 12:44 [PATCH v3 0/9] docs/zh_CN: align translation paths and update guides Dongliang Mu
2026-10-29 12:44 ` [PATCH v3 1/9] docs/zh_CN: update admin-guide/index.rst translation Dongliang Mu
2026-10-30 0:37 ` Yanteng Si
2026-10-29 12:44 ` [PATCH v3 2/9] docs/zh_CN: update admin-guide/README.rst translation Dongliang Mu
2026-10-30 0:38 ` Yanteng Si
2026-10-29 12:44 ` [PATCH v3 3/9] docs/zh_CN: add media administrator guide translations Dongliang Mu
2026-10-30 1:04 ` Yanteng Si
2026-10-29 12:44 ` [PATCH v3 4/9] docs/zh_CN: reorganize process debugging guides Dongliang Mu
2026-10-30 1:05 ` Yanteng Si
2026-10-29 12:44 ` [PATCH v3 5/9] docs/zh_CN: update magic-number to match upstream Dongliang Mu
2026-10-30 1:06 ` Yanteng Si
2026-10-29 12:44 ` [PATCH v3 6/9] docs/zh_CN: reorganize media driver API translations Dongliang Mu
2026-10-30 1:06 ` Yanteng Si
2026-10-29 12:44 ` [PATCH v3 7/9] docs/zh_CN: move GFS2 translations into filesystems/gfs2 Dongliang Mu
2026-10-30 1:07 ` Yanteng Si
2026-10-29 12:44 ` [PATCH v3 8/9] docs/zh_CN: update networking/xfrm/xfrm_proc.rst translation Dongliang Mu
2026-10-30 1:07 ` Yanteng Si [this message]
2026-10-29 12:44 ` [PATCH v3 9/9] docs/zh_CN: remove stale Original fields from SCSI and IPE translations Dongliang Mu
2026-10-30 1:07 ` Yanteng Si
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c641a11c-39c8-40c4-b162-10f3a3db57ff@linux.dev \
--to=si.yanteng@linux.dev \
--cc=alexs@kernel.org \
--cc=chenyou910331@gmail.com \
--cc=corbet@lwn.net \
--cc=dzm91@hust.edu.cn \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=skhan@linuxfoundation.org \
--cc=wy@wyuan.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox