From alex@armada.alexdupre.com  Sun Nov  9 14:25:09 2003
Return-Path: <alex@armada.alexdupre.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1F84216A4CE; Sun,  9 Nov 2003 14:25:09 -0800 (PST)
Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0741243FBD; Sun,  9 Nov 2003 14:25:07 -0800 (PST)
	(envelope-from alex@armada.alexdupre.com)
Received: from armada.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245])
	by relay.gufi.org (Postfix) with ESMTP
	id F0F5320F64; Sun,  9 Nov 2003 23:25:04 +0100 (CET)
Received: from armada.alexdupre.com (localhost [127.0.0.1])
	by armada.alexdupre.com (8.12.10/8.12.10) with ESMTP id hA9MP4iD090415;
	Sun, 9 Nov 2003 23:25:04 +0100 (CET)
	(envelope-from alex@armada.alexdupre.com)
Received: (from alex@localhost)
	by armada.alexdupre.com (8.12.10/8.12.10/Submit) id hA9MP4sR090414;
	Sun, 9 Nov 2003 23:25:04 +0100 (CET)
	(envelope-from alex)
Message-Id: <200311092225.hA9MP4sR090414@armada.alexdupre.com>
Date: Sun, 9 Nov 2003 23:25:04 +0100 (CET)
From: Alex Dupre <sysadmin@alexdupre.com>
Reply-To: Alex Dupre <sysadmin@alexdupre.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: throdes@freebsd.org
Subject: [Maintainer Update] Italian Web Pages
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59097
>Category:       www
>Synopsis:       [Maintainer Update] Italian Web Pages
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-www
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 09 14:30:15 PST 2003
>Closed-Date:    Sun Nov 09 16:16:49 PST 2003
>Last-Modified:  Sun Nov 09 16:16:49 PST 2003
>Originator:     Alex Dupre
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sat Nov 8 12:21:11 CET 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
Update the Italian translation of the FreeBSD web site.
	
>How-To-Repeat:
	
>Fix:

	

--- www.diff begins here ---
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
@@ -17,7 +17,7 @@
 SUBDIR=  doc
 .endif
 
-WEBDIR=		data/it
+WEBDIR?=	data/it
 
 # index.html is special, and generated from index.xsl and news/news.xml
 DATA+=		index.html
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
@@ -31,7 +31,7 @@
 
     <p>Tutta la documentazione presente su questo sito può essere scaricata in
       vari formati (HTML, Postscript, PDF, e altri) e algoritmi di compressione
-      differenti (GZip, BZip2, Zip) dal <a
+      differenti (BZip2, Zip) dal <a
         href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">sito FTP di FreeBSD</a>.</p>
 
     <p>Questa documentazione è fornita e mantenuta dal <a
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
@@ -1,4 +1,7 @@
 <!-- $FreeBSD: www/it/includes.sgml,v 1.3 2003/07/07 15:59:26 blackend Exp $ -->
+
+<!ENTITY url.doc.langcode    'it_IT.ISO8859-15'>
+
 <!--  
   Base is the absolute URL for the given page, minus the actual page
   part.  It should either be specified as a fully qualified URL, or
@@ -24,9 +27,7 @@
 <!-- file if necessary.                                     -->
 <!ENTITY copyright '&copy; 1995-2003 The FreeBSD Project.
   Tutti i diritti riservati.'>
-<!ENTITY email 'freebsd-questions'>
-<!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contatti</a> &nbsp; | &nbsp; <a href="&enbase;/copyright/index.html">note legali</a> &nbsp; | &nbsp; &copyright;'>
-<!ENTITY date ''>
+<!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contatti</a> &nbsp; | &nbsp; <a href="&enbase;/copyright/index.html">note legali</a> &nbsp; | &nbsp; &copyright;'>
 <!ENTITY home '<a href="&base;/index.html"><img src="&enbase;/gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
 <!ENTITY stylesheet '&enbase;/freebsd.css'>
@@ -36,6 +37,8 @@
 <!ENTITY header '<head><title>&title;</title>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="MSSmartTagsPreventParsing" content="TRUE">
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon"          href="/favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="&stylesheet;"></head><body
 text="#000000" bgcolor="#FFFFFF" alink="#FFCC33"><img
 src="&enbase;/gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0" usemap="#bar">
