emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] manual: Fix minor typo
@ 2020-07-05 11:28 Arun Isaac
  2020-07-05 19:40 ` Marco Wahl
  0 siblings, 1 reply; 7+ messages in thread
From: Arun Isaac @ 2020-07-05 11:28 UTC (permalink / raw)
  To: emacs-orgmode; +Cc: Arun Isaac

* doc/org-manual.org (Clocking Work Time): Replace "to that you can"
with "so that you can".
---
 doc/org-manual.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index b14c28807..b61644626 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -6379,7 +6379,7 @@ clock.  When you stop working on that task, or when you mark the task
 done, the clock is stopped and the corresponding time interval is
 recorded.  It also computes the total time spent on each
 subtree[fn:71] of a project.  And it remembers a history or tasks
-recently clocked, to that you can jump quickly between a number of
+recently clocked, so that you can jump quickly between a number of
 tasks absorbing your time.
 
 To save the clock history across Emacs sessions, use:
-- 
2.26.2



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] manual: Fix minor typo
  2020-07-05 11:28 [PATCH] manual: Fix minor typo Arun Isaac
@ 2020-07-05 19:40 ` Marco Wahl
  2020-07-05 21:12   ` Kyle Meyer
  0 siblings, 1 reply; 7+ messages in thread
From: Marco Wahl @ 2020-07-05 19:40 UTC (permalink / raw)
  To: Arun Isaac; +Cc: emacs-orgmode

Hi Arun,

Thanks for the patch. I applied it.

> * doc/org-manual.org (Clocking Work Time): Replace "to that you can"
> with "so that you can".

To make the handling of patches easier please use "format-patch". More
details from the Emacs CONTRIB:

--8<---------------cut here---------------start------------->8---
To email a patch you can use a shell command like 'git format-patch -1'
to create a file, and then attach the file to your email.  This nicely
packages the patch's commit message and changes, and makes sure the
format and whitespace are not munged in transit by the various mail
agents.
--8<---------------cut here---------------end--------------->8---


Thanks again,
-- 
Marco


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] manual: Fix minor typo
  2020-07-05 19:40 ` Marco Wahl
@ 2020-07-05 21:12   ` Kyle Meyer
  2020-07-05 21:36     ` Arun Isaac
  2020-07-05 21:45     ` Marco Wahl
  0 siblings, 2 replies; 7+ messages in thread
From: Kyle Meyer @ 2020-07-05 21:12 UTC (permalink / raw)
  To: Marco Wahl; +Cc: Arun Isaac, emacs-orgmode

Hi Marco,

Marco Wahl writes:

> To make the handling of patches easier please use "format-patch".

It looks like this was sent with git-send-email (which is fed
format-patch output either explicitly or underneath), and it applied
cleanly for me.

My understanding is that, even though this project accepts patches as
attachments [*], inline patches are fine as well (and very much my
personal preference).  git-send-email is explicitly mentioned at
<https://orgmode.org/worg/org-contribute.html>.

[*] I believe there was a thread recently on emacs-devel that stated a
    preference for attachments, but I'd be sad if we as a project
    adopted the same stance.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] manual: Fix minor typo
  2020-07-05 21:12   ` Kyle Meyer
@ 2020-07-05 21:36     ` Arun Isaac
  2020-07-05 21:45     ` Marco Wahl
  1 sibling, 0 replies; 7+ messages in thread
From: Arun Isaac @ 2020-07-05 21:36 UTC (permalink / raw)
  To: Kyle Meyer, Marco Wahl; +Cc: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 726 bytes --]


>> To make the handling of patches easier please use "format-patch".
>
> It looks like this was sent with git-send-email (which is fed
> format-patch output either explicitly or underneath), and it applied
> cleanly for me.
>
> My understanding is that, even though this project accepts patches as
> attachments [*], inline patches are fine as well (and very much my
> personal preference).  git-send-email is explicitly mentioned at
> <https://orgmode.org/worg/org-contribute.html>.

Indeed, I used `git format-patch` to create the patch and `git
send-email` to send it. I don't mind sending attachments, but I used
`git send-email` since it was allowed by the contribution guidelines.

