You are viewing a plain text version of this content. The canonical link for it is here.
Posted to docs@httpd.apache.org by Ragnar Wisl�ff <ra...@asker.online.no> on 2000/10/17 16:35:26 UTC
[PATCH] index.html.no
This is a retranslation of the Apache test page, the previous one was in need
of a bit of correction. Best regards from the fringes of civilisation.
Ragnar Wisl�ff
Index: index.html.no
===================================================================
RCS file: /cvs/apache/httpd-docs-1.3/htdocs/index.html.no,v
retrieving revision 1.1
diff -u -r1.1 index.html.no
--- index.html.no 2000/03/16 22:05:43 1.1
+++ index.html.no 2000/10/16 21:02:18
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<HTML>
<HEAD>
- <TITLE>Testside for Apache Installasjon p� Webside</TITLE>
+ <TITLE>Testside for Apache-installasjon</TITLE>
</HEAD>
<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
<BODY
@@ -12,35 +12,34 @@
ALINK="#FF0000"
>
<H1 ALIGN="CENTER">
- Det gikk bra! Det Apache Web Server Er N� Installert her!
+ Det gikk bra! Apache er n� installert p� denne maskinen!
</H1>
+
<P>
- Hvis du kan se denne siden, det betyr at de som eier denne domene (domain)
- har nettopp greid � installere <A HREF="Apache">http://www.apache.org/">Apache Web server</A>
- software. De m� tilf�ye innhold til denne katalog og erstatte denne
- plassholder siden, ellers peke serveren til de virkelige innhold.
- </P>
- <HR>
- <BLOCKQUOTE>
- Hvis du ser denne siden istedenfor den du ventet for, vennligst
- <STRONG>ta kontakt med websever administrat�ren.</STRONG>
- (Pr�v � sende e-post til <SAMP><Webmaster@<EM>domene</EM>></SAMP>.)
- Selv om denne hjemmesiden driver med Apache software, har den ingen annen
- tilknytting til Apache Gruppen. Vennligst ikke send post ang�ende denne hjemmesiden eller
- dets innhold til Apache programmerere. Hvis du gj�r det, din beskjed blir
+ Hvis du kan se denne siden, betyr det at den som driver dette
+ nettstedet har installert programvaren
+ <A HREF="Apache">http://www.apache.org/">Apache Web server</A>.
+ N� m� innhold plasseres her og erstatte denne testsiden.
+ </P>
+ <HR>
+ <BLOCKQUOTE>
+ Hvis du ser denne siden istedenfor den du forventet, vennligst
+ <STRONG>ta kontakt med den som driver nettstedet.</STRONG>
+ (Pr�v � sende e-post til <SAMP><webmaster@<EM>domene</EM>></SAMP>.)
+ Selv om dette nettstedet kj�res p� Apache, har det ingen annen
+ tilknytning til Apache-gruppen som har utviklet programvaren. Vennligst ikke
+ send post ang�ende dette nettstedet eller dets innhold til Apache-gruppens
+ programmerere. Hvis du gj�r det, blir din henvendelse
<STRONG><BIG>oversett</BIG></STRONG>.
- </BLOCKQUOTE>
+ </BLOCKQUOTE>
<HR>
<P>
- Den Apache
- <A
- HREF="manual/index.html"
- >dokumentasjon</A>
+ <A HREF="manual/index.html">Dokumentasjon</A> for Apache
er inkludert i denne distribusjonen.
</P>
<P>
- Denne sidens Webmaster kan bruke det grafikk nedenf�r p� en Apache-drevet Webserver.
- Takk for at du bruker Apache!
+ Den som driver dette nettstedet m� gjerne benytte logoen under p� en maskin
+som kj�rer Apache. Takk for at du bruker Apache!
</P>
<DIV ALIGN="CENTER">
<IMG SRC="apache_pb.gif" ALT="">
Re: [PATCH] index.html.no
Posted by Ragnar Wisl�ff <ra...@asker.online.no>.
>
> I'm no cvs expert either. My GNU patch (2.5.4) says:
> patching file index.html.no
> patch: **** malformed patch at line 21: <!DOCTYPE HTML PUBLIC "-//W3C//DTD
> HTML 3.2 Final//EN">
>
> When I make patches from CVS, the "context" lines are always indented to
> the same level as the patch lines. Notice how <!DOCTYPE and <HTML> and
> <HEAD> are against the left margin in your patch, whereas in the patches I
> make, they would start where <TITLE> starts. I don't know if this is the
> problem or not.
I'll try doing the translation again, this time making sure I do nothing to
upset the indentation which is already there in the file. I did not pay
enough attention, that's possibly what's causing it. But not tonight.
--
Mvh
Ragnar Wisl�ff
--------------
life is a reach. then you gybe
Re: [PATCH] index.html.no
Posted by Joshua Slive <sl...@finance.commerce.ubc.ca>.
On Wed, 18 Oct 2000, Ragnar Wisløff wrote:
> > > @@ -1,7 +1,7 @@
> > > <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
> > > <HTML>
> > > <HEAD>
> > > - <TITLE>Testside for Apache Installasjon på Webside</TITLE>
> > > + <TITLE>Testside for Apache-installasjon</TITLE>
> >
> > My patch program doesn't like this at all. How did you create this?
>
> Please indicate what the problem is. That your patch program doesn't like it is
> very little to go on. Is the format the problem, the version of the file,
> indentation or something else?
>
I'm no cvs expert either. My GNU patch (2.5.4) says:
patching file index.html.no
patch: **** malformed patch at line 21: <!DOCTYPE HTML PUBLIC "-//W3C//DTD
HTML 3.2 Final//EN">
When I make patches from CVS, the "context" lines are always indented to
the same level as the patch lines. Notice how <!DOCTYPE and <HTML> and
<HEAD> are against the left margin in your patch, whereas in the patches I
make, they would start where <TITLE> starts. I don't know if this is the
problem or not.
Joshua.
Re: [PATCH] index.html.no
Posted by Ragnar Wisl�ff <ra...@asker.online.no>.
Du skrev omtrent noe s�nt som:
> > Index: index.html.no
> > ===================================================================
> > RCS file: /cvs/apache/httpd-docs-1.3/htdocs/index.html.no,v
> > retrieving revision 1.1
> > diff -u -r1.1 index.html.no
> > --- index.html.no 2000/03/16 22:05:43 1.1
> > +++ index.html.no 2000/10/16 21:02:18
> > @@ -1,7 +1,7 @@
> > <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
> > <HTML>
> > <HEAD>
> > - <TITLE>Testside for Apache Installasjon p� Webside</TITLE>
> > + <TITLE>Testside for Apache-installasjon</TITLE>
>
> My patch program doesn't like this at all. How did you create this?
--------------------------------------------------------
$ cvs -d :pserver:anoncvs@CVS.Sourcery.Org:/cvs/apache login
$ cvs -d :pserver:anoncvs@CVS.Sourcery.Org:/cvs/apache co httpd-docs-1.3
$ cd httpd-docs-1.3/htdocs
$ vi index.html.no
[make changes, :wq)
$ cvs diff -u index.html.no > diff.index.html.no
[paste diff.index.html.no into email to list]
$ cvs -v
Concurrent Versions System (CVS) 1.10.7 (client/server)
Copyright (c) 1989-1998 Brian Berliner, david d `zoo' zuhn,
Jeff Polk, and other authors
CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.
Specify the --help option for further information about CVS
$
--------------------------------------------------------
I do not claim to be an expert on this, I was under the impression this was the
way it was supposed to be done. As far as I can tell, I've followed the
instructions given at Ken Coar's web site.
Please indicate what the problem is. That your patch program doesn't like it is
very little to go on. Is the format the problem, the version of the file,
indentation or something else?
--
Mvh
Ragnar Wisl�ff
--------------
life is a reach. then you gybe
Re: [PATCH] index.html.no
Posted by Joshua Slive <sl...@finance.commerce.ubc.ca>.
On Tue, 17 Oct 2000, Ragnar Wisløff wrote:
> This is a retranslation of the Apache test page, the previous one was in need
> of a bit of correction. Best regards from the fringes of civilisation.
>
> Ragnar Wisløff
>
> Index: index.html.no
> ===================================================================
> RCS file: /cvs/apache/httpd-docs-1.3/htdocs/index.html.no,v
> retrieving revision 1.1
> diff -u -r1.1 index.html.no
> --- index.html.no 2000/03/16 22:05:43 1.1
> +++ index.html.no 2000/10/16 21:02:18
> @@ -1,7 +1,7 @@
> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
> <HTML>
> <HEAD>
> - <TITLE>Testside for Apache Installasjon på Webside</TITLE>
> + <TITLE>Testside for Apache-installasjon</TITLE>
My patch program doesn't like this at all. How did you create this?