@@ -54,9 +57,6 @@
 <area shape="rect" href="&base;/index.html" coords="0,0,564,32" alt="Home">
 </map>'>
 
-<!ENTITY footer '<HR NOSHADE>
-<address>&author;<br>&date;</address>'>
-
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
@@ -100,22 +100,11 @@
 
 <!-- macro for webbuild paper --> 
 <!ENTITY webbuild ' 
-<p>This document describe how to build and update
-the FreeBSD Web pages from the CVS repository by hand.</p>'>
+<p>Questo documento descrive come creare e aggiornare le pagine web di FreeBSD
+manualmente dal repository CVS.</p>'>
 
-<!-- avoid replacing &nbsp; etc. with hardcoded Latin1 values -->
-<!ENTITY nbsp SDATA "[nbsp ]">
-<!ENTITY copy SDATA "[copy ]">
-<!ENTITY reg SDATA "[reg ]">
-<!ENTITY deg SDATA "[deg ]">
-<!ENTITY middot SDATA "[middot ]">
-<!ENTITY raquo SDATA "[raquo ]">
-<!ENTITY laquo SDATA "[laquo ]">
-
-<!-- Often used trademarks -->
-<!ENTITY unix 'UNIX&reg;'>
-<!ENTITY java 'Java&trade;'>
-<!ENTITY jdk 'JDK&trade;'>
+<!ENTITY % includes.global SYSTEM "../share/sgml/includes.sgml">
+%includes.global;
 
 <!-- 
      Local Variables:
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
@@ -12,14 +12,15 @@
     <img src="{$enbase}/gifs/new.gif" alt="[New!]" width="28" height="11"/>
   </xsl:variable>
 
-  <xsl:variable name="copyright">
-    <a href="{$enbase}/copyright/index.html">Copyright</a> &#169; 1995-2003 the FreeBSD Project.  Tutti i diritti riservati.
-  </xsl:variable>
-
-  <!-- Often used trademarks -->
-  <xsl:variable name="unix" select="'UNIX&#174;'"/>
-  <xsl:variable name="java" select="'Java&#8482;'"/>
-  <xsl:variable name="jdk" select="'JDK&#8482;'"/>
+  <xsl:variable name="copyright">
+    <a href="{$enbase}/copyright/index.html">Copyright</a> &#169; 1995-2003 the FreeBSD Project.  Tutti i diritti riservati.
+  </xsl:variable>
+
+  <!-- Often used trademarks -->
+  <xsl:variable name="unix" select="'UNIX&#174;'"/>
+  <xsl:variable name="java" select="'Java&#8482;'"/>
+  <xsl:variable name="jdk" select="'JDK&#8482;'"/>
+  <xsl:variable name="posix" select="'POSIX&#174;'"/>
 
   <xsl:variable name="email" select="'freebsd-questions'"/>
   <xsl:variable name="author">
@@ -98,7 +99,7 @@
   <xsl:variable name="u.rel.early">
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
   
-  <xsl:variable name="rel2.current" select='"4.8"'/>
+  <xsl:variable name="rel2.current" select='"4.9"'/>
   <xsl:variable name="u.rel2.notes">
     <xsl:value-of select="$enbase"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
 
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
@@ -25,6 +25,8 @@
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Gallery,
 	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs,
 	      CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
+	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
+	<link rel="icon" href="/favicon.ico" type="image/x-icon"/>
       </head>
 
       <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#840084"
@@ -52,29 +54,27 @@
 		  <option value="http://www2.de.FreeBSD.org">IPv6 Germania</option>
 		  <option value="http://www.jp.FreeBSD.org/www.FreeBSD.org/">IPv6 (6Bone) Giappone</option>
 		  <option value="http://www2.no.FreeBSD.org/">IPv6 Norvegia</option>
+		  <option value="http://www1.uk.FreeBSD.org/">IPv6 Regno Unito</option>
+		  <option value="http://www4.us.FreeBSD.org/">IPv6 USA/1</option>
+		  <option value="http://www5.us.FreeBSD.org/">IPv6 USA/2</option>
 		  <option value="http://www.ar.FreeBSD.org/">Argentina</option>
 		  <option value="http://www.au.FreeBSD.org/">Australia/1</option>
 		  <option value="http://www2.au.FreeBSD.org/">Australia/2</option>