Thanks for applying the fix. Cheers!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] manual: Fix minor typo
  2020-07-05 21:12   ` Kyle Meyer
  2020-07-05 21:36     ` Arun Isaac
@ 2020-07-05 21:45     ` Marco Wahl
  2020-07-06  2:00       ` Kyle Meyer
  1 sibling, 1 reply; 7+ messages in thread
From: Marco Wahl @ 2020-07-05 21:45 UTC (permalink / raw)
  To: Kyle Meyer; +Cc: Arun Isaac, emacs-orgmode

Hi Kyle and Arun,

>> To make the handling of patches easier please use "format-patch".
>
> It looks like this was sent with git-send-email (which is fed
> format-patch output either explicitly or underneath), and it applied
> cleanly for me.

Okay, good. Thanks for sharing!

Apologies for demanding too much, Arun. 

> My understanding is that, even though this project accepts patches as
> attachments [*], inline patches are fine as well (and very much my
> personal preference).  git-send-email is explicitly mentioned at
> <https://orgmode.org/worg/org-contribute.html>.
>
> [*] I believe there was a thread recently on emacs-devel that stated a
>     preference for attachments, but I'd be sad if we as a project
>     adopted the same stance.

Up to now I thought only a 'format-patch' can be applied easily. Would
you please share a way to apply an inline patch? Or at least give a hint?


Thanks and best regards,
-- 
Marco


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] manual: Fix minor typo
  2020-07-05 21:45     ` Marco Wahl
@ 2020-07-06  2:00       ` Kyle Meyer
  2020-07-07  7:12         ` Marco Wahl
  0 siblings, 1 reply; 7+ messages in thread
From: Kyle Meyer @ 2020-07-06  2:00 UTC (permalink / raw)
  To: Marco Wahl; +Cc: Arun Isaac, emacs-orgmode

Marco Wahl writes:

> Up to now I thought only a 'format-patch' can be applied easily. Would
> you please share a way to apply an inline patch? Or at least give a hint?

Sure.  For an inline patch, you feed the entire message, rather than the
attachment, to 'git am'.  It looks like Gnus is your MUA, so you may be
interested in gnus-summary-pipe-output.

For those that don't use an Emacs-based mail client, something like this
might be more convenient than getting the message out of your reader:

  $ # in org repo
  $ curl -fSsL https://orgmode.org/list/MSGID/raw | git am

In this particular case

  $ curl -fSsL https://orgmode.org/list/20200705112846.16510-1-arunisaac@systemreboot.net/raw | git am


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] manual: Fix minor typo
  2020-07-06  2:00       ` Kyle Meyer
@ 2020-07-07  7:12         ` Marco Wahl
  0 siblings, 0 replies; 7+ messages in thread
From: Marco Wahl @ 2020-07-07  7:12 UTC (permalink / raw)
  To: Kyle Meyer; +Cc: emacs-orgmode

Kyle Meyer <kyle@kyleam.com> writes:

>> Up to now I thought only a 'format-patch' can be applied easily. Would
>> you please share a way to apply an inline patch? Or at least give a hint?
>
> Sure.  For an inline patch, you feed the entire message, rather than the
> attachment, to 'git am'.  It looks like Gnus is your MUA, so you may be
> interested in gnus-summary-pipe-output.
>
> For those that don't use an Emacs-based mail client, something like this
> might be more convenient than getting the message out of your reader:
>
>   $ # in org repo
>   $ curl -fSsL https://orgmode.org/list/MSGID/raw | git am
>
> In this particular case
>
>   $ curl -fSsL
> https://orgmode.org/list/20200705112846.16510-1-arunisaac@systemreboot.net/raw
> | git am

Thanks Kyle!


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-07-07  7:13 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-05 11:28 [PATCH] manual: Fix minor typo Arun Isaac
2020-07-05 19:40 ` Marco Wahl
2020-07-05 21:12   ` Kyle Meyer
2020-07-05 21:36     ` Arun Isaac
2020-07-05 21:45     ` Marco Wahl
2020-07-06  2:00       ` Kyle Meyer
2020-07-07  7:12         ` Marco Wahl

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).