Re: [PATCH v3 8/9] docs/zh_CN: update networking/xfrm/xfrm_proc.rst translation

[Yanteng Si]

在 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@xxxxxxxxxxx>
Reviewed-by: Yanteng Si <si.yanteng@xxxxxxxxx>
> ---
>   .../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@xxxxxxxxxx>
> @@ -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
>   
>   :翻译:
>