-		  <option value="http://www3.au.FreeBSD.org/">Australia/3</option>
-		  <option value="http://www4.au.FreeBSD.org/">Australia/4</option>
-		  <option value="http://www5.au.FreeBSD.org/">Australia/5</option>
-		  <option value="http://www6.au.FreeBSD.org/">Australia/6</option>
 		  <option value="http://freebsd.itworks.com.au/">Australia/8</option>
 		  <option value="http://www.at.FreeBSD.org/">Austria/1</option>
 		  <option value="http://www2.at.FreeBSD.org/">Austria/2</option>
 		  <option value="http://freebsd.unixtech.be/">Belgio</option>
-		  <option value="http://www.br.FreeBSD.org/www.freebsd.org/">Brasile/1</option>
+		  <option value="http://www.br.FreeBSD.org/">Brasile/1</option>
 		  <option value="http://www2.br.FreeBSD.org/www.freebsd.org/">Brasile/2</option>
 		  <option value="http://www3.br.FreeBSD.org/">Brasile/3</option>
 		  <option value="http://www.bg.FreeBSD.org/">Bulgaria</option>
 		  <option value="http://www.ca.FreeBSD.org/">Canada/1</option>
 		  <option value="http://www2.ca.FreeBSD.org/">Canada/2</option>
 		  <option value="http://www.cn.FreeBSD.org/">Cina</option>
-		  <option value="http://www.kr.FreeBSD.org/">Corea</option>
+		  <option value="http://www.kr.FreeBSD.org/">Corea/1</option>
 		  <option value="http://www2.kr.FreeBSD.org/">Corea/2</option>
-		  <option value="http://www3.kr.FreeBSD.org/">Corea/3</option>
 		  <option value="http://www.dk.FreeBSD.org/">Danimarca/1</option>
-		  <option value="http://www3.dk.FreeBSD.org/">Danimarca/3</option>
+		  <option value="http://www3.dk.FreeBSD.org/">Danimarca/2</option>
 		  <option value="http://www.ee.FreeBSD.org/">Estonia</option>
 		  <option value="http://www.FreeBSD.org.ph/">Filippine</option>
 		  <option value="http://www.fi.FreeBSD.org/">Finlandia/1</option>
@@ -84,13 +84,15 @@
 		  <option value="http://www1.de.FreeBSD.org/">Germania/2</option>
 		  <option value="http://www2.de.FreeBSD.org/">Germania/3</option>
 		  <option value="http://www.jp.FreeBSD.org/www.FreeBSD.org/">Giappone</option>
-		  <option value="http://www.gr.FreeBSD.org/">Grecia</option>
+		  <option value="http://www.gr.FreeBSD.org/">Grecia/1</option>
+		  <option value="http://www.FreeBSD.gr/">Grecia/2</option>
 		  <option value="http://www.hk.FreeBSD.org/">Hong Kong</option>
 		  <option value="http://www.ie.FreeBSD.org/">Irlanda/1</option>
 		  <option value="http://www2.ie.FreeBSD.org/">Irlanda/2</option>
 		  <option value="http://www.is.FreeBSD.org/">Islanda</option>
 		  <option value="http://www.it.FreeBSD.org/">Italia/1</option>
 		  <option value="http://www.gufi.org/mirrors/www.freebsd.org/data/">Italia/2</option>
+		  <option value="http://www.kw.FreeBSD.org/">Kuwait</option>
 		  <option value="http://www.lv.FreeBSD.org/">Lettonia</option>
 		  <option value="http://www.lt.FreeBSD.org/">Lituania</option>
 		  <option value="http://www.no.FreeBSD.org/">Norvegia/1</option>
@@ -100,16 +102,18 @@
 		  <option value="http://www2.nl.FreeBSD.org/">Olanda/2</option>
 		  <option value="http://www.pl.FreeBSD.org/">Polonia/1</option>
 		  <option value="http://www2.pl.FreeBSD.org/">Polonia/2</option>
-		  <option value="http://www2.pt.FreeBSD.org/">Portogallo/2</option>
-		  <option value="http://www4.pt.FreeBSD.org/">Portogallo/4</option>
+		  <option value="http://www.pt.FreeBSD.org/">Portogallo/1</option>
+		  <option value="http://www4.pt.FreeBSD.org/">Portogallo/2</option>
+		  <option value="http://www4.pt.FreeBSD.org/">Portogallo/3</option>
 		  <option value="http://www.uk.FreeBSD.org/">Regno Unito/1</option>
 		  <option value="http://www2.uk.FreeBSD.org/">Regno Unito/2</option>
 		  <option value="http://www3.uk.FreeBSD.org/">Regno Unito/3</option>
 		  <option value="http://www4.uk.FreeBSD.org/">Regno Unito/4</option>
+		  <option value="http://www1.uk.FreeBSD.org/">Regno Unito/5</option>
 		  <option value="http://www.cz.FreeBSD.org/">Repubblica Ceca</option>
 		  <option value="http://www.sk.FreeBSD.org/">Repubblica Slovacca/1</option>
 		  <option value="http://www2.sk.FreeBSD.org/">Repubblica Slovacca/2</option>
-		  <option value="http://www.ro.FreeBSD.org/">Romania</option>
+		  <option value="http://www.ro.FreeBSD.org/">Romania/1</option>
 		  <option value="http://www2.ro.FreeBSD.org/">Romania/2</option>
 		  <option value="http://www3.ro.FreeBSD.org/">Romania/3</option>
 		  <option value="http://www4.ro.FreeBSD.org/">Romania/4</option>
@@ -139,13 +143,13 @@
 		  <option value="http://www.enderunix.org/freebsd/">Turchia/3</option>
 		  <option value="http://www.ua.FreeBSD.org/">Ucraina/1</option>
 		  <option value="http://www2.ua.FreeBSD.org/">Ucraina/2</option>
+		  <option value="http://www5.ua.FreeBSD.org/">Ucraina/3</option>
 		  <option value="http://www4.ua.FreeBSD.org/">Ucraina/Crimea</option>
-		  <option value="http://www5.ua.FreeBSD.org/">Ucraina/5</option>
 		  <option value="http://www.hu.FreeBSD.org/">Ungheria/1</option>
 		  <option value="http://www2.hu.FreeBSD.org/">Ungheria/2</option>
-		  <option value="http://www.FreeBSD.org/">USA/California</option>
-		  <option value="http://www3.FreeBSD.org/">USA/3</option>
-		  <option value="http://www7.FreeBSD.org/">USA/7</option>
+		  <option value="http://www2.us.FreeBSD.org/">USA/1</option>
+		  <option value="http://www4.us.FreeBSD.org/">USA/2</option>
+		  <option value="http://www5.us.FreeBSD.org/">USA/3</option>
 		</select>
 
 		<input type="submit" value=" Vai "/>
@@ -153,11 +157,19 @@
 		<br/>
 
 		<font color="#990000"><b>Lingua: </b></font>
-		<a href="{$enbase}/index.html">Inglese</a>,
-		<a href="{$enbase}/ja/index.html">Giapponese</a>,
-		<a href="{$enbase}/ru/index.html">Russo</a>,
-		<a href="{$enbase}/es/index.html">Spagnolo</a>,
-		<a href="{$enbase}/support.html#web">Altro</a>
+		<a href="{$enbase}/de/index.html" title="Tedesco">[de]</a>
+		<xsl:text>&#160;</xsl:text>
+		<a href="{$enbase}/index.html" title="Inglese">[en]</a>
+		<xsl:text>&#160;</xsl:text>
+		<a href="{$enbase}/es/index.html" title="Spagnolo">[es]</a>
+		<xsl:text>&#160;</xsl:text>
+		<a href="http://www.freebsd-fr.org/index-trad.html" title="Francese">[fr]</a>
+		<xsl:text>&#160;</xsl:text>
+		<span title="Italiano">[it]</span>
+		<xsl:text>&#160;</xsl:text>
+		<a href="{$enbase}/ja/index.html" title="Giapponese">[ja]</a>
+		<xsl:text>&#160;</xsl:text>
+		<a href="{$enbase}/ru/index.html" title="Russo">[ru]</a>
 	      </form>
 	    </td>
 	  </tr>
@@ -210,6 +222,7 @@
 			      &#183; <a href="{$enbase}/support.html#user">Gruppi Utenti</a><br/>
 			      &#183; <a href="{$enbase}/support.html#web">Risorse Web</a><br/>
 			      &#183; <a href="{$enbase}/security/index.html">Sicurezza</a><br/>
