Re: [Orgmode] [PATCH] Update conflict documentation

2011-01-15 Thread Bastien
Hi Giovanni, Giovanni Ridolfi writes: > IIRC we have already discussed the right way to refer to our beloved > Unique ;-) GNU/Emacs mode: > > "Org-mode" or "Org mode" ? > > I think Carsten wrote something but, I can't get any reference, sorry :-( > > In the site I thik that it is (almost) al

Re: [Orgmode] [PATCH] Update conflict documentation

2011-01-12 Thread Giovanni Ridolfi
Jeffrey Horn writes: > This patch updates the conflict documentation regarding yasnippet to use Eric > Schulte's fix. > --- > doc/org.texi | 21 - > 1 files changed, 20 insertions(+), 1 deletions(-) > > diff --git a/doc/org.texi b/doc/org.texi > index e83909d..b0667e4 1006

[Orgmode] [PATCH] Update conflict documentation

2011-01-11 Thread Jeffrey Horn
This patch updates the conflict documentation regarding yasnippet to use Eric Schulte's fix. --- doc/org.texi | 21 - 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index e83909d..b0667e4 100644 --- a/doc/org.texi +++ b/doc/org.te