Hi everybody, while trying to merge r1844401 in 2.4.x I noticed some conflicts, that as far as I can tell are coming from r1673947. It seems a big and old change that was never backported, but it mixes xml and transformations (that it is not ideal). What is the best way forward?
A quick solution, rather than backporting the change, would be to run find + sed and remove the trailing whitespaces from 2.4.x's .xml files, commit the change and re-build the docs (two separate commits as always). I would of course do it only after the T&R that it is ongoing to avoid big doc changes. Thoughts? Thanks! Luca --------------------------------------------------------------------- To unsubscribe, e-mail: docs-unsubscr...@httpd.apache.org For additional commands, e-mail: docs-h...@httpd.apache.org
