[PATCH 2/2] Correct some language in fast-import documentation.

[PATCH 2/2] Correct some language in fast-import documentation.

[Shawn O. Pearce]

Minor documentation improvements, as suggested on the Git mailing
list by Horst H. von Brand and Karl Hasselström.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 Documentation/git-fast-import.txt |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 0c44761..01f4c8a 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -181,7 +181,7 @@ If the local offset is not available in the source material, use
 ``+0000'', or the most common local offset.  For example many
 organizations have a CVS repository which has only ever been accessed
 by users who are located in the same location and timezone.  In this
-case the offset from UTC can be easily assumed.
+case a reasonable offset from UTC could be assumed.
 +
 Unlike the `rfc2822` format, this format is very strict.  Any
 variation in formatting will cause gfi to reject the value.
@@ -190,7 +190,7 @@ variation in formatting will cause gfi to reject the value.
 	This is the standard email format as described by RFC 2822.
 +
 An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git
-parser is accurate, but a little on the lenient side.  Its the
+parser is accurate, but a little on the lenient side.  It is the
 same parser used by gitlink:git-am[1] when applying patches
 received from email.
 +
@@ -205,14 +205,15 @@ contained in an RFC 2822 date string is used to adjust the date
 value to UTC prior to storage.  Therefore it is important that
 this information be as accurate as possible.
 +
-If the source material is formatted in RFC 2822 style dates,
+If the source material uses RFC 2822 style dates,
 the frontend should let gfi handle the parsing and conversion
 (rather than attempting to do it itself) as the Git parser has
 been well tested in the wild.
 +
 Frontends should prefer the `raw` format if the source material
-is already in UNIX-epoch format, or is easily convertible to
-that format, as there is no ambiguity in parsing.
+already uses UNIX-epoch format, can be coaxed to give dates in that
+format, or its format is easiliy convertible to it, as there is no
+ambiguity in parsing.
 
 `now`::
 	Always use the current time and timezone.  The literal
-- 
1.5.0.rc3.175.g6506

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Uwe Kleine-König]

Hello Shawn,

Shawn O. Pearce wrote:
> Minor documentation improvements, as suggested on the Git mailing
> list by Horst H. von Brand and Karl Hasselström.
you have an encoding problem here     ---------^

That "o umlaut" seems to be UTF-8 encoded, but the headers of you mail
claim iso-8859-1.

I had this kind of problem, too.  You have to assert that the
environment variable LANG (or LC_CTYPE) match your terminal and the mutt
config variable "charset" matches that, too.  (Not to set charset seems
to do the right thing.)

Best regards
Uwe

-- 
Uwe Kleine-König

http://www.google.com/search?q=1+electron+mass%3D

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Junio C Hamano]

Uwe Kleine-König  <ukleinek@informatik.uni-freiburg.de> writes:

> Shawn O. Pearce wrote:
>> Minor documentation improvements, as suggested on the Git mailing
>> list by Horst H. von Brand and Karl Hasselstr~A(P)m.
> you have an encoding problem here     ---------^
>
> That "o umlaut" seems to be UTF-8 encoded, but the headers of you mail
> claim iso-8859-1.

I noticed it, too.  This seems to be purely between the
format-patch output and the mailing list.  In Shawn's tree, the
corresponding commit f842fdb0 does not have the encoding
problem.

As Shawn's tree currently has only these two commits on top of
what my tree already has, I do not mind pulling from it.  It
would make life easier for people who are following his tree.

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Shawn O. Pearce]

Junio C Hamano <junkio@cox.net> wrote:
> Uwe Kleine-König  <ukleinek@informatik.uni-freiburg.de> writes:
> 
> > Shawn O. Pearce wrote:
> >> Minor documentation improvements, as suggested on the Git mailing
> >> list by Horst H. von Brand and Karl Hasselstr~A(P)m.
> > you have an encoding problem here     ---------^
> >
> > That "o umlaut" seems to be UTF-8 encoded, but the headers of you mail
> > claim iso-8859-1.
> 
> I noticed it, too.  This seems to be purely between the
> format-patch output and the mailing list.  In Shawn's tree, the
> corresponding commit f842fdb0 does not have the encoding
> problem.

Yes, correct.  I took great care to copy Uwe's name from a prior
commit of his in git.git, to make sure I got it spelled correctly
in the commit message.  :)

Unfortunately mutt set the wrong charset on the message.
Uwe thoughtly sent some notes on how to correct that, so I'll try
to fix my mutt.
 
> As Shawn's tree currently has only these two commits on top of
> what my tree already has, I do not mind pulling from it.  It
> would make life easier for people who are following his tree.

Those are built upon a commit you already merged, but not the tip
of `master` at the time they were written (kernel.org mirror lag
strikes again).  Please feel free to rebase them into the current
tip of master (instead of merging them in) if you want.

