Proposed resolution:

Replace in [alg.swap] before p. 3 until p. 4 by

template <class ValueType T, size_t N>
requires Swappable<T>
void swap(T (&a)[N], T (&b)[N]);

Requires: T shall be Swappable.

Effects: swap_ranges(a, a + N, b);

[ Batavia (2009-05): ]

Move to NAD; the changes have already been made.

[ Post Summit Daniel adds: ]

Recommend as NAD Editorial: The changes have already been applied to the WP N2800.

With the adaption of 809 we have a new algorithm swap for C-arrays, which needs to be conceptualized.