Le 21/10/2018 à 10:52, Luca Toscano a écrit :
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
Hi Luca,
+1.
docs in 2.4 and trunk have some differences because of trailing spaces,
also because of "" added around some strings (see r1673945 or r1673892
for example) and also because of change in alignment (see r1673932).
All this has happened in the same period. It was an effort to improve
readability of the doc, consistency and syntax color highlight. This was
part of a hackathlon if I remember correctly.
AFAIK, it is more or less a work-in-progress which has never been
backported and/or finished.
These changes were sometimes made mostly on trunk, sometimes on 2.4.x
(see r1673563).
These changes are most of the time not back- (or forward-)portable
because of conflict with some other changes.
I've never tried to make a "big synch" of all this stuffs, because it is
mostly cosmetic and would generate some un-needed "Out of date"
translated files. (and would give some work to translator for nearly no
value)
When I update a xml file, when I backport it, I try to clean the
remaining discrepancies in order to reduce the gap between 2.4.x and
trunk. (in this case, the translator already has to update the file, but
for good reasons this time. So a little more effort is not a real issue,
IMHO)
Any proposal to efficiently reduce this gap would be +1 from me.
CJ
---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscr...@httpd.apache.org
For additional commands, e-mail: docs-h...@httpd.apache.org
