On Mar 1, 2012, at 9:00 PM, Tim Bannister wrote: > On 2 Mar 2012, at 01:51, Rich Bowen wrote: > >> The patch is applying ok except for the header_l2 files, which complain with: >> >> can't find file to patch at input line 2447 >> Perhaps you used the wrong -p or --strip option? >> The text leading up to this was: >> -------------------------- >> |Index: header_l2.html.fr >> |=================================================================== >> |--- header_l2.html.fr (revision 1295920) >> |+++ header_l2.html.fr (working copy) >> -------------------------- >> File to patch: >> >> >> I'm pretty sure this is my ignorance of the patch utility, not a problem >> with the patch itself. What should I answer there? > > header_l2.html.fr is a new file, so: > diff -N -u -r header_l2.html.fr header_l2.html.fr > --- header_l2.html.fr 1970-01-01 01:00:00.000000000 +0100 > +++ header_l2.html.fr 2012-03-02 01:55:18.000000000 +0000 > @@ -0,0 +1,12 @@ > + <div align="CENTER"> > + <img src="../images/sub.gif" alt="[Documentation d'Apache]" lang="fr"/> > + > + <h3>Serveur HTTP Apache Version 1.3</h3> > + <div style="margin: 0; padding: 8px 10px; padding-left: 50px; > padding-bottom: 10px; line-height: 1.4em; background: #f99 > url(../images/warning.png) no-repeat 0px 0px; margin-left: auto; > margin-right: auto; width: 35em;"> > + <p>Vous lisez la documentation de la version 1.3 du serveur Apache, > + qui n'est plus maintenu, et a été > déclaré «en fin de vie». Si vous > + êtes toujours en utilisant la version 1.3, <strong > style="font-weight: inherit;">s'il vous plaît > + envisager la mise à jour</strong>. La version actuelle du > logiciel est > + <a href="http://httpd.apache.org/docs/2.4/";>2.4</a>.</p></div> > + </div> > + > > > should apply separately, and if not then you I hope it's easy enough to C&P > or whatever. Do you need the same for header_l2.html as well?
Thanks. Brain engaged now, and everything is working. :) Testing now, and will commit in just a moment. -- Rich Bowen [email protected] :: @rbowen [email protected]