-- 
Shawn.

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Johannes Schindelin]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 988 bytes --]

Hi,

On Thu, 8 Feb 2007, Shawn O. Pearce wrote:

> Junio C Hamano <junkio@cox.net> wrote:
> > Uwe Kleine-König  <ukleinek@informatik.uni-freiburg.de> writes:
> > 
> > > Shawn O. Pearce wrote:
> > >> Minor documentation improvements, as suggested on the Git mailing
> > >> list by Horst H. von Brand and Karl Hasselstr~A(P)m.
> > > you have an encoding problem here     ---------^
> > >
> > > That "o umlaut" seems to be UTF-8 encoded, but the headers of you mail
> > > claim iso-8859-1.
> > 
> > I noticed it, too.  This seems to be purely between the
> > format-patch output and the mailing list.  In Shawn's tree, the
> > corresponding commit f842fdb0 does not have the encoding
> > problem.
> 
> Yes, correct.  I took great care to copy Uwe's name from a prior
> commit of his in git.git, to make sure I got it spelled correctly
> in the commit message.  :)

Sometimes I think Uwe just took on another name for the sake of being an 
Umlaut-PITA ;-)

Ciao,
Jöhännës "Dschö" Schindëlin

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Uwe Kleine-König]

Johannes Schindelin wrote:
> > Junio C Hamano <junkio@cox.net> wrote:
> > > Uwe Kleine-König  <ukleinek@informatik.uni-freiburg.de> writes:
> > > 
> > > > Shawn O. Pearce wrote:
> > > >> Minor documentation improvements, as suggested on the Git mailing
> > > >> list by Horst H. von Brand and Karl Hasselstr~A(P)m.
> > > > you have an encoding problem here     ---------^
> > > >
> > > > That "o umlaut" seems to be UTF-8 encoded, but the headers of you mail
> > > > claim iso-8859-1.
> > > 
> > > I noticed it, too.  This seems to be purely between the
> > > format-patch output and the mailing list.  In Shawn's tree, the
> > > corresponding commit f842fdb0 does not have the encoding
> > > problem.
> > 
> > Yes, correct.  I took great care to copy Uwe's name from a prior
> > commit of his in git.git, to make sure I got it spelled correctly
> > in the commit message.  :)
> 
> Sometimes I think Uwe just took on another name for the sake of being an 
> Umlaut-PITA ;-)
I just want to point out, that it's Karl Hasselström whose name got
misencoded here.  But I admit I'm kind of sensible for that.
> 
> Ciao,
> Jöhännës "Dschö" Schindëlin
So what about:
----- 8< ----
Subject: [PATCH] add Johannes proper name to .mailmap.

Up to now he kept secret how to spell his name properly, but now he revealed
himself :-)
---
 .mailmap |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index c7a3a75..d6fcecb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,6 +15,7 @@ H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
 H. Peter Anvin <hpa@trantor.hos.anvin.org>
 Horst H. von Brand <vonbrand@inf.utfsm.cl>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
+Jöhännës "Dschö" Schindëlin <Johannes.Schindelin@gmx.de>
 Jon Loeliger <jdl@freescale.com>
 Jon Seymour <jon@blackcubes.dyndns.org>
 Karl Hasselström <kha@treskal.com>
-- 
1.5.0.rc2.gd1af2d

Best regards
Uwe

-- 
Uwe Kleine-König

$ dc << EOF
[d1-d1<a]sa99d1<a1[rdn555760928P*pz1<a]salax
EOF

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Johannes Schindelin]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 199 bytes --]

Hi,

On Thu, 8 Feb 2007, Uwe Kleine-König wrote:

> > Jöhännës "Dschö" Schindëlin
> So what about:
> ----- 8< ----
> Subject: [PATCH] add Johannes proper name to .mailmap.

*LOLROTF*!!!!

Ciao,
Dscho

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Jakub Narebski]

Johannes Schindelin wrote:

> On Thu, 8 Feb 2007, Uwe Kleine-König wrote:
> 
>>> Jöhännës "Dschö" Schindëlin
>>>
>> So what about:
>> ----- 8< ----
>> Subject: [PATCH] add Johannes proper name to .mailmap.
> 
> *LOLROTF*!!!!

By the way, how this .mailmap thingy work? Is it corrected
using email to find proper entry?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

Re: [PATCH 2/2] Correct some language in fast-import documentation.

[Shawn O. Pearce]

Jakub Narebski <jnareb@gmail.com> wrote:
> By the way, how this .mailmap thingy work? Is it corrected
> using email to find proper entry?

Its used by git-shortlog to put all commits by the same person
under a single heading.  It uses email address as key.

-- 
Shawn.