" The DHCPv4-over-DHCPv6 function MUST be disabled by default. The
client MUST obtain the necessary IPv6 configuration before using DHCP
4o6. A client intending to use DHCP 4o6 MUST request the 4o6 Server
Address option using Option Request option (ORO) in every Solicit,
Request, Renew and Information-request message. The DHCP 4o6 client
MUST NOT request the 4o6 Server Address option in the DHCPv4-query
message."
could be moved to this paragraph:
" The client generates a DHCPv4 message and stores it verbatim in the
BOOTP Message option carried by the DHCPv4-query message. The client
MUST put exactly one BOOTP Message option into a single DHCPv4-query
message."
as it is logically linked with the generation of the DHCPv4-query message.
The last sentence of this paragraph:
" The DHCPv4-over-DHCPv6 function MUST be disabled by default. The client MUST obtain the necessary IPv6 configuration before using DHCP 4o6. A client intending to use DHCP 4o6 MUST request the 4o6 Server Address option using Option Request option (ORO) in every Solicit, Request, Renew and Information-request message. The DHCP 4o6 client MUST NOT request the 4o6 Server Address option in the DHCPv4-query message."
could be moved to this paragraph:
" The client generates a DHCPv4 message and stores it verbatim in the BOOTP Message option carried by the DHCPv4-query message. The client MUST put exactly one BOOTP Message option into a single DHCPv4-query message."
as it is logically linked with the generation of the DHCPv4-query message.