From ab269ec8b2e01ee22adb7806f2d92fe87335bdea Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 17 Aug 2026 04:05:19 +0900
Subject: [PATCH] doc: mention ProxyNeighbor= in man and NEWS

---
 NEWS                    |  9 +++------
 man/systemd.network.xml | 37 ++++++++++---------------------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/NEWS b/NEWS
index c5686b929f..486bba2afc 100644
--- a/NEWS
+++ b/NEWS
@@ -79,12 +79,9 @@ CHANGES WITH 262:
 
         Changes in systemd-networkd:
 
-        * A new IPv4ProxyARPAddress= setting has been added to the [Network]
-          section of .network files. It is the IPv4 counterpart to
-          IPv6ProxyNDPAddress= and allows manual entries to be added to the
-          kernel's IPv4 neighbor proxy table. The setting implies
-          IPv4ProxyARP=yes but has no effect if IPv4ProxyARP= has been set to
-          false. This mirrors the behavior of IPv6ProxyNDPAddress=.
+        * The IPv6ProxyNDPAddress= setting in the [Network] section of .network
+          files has been renamed to ProxyNeighbor=. The setting can now also be
+          used to add IPv4 addresses to the kernel's IPv4 neighbor proxy table.
 
         Changes in various tools:
 
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 1893c60404..e2c51fab90 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1150,25 +1150,6 @@ DuplicateAddressDetection=none</programlisting></para>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>IPv4ProxyARPAddress=</varname></term>
-        <listitem>
-          <para>An IPv4 address, for which ARP requests will be proxied. This option may be specified
-          more than once. <command>systemd-networkd</command> will add the
-          <varname>IPv4ProxyARPAddress=</varname> entries to the kernel's IPv4 neighbor proxy table.
-          When <varname>IPv4ProxyARP=</varname> is unset, this setting implies
-          <varname>IPv4ProxyARP=yes</varname>: the per-interface <literal>proxy_arp</literal> sysctl
-          is enabled automatically, which also activates automatic proxy ARP for every address the
-          interface has a route toward on connected subnets, in addition to answering the listed
-          entries. If <varname>IPv4ProxyARP=</varname> has been set to false, the
-          <varname>IPv4ProxyARPAddress=</varname> entries listed here are discarded and not
-          programmed into the kernel. This mirrors the behaviour of
-          <varname>IPv6ProxyNDPAddress=</varname>/<varname>IPv6ProxyNDP=</varname>.</para>
-
-          <xi:include href="version-info.xml" xpointer="v262"/>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>IPv6ProxyNDP=</varname></term>
         <listitem>
@@ -1188,16 +1169,18 @@ DuplicateAddressDetection=none</programlisting></para>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>IPv6ProxyNDPAddress=</varname></term>
+        <term><varname>ProxyNeighbor=</varname></term>
         <listitem>
-          <para>An IPv6 address, for which Neighbour Advertisement messages will be proxied. This
-          option may be specified more than once. <command>systemd-networkd</command> will add the
-          <varname>IPv6ProxyNDPAddress=</varname> entries to the kernel's IPv6 neighbor proxy table.
-          This setting implies <varname>IPv6ProxyNDP=yes</varname> but has no effect if
-          <varname>IPv6ProxyNDP=</varname> has been set to false. When unset, the kernel's default will
-          be used.</para>
+          <para>Takes an IPv4 or IPv6 address for which ARP requests or Neighbour Advertisement messages will
+          be proxied. This option may be specified more than once. <command>systemd-networkd</command> will
+          add the specified address to the kernel's neighbour proxy table. For an IPv4 address, a proxy ARP
+          entry will be added. For an IPv6 address, a proxy NDP entry will be added. When an IPv6 address is
+          specified, <varname>IPv6ProxyNDP=yes</varname> is implied. If <varname>IPv6ProxyNDP=</varname> is
+          explicitly disabled, IPv6 addresses specified with <varname>ProxyNeighbor=</varname> are ignored.
+          Note, unlike IPv6, specifying an IPv4 address does <emphasis>not</emphasis> imply
+          <varname>IPv4ProxyARP=</varname>.</para>
 
-          <xi:include href="version-info.xml" xpointer="v233"/>
+          <xi:include href="version-info.xml" xpointer="v262"/>
         </listitem>
       </varlistentry>