Minor corrections
Created attachment 30398 [details, diff] rsync.xml.patch
$ patch <rsync.xml.patch patching file rsync.xml Hunk #3 FAILED at 81. Hunk #4 FAILED at 106. 2 out of 12 hunks FAILED -- saving rejects to file rsync.xml.rej I applied your patch and did those hunks manually, then made a patch against the original version and compared the two patches. $ diff your_patch my_patch 27,28c32,33 < + <li>Emplacement du serveur (ville et pays)</li> < + <li>Un nom de contact et une adresse courrier
$ patch <rsync.xml.patch patching file rsync.xml Hunk #3 FAILED at 81. Hunk #4 FAILED at 106. 2 out of 12 hunks FAILED -- saving rejects to file rsync.xml.rej I applied your patch and did those hunks manually, then made a patch against the original version and compared the two patches. $ diff your_patch my_patch 27,28c32,33 < + <li>Emplacement du serveur (ville et pays)</li> < + <li>Un nom de contact et une adresse courrier électronique</li> --- > + <li>Emplacement du serveur (ville et pays)</li> > + <li>Un nom de contact et une adresse courrier électronique</li> Just a hunch: left-over tabs converted to 8 spaces ? No big deal anyway. Patch committed. Thanks.
Explanation for failed hunks : I usually use diff -u for patches. However, I always use diff -Nut for patches meant for you, since you asked for diff -Nut patches when we translated the handbook (http://bugs.gentoo.org/show_bug.cgi?id=36917). I did not bother to check the meaning of these options (shame on me), but simply assumed you would rather work with diff -Nut patches. I also blindly continued with diff -Nut once the handbook translation was finished (though you never requested so). Coding style for Gentoo documentation forbids the use of tabs for indentation, but not all documents follow this guideline (rsync.xml does not). Using -t, in this case, was problematic (original and corrected documents had tabs, but these were expanded to spaces in the patch). This accounts for failed hunks in rsync.xml. Failed hunks in openafs and nano-basics were due to different versions being compared. Back to diff -u, it is...
Shame on me as well. I did read the doc and failed to notice. I was being a parrot (not a Norwegian Blue) and repeated what I had been asked by the doc-team since day #1. Silly tabs, we'll eradicate them all, eventually. Thanks for your explanation.
