Bug 59097
| Summary: | [Maintainer Update] Italian Web Pages | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Documentation | Reporter: | Alex Dupre <sysadmin> | ||||
| Component: | Books & Articles | Assignee: | freebsd-doc (Nobody) <doc> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | CC: | throdes | ||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Alex Dupre
2003-11-09 22:30:15 UTC
On 2003.11.09 23:25:04 +0100, Alex Dupre wrote:
>
> >Description:
> Update the Italian translation of the FreeBSD web site.
When I apply the patch includes.(sgml|xsl) fail :
|diff -ruN it.orig/includes.sgml it/includes.sgml
|--- it.orig/includes.sgml Mon Jul 7 17:59:26 2003
|+++ it/includes.sgml Sun Nov 9 23:16:00 2003
--------------------------
Patching file includes.sgml using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 failed at 27.
Hunk #3 succeeded at 37.
Hunk #4 succeeded at 57.
Hunk #5 failed at 100.
2 out of 5 hunks failed--saving rejects to includes.sgml.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN it.orig/includes.xsl it/includes.xsl
|--- it.orig/includes.xsl Mon Jul 7 17:59:26 2003
|+++ it/includes.xsl Sun Nov 9 23:17:44 2003
--------------------------
Patching file includes.xsl using Plan A...
Hunk #1 failed at 12.
Hunk #2 succeeded at 99.
1 out of 2 hunks failed--saving rejects to includes.xsl.rej
The rest of the patch applies fine.
The original versions of my files are:
includes.sgml:
$FreeBSD: www/it/includes.sgml,v 1.3 2003/07/07 15:59:26 blackend Exp $
includes.xsl:
$FreeBSD: www/it/includes.xsl,v 1.3 2003/07/07 15:59:26 blackend Exp $
--
Simon L. Nielsen
FreeBSD Documentation Team
Monday, November 10, 2003, 12:25:06 AM, you wrote: SLN> When I apply the patch includes.(sgml|xsl) fail : I haven't this problem with latest sources: # make update Updating collection www/cvs Checkout www/it/Makefile Checkout www/it/Makefile.inc Checkout www/it/doc/Makefile Checkout www/it/docs.sgml Checkout www/it/includes.sgml Checkout www/it/includes.xsl Checkout www/it/index.xsl Checkout www/it/mailto.sgml Shutting down connection to server Finished successfully # patch -p0 < /home/alex/www.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN it.orig/Makefile it/Makefile |--- it.orig/Makefile Thu Mar 20 01:10:51 2003 |+++ it/Makefile Sun Nov 9 23:11:48 2003 -------------------------- Patching file it/Makefile using Plan A... Hunk #1 succeeded at 17. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN it.orig/docs.sgml it/docs.sgml |--- it.orig/docs.sgml Mon Jul 7 17:59:26 2003 |+++ it/docs.sgml Sun Nov 9 23:14:25 2003 -------------------------- Patching file it/docs.sgml using Plan A... Hunk #1 succeeded at 31. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN it.orig/includes.sgml it/includes.sgml |--- it.orig/includes.sgml Mon Jul 7 17:59:26 2003 |+++ it/includes.sgml Sun Nov 9 23:16:00 2003 -------------------------- Patching file it/includes.sgml using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 27. Hunk #3 succeeded at 37. Hunk #4 succeeded at 57. Hunk #5 succeeded at 100. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN it.orig/includes.xsl it/includes.xsl |--- it.orig/includes.xsl Mon Jul 7 17:59:26 2003 |+++ it/includes.xsl Sun Nov 9 23:17:44 2003 -------------------------- Patching file it/includes.xsl using Plan A... Hunk #1 succeeded at 12. Hunk #2 succeeded at 99. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN it.orig/index.xsl it/index.xsl |--- it.orig/index.xsl Mon Jul 7 17:59:26 2003 |+++ it/index.xsl Sun Nov 9 23:20:03 2003 -------------------------- Patching file it/index.xsl using Plan A... Hunk #1 succeeded at 25. Hunk #2 succeeded at 54. Hunk #3 succeeded at 84. Hunk #4 succeeded at 102. Hunk #5 succeeded at 143. Hunk #6 succeeded at 157. Hunk #7 succeeded at 222. Hunk #8 succeeded at 284. Hunk #9 succeeded at 544. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN it.orig/mailto.sgml it/mailto.sgml |--- it.orig/mailto.sgml Tue Mar 25 19:22:59 2003 |+++ it/mailto.sgml Sun Nov 9 23:11:48 2003 -------------------------- Patching file it/mailto.sgml using Plan A... Hunk #1 succeeded at 11. Hunk #2 succeeded at 31. done I'll send you a zipped diff. -- Alex Dupre sysadmin@alexdupre.com http://www.alexdupre.com/ alex@sm.FreeBSD.org Today's excuse: interrupt configuration error State Changed From-To: open->closed GNATS (I think) had messed up the patch in the PR, but the one you sent to me directly worked fine, so I committed that. Thanks for the submission! |