+			      &#183; <a href="{$enbase}/events/events.html">Eventi</a><br/>
 			      &#183; <a href="{$enbase}/support.html">Altro...</a>
 			    </small></p>
 
@@ -271,7 +284,7 @@
 	      <h2><font color="#990000">Cos'è FreeBSD?</font></h2>
 
 	      <p>FreeBSD è un sistema operativo avanzato per architetture
-		compatibili x86, DEC Alpha, IA-64, PC-98 e UltraSPARC.
+		compatibili x86, DEC Alpha, IA-64, PC-98 e UltraSPARC&#174;.
 		È derivato da BSD, la versione di
 		<xsl:value-of select="$unix"/> sviluppata
 		all'Università della California, Berkeley.
@@ -531,9 +544,6 @@
 							     border="0"/></a></td>
 	  </tr>
 	</table>
-
-	<p><small>I cambiamenti a questo sito web vanno on-line alle 8:00 e alle
-	    20:00 UTC di ogni giorno.</small></p>
 
 	<table width="100%" cellpadding="0" border="0" cellspacing="0">
 	  <tr>
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
@@ -11,7 +11,7 @@
     
     <p>Le domande riguardanti FreeBSD dovrebbero essere indirizzate alla mailing 
       list sulle domande su FreeBSD, <a
-	href="mailto:freebsd-questions@FreeBSD.ORG">freebsd-questions@FreeBSD.ORG</a>.</p>
+	href="mailto:freebsd-questions@FreeBSD.org">freebsd-questions@FreeBSD.org</a>.</p>
     <p>Le <a href="&enbase;/support.html#mailing-list">mailing list</a> sono il
       canale primario di supporto per gli utenti FreeBSD e coprono differenti
       aree tematiche.  Sono inoltre disponibili numerose mailing list in lingue
@@ -31,9 +31,9 @@
     <p>Le domande o i suggerimenti sulla documentazione (<a
 	href="&enbase;/doc/it_IT.ISO8859-15/books/handbook/index.html">Manuale</a>,
       <a href="&enbase;/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</a>, <a
-	href="&enbase;/tutorials/index.html">Tutorial</a>) dovrebbero essere
+	href="&base;/docs.html">Libri & Articoli</a>) dovrebbero essere
       indirizzati alla mailing list sul progetto di documentazione di FreeBSD,
-      <a href="mailto:freebsd-doc@FreeBSD.ORG">freebsd-doc@FreeBSD.ORG</a> o,
+      <a href="mailto:freebsd-doc@FreeBSD.org">freebsd-doc@FreeBSD.org</a> o,
       alternativamente, alla mailing list sul progetto di documentazione in
       italiano di FreeBSD, <a
         href="mailto:traduzioni@gufi.org">traduzioni@gufi.org</a>.</p>
--- www.diff ends here ---



>Release-Note:
>Audit-Trail:

From: "Simon L. Nielsen" <simon@FreeBSD.org>
To: Alex Dupre <sysadmin@alexdupre.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org, throdes@FreeBSD.org
Subject: Re: www/59097: [Maintainer Update] Italian Web Pages
Date: Mon, 10 Nov 2003 00:25:06 +0100

 --+g7M9IMkV8truYOl
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On 2003.11.09 23:25:04 +0100, Alex Dupre wrote:
 >=20
 > >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 $
 
 --=20
 Simon L. Nielsen
 FreeBSD Documentation Team
 
 --+g7M9IMkV8truYOl
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.3 (FreeBSD)
 
 iD8DBQE/rszQh9pcDSc1mlERArZcAJ9AplG8PUoNTZY5+UkpUWWdqr1HnACfWhJo
 8rccaCB+etKZddr0wr6MTjY=
 =R+e1
 -----END PGP SIGNATURE-----
 
 --+g7M9IMkV8truYOl--

From: Alex Dupre <sysadmin@alexdupre.com>
To: "Simon L. Nielsen" <simon@FreeBSD.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: www/59097: [Maintainer Update] Italian Web Pages
Date: Mon, 10 Nov 2003 00:37:03 +0100

 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 
State-Changed-By: simon 
State-Changed-When: Sun Nov 9 16:15:21 PST 2003 
State-Changed-Why:  
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! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59097 
>Unformatted: