Login | Register For Free | Help
Search for: (Advanced)

Mailing List Archive: Apache: Docs

[patch] Changes to 1.3.x docs

 

 

Apache docs RSS feed   Index | Next | Previous | View Threaded


isoma at jellybaby

Mar 1, 2012, 3:48 PM

Post #1 of 6 (222 views)
Permalink
[patch] Changes to 1.3.x docs

I've attached a patch against http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/htdocs/manual
(if this should go into Bugzilla, let me know and I'll do that instead).

I don't normally like (or submit) patches with a bunch of semi-related changes, but since this is documentation not code I hope it's OK.

Here's a summary of the changes:
Added French translation for 1.3 obsolescence message
Added lang="en" attribute to main (English) obsolescence message
The top index pages for alternate languages now have obsolescence messages
Style changes for the red box (now "width: 35em" & centred)
Fixed some pages that said the latest version was 2.2
Updated text for modules that were already obsolete in 1.3

The include file subdirectory/header.html is replaced with header_l2.html in the top directory, which should simplify any future maintenance work.


To clarify: the Japanese pages still have the obsolescence message in English (my Japanese just isn't good enough). The French pages have the obsolescence message in French.

--
Tim Bannister isoma [at] jellybaby
Attachments: diff.gz (7.73 KB)
  smime.p7s (4.29 KB)


rbowen at rcbowen

Mar 1, 2012, 5:40 PM

Post #2 of 6 (206 views)
Permalink
Re: [patch] Changes to 1.3.x docs [In reply to]

Awesome. Thanks so much. I'll go apply this right now.


On Mar 1, 2012, at 6:48 PM, Tim Bannister wrote:

> I've attached a patch against http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/htdocs/manual
> (if this should go into Bugzilla, let me know and I'll do that instead).
>
> I don't normally like (or submit) patches with a bunch of semi-related changes, but since this is documentation not code I hope it's OK.
>
> Here's a summary of the changes:
> Added French translation for 1.3 obsolescence message
> Added lang="en" attribute to main (English) obsolescence message
> The top index pages for alternate languages now have obsolescence messages
> Style changes for the red box (now "width: 35em" & centred)
> Fixed some pages that said the latest version was 2.2
> Updated text for modules that were already obsolete in 1.3
>
> The include file subdirectory/header.html is replaced with header_l2.html in the top directory, which should simplify any future maintenance work.
>
>
> To clarify: the Japanese pages still have the obsolescence message in English (my Japanese just isn't good enough). The French pages have the obsolescence message in French.
>
> --
> Tim Bannister isoma [at] jellybaby
> <diff.gz>

--
Rich Bowen
rbowen [at] rcbowen :: @rbowen
rbowen [at] apache


rbowen at rcbowen

Mar 1, 2012, 5:51 PM

Post #3 of 6 (212 views)
Permalink
Re: [patch] Changes to 1.3.x docs [In reply to]

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? I've tried several things, and they all fail with, for example:

File to patch: header_l2.html.fr
header_l2.html.fr: No such file or directory
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored


Please advise. Thanks.



On Mar 1, 2012, at 6:48 PM, Tim Bannister wrote:

> I've attached a patch against http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/htdocs/manual
> (if this should go into Bugzilla, let me know and I'll do that instead).
>
> I don't normally like (or submit) patches with a bunch of semi-related changes, but since this is documentation not code I hope it's OK.
>
> Here's a summary of the changes:
> Added French translation for 1.3 obsolescence message
> Added lang="en" attribute to main (English) obsolescence message
> The top index pages for alternate languages now have obsolescence messages
> Style changes for the red box (now "width: 35em" & centred)
> Fixed some pages that said the latest version was 2.2
> Updated text for modules that were already obsolete in 1.3
>
> The include file subdirectory/header.html is replaced with header_l2.html in the top directory, which should simplify any future maintenance work.
>
>
> To clarify: the Japanese pages still have the obsolescence message in English (my Japanese just isn't good enough). The French pages have the obsolescence message in French.
>
> --
> Tim Bannister isoma [at] jellybaby
> <diff.gz>

--
Rich Bowen
rbowen [at] rcbowen :: @rbowen
rbowen [at] apache


isoma at jellybaby

Mar 1, 2012, 6:00 PM

Post #4 of 6 (212 views)
Permalink
Re: [patch] Changes to 1.3.x docs [In reply to]

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 &eacute;t&eacute; d&eacute;clar&eacute; &laquo;en fin de vie&raquo;. Si vous
+ &ecirc;tes toujours en utilisant la version 1.3, <strong style="font-weight: inherit;">s'il vous pla&icirc;t
+ envisager la mise &agrave; 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?


--
Tim Bannister isoma [at] jellybaby
Attachments: smime.p7s (4.29 KB)


rbowen at rcbowen

Mar 1, 2012, 6:05 PM

Post #5 of 6 (213 views)
Permalink
Re: [patch] Changes to 1.3.x docs [In reply to]

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 &eacute;t&eacute; d&eacute;clar&eacute; &laquo;en fin de vie&raquo;. Si vous
> + &ecirc;tes toujours en utilisant la version 1.3, <strong style="font-weight: inherit;">s'il vous pla&icirc;t
> + envisager la mise &agrave; 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
rbowen [at] rcbowen :: @rbowen
rbowen [at] apache


rbowen at rcbowen

Mar 1, 2012, 6:10 PM

Post #6 of 6 (211 views)
Permalink
Re: [patch] Changes to 1.3.x docs [In reply to]

Thanks. Patch applied in revision 1296031. And it's now live on the site, if you want to poke around and make sure I did it right, but it all looks good to me.

Thanks for your help on this.

--Rich



On Mar 1, 2012, at 6:48 PM, Tim Bannister wrote:

> I've attached a patch against http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/htdocs/manual
> (if this should go into Bugzilla, let me know and I'll do that instead).
>
> I don't normally like (or submit) patches with a bunch of semi-related changes, but since this is documentation not code I hope it's OK.
>
> Here's a summary of the changes:
> Added French translation for 1.3 obsolescence message
> Added lang="en" attribute to main (English) obsolescence message
> The top index pages for alternate languages now have obsolescence messages
> Style changes for the red box (now "width: 35em" & centred)
> Fixed some pages that said the latest version was 2.2
> Updated text for modules that were already obsolete in 1.3
>
> The include file subdirectory/header.html is replaced with header_l2.html in the top directory, which should simplify any future maintenance work.
>
>
> To clarify: the Japanese pages still have the obsolescence message in English (my Japanese just isn't good enough). The French pages have the obsolescence message in French.
>
> --
> Tim Bannister isoma [at] jellybaby
> <diff.gz>

--
Rich Bowen
rbowen [at] rcbowen :: @rbowen
rbowen [at] apache

Apache docs RSS feed   Index | Next | Previous | View Threaded
 
 


Interested in having your list archived? Contact Gossamer Threads
 
  Web Applications & Managed Hosting Powered by Gossamer Threads Inc.