emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Fix examples of clock tables in the manual
@ 2022-04-26  8:05 Nick Dokos
  2022-04-26 13:46 ` Ihor Radchenko
  0 siblings, 1 reply; 4+ messages in thread
From: Nick Dokos @ 2022-04-26  8:05 UTC (permalink / raw)
  To: emacs-orgmode

The syntax is:

    #+BEGIN: clocktable ...
    #+END:

There is no `clocktable' after `#+END:'.
---
  doc/org-manual.org | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index af54dc4e87f9..6768ca98dd7f 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -6665,7 +6665,7 @@ into the buffer by ~org-clock-report~:
  #+cindex: @samp{BEGIN clocktable}
  #+begin_example
  ,#+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file
-,#+END: clocktable
+,#+END:
  #+end_example

  #+vindex: org-clocktable-defaults
@@ -6849,7 +6849,7 @@ day, you could write:

  #+begin_example
  ,#+BEGIN: clocktable :maxlevel 2 :block today :scope tree1 :link t
-,#+END: clocktable
+,#+END:
  #+end_example

  #+texinfo: @noindent
@@ -6858,7 +6858,7 @@ To use a specific time range you could write[fn:80]
  #+begin_example
  ,#+BEGIN: clocktable :tstart "<2006-08-10 Thu 10:00>"
                      :tend "<2006-08-10 Thu 12:00>"
-,#+END: clocktable
+,#+END:
  #+end_example

  #+texinfo: @noindent
@@ -6866,7 +6866,7 @@ A range starting a week ago and ending right now 
could be written as

  #+begin_example
  ,#+BEGIN: clocktable :tstart "<-1w>" :tend "<now>"
-,#+END: clocktable
+,#+END:
  #+end_example

  #+texinfo: @noindent
@@ -6874,7 +6874,7 @@ A summary of the current subtree with % times would be

  #+begin_example
  ,#+BEGIN: clocktable :scope subtree :link t :formula %
-,#+END: clocktable
+,#+END:
  #+end_example

  #+texinfo: @noindent
@@ -6883,7 +6883,7 @@ last week would be

  #+begin_example
  ,#+BEGIN: clocktable :scope agenda :block lastweek :compact t
-,#+END: clocktable
+,#+END:
  #+end_example

  *** Resolving idle time and continuous clocking
-- 
2.34.1



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

* Re: [PATCH] Fix examples of clock tables in the manual
  2022-04-26  8:05 [PATCH] Fix examples of clock tables in the manual Nick Dokos
@ 2022-04-26 13:46 ` Ihor Radchenko
  2022-04-26 20:52   ` Nick Dokos
  0 siblings, 1 reply; 4+ messages in thread
From: Ihor Radchenko @ 2022-04-26 13:46 UTC (permalink / raw)
  To: Nick Dokos; +Cc: emacs-orgmode

Nick Dokos <ndokos@gmail.com> writes:

> The syntax is:
>
>     #+BEGIN: clocktable ...
>     #+END:
>
> There is no `clocktable' after `#+END:'.

Thanks for the patch! Could you please follow the commit summary
conventions described in
https://orgmode.org/worg/org-contribute.html#commit-messages?

Note that you may need to add TINYCHANGE cookie as you appear to not
have the copyright assignment with FSF.

Also, your current patch does not apply onto main:

>> Applying: Fix examples of clock tables in the manual
>> error: corrupt patch at line 10

Best,
Ihor


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

* Re: [PATCH] Fix examples of clock tables in the manual
  2022-04-26 13:46 ` Ihor Radchenko
@ 2022-04-26 20:52   ` Nick Dokos
  2022-04-27  8:55     ` Ihor Radchenko
  0 siblings, 1 reply; 4+ messages in thread
From: Nick Dokos @ 2022-04-26 20:52 UTC (permalink / raw)
  To: emacs-orgmode

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

Ihor Radchenko <yantar92@gmail.com> writes:

> Nick Dokos <ndokos@gmail.com> writes:
>
>> The syntax is:
>>
>>     #+BEGIN: clocktable ...
>>     #+END:
>>
>> There is no `clocktable' after `#+END:'.
>
> Thanks for the patch! Could you please follow the commit summary
> conventions described in
> https://orgmode.org/worg/org-contribute.html#commit-messages?
>

Yes, I'm very rusty.

> Note that you may need to add TINYCHANGE cookie as you appear to not
> have the copyright assignment with FSF.
>

I'm in there (under "Nicholas Dokos").

> Also, your current patch does not apply onto main:
>
>>> Applying: Fix examples of clock tables in the manual
>>> error: corrupt patch at line 10
>

Mailer mangled it - let me try attaching.

Hope this is better. Thanks!

> Best,
> Ihor


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch to fix clocktable dynblock examples in the manual --]
[-- Type: text/x-patch, Size: 1851 bytes --]

From 2d32589cb1d1db330067197f91635db7d6bce7ec Mon Sep 17 00:00:00 2001
From: Nick Dokos <ndokos@redhat.com>
Date: Tue, 26 Apr 2022 16:22:03 -0400
Subject: [PATCH] doc/org-manual.org: Fix clocktable dynamic block examples

---
 doc/org-manual.org | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index af54dc4e8..6768ca98d 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -6665,7 +6665,7 @@ into the buffer by ~org-clock-report~:
 #+cindex: @samp{BEGIN clocktable}
 #+begin_example
 ,#+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+vindex: org-clocktable-defaults
@@ -6849,7 +6849,7 @@ day, you could write:
 
 #+begin_example
 ,#+BEGIN: clocktable :maxlevel 2 :block today :scope tree1 :link t
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6858,7 +6858,7 @@ To use a specific time range you could write[fn:80]
 #+begin_example
 ,#+BEGIN: clocktable :tstart "<2006-08-10 Thu 10:00>"
                     :tend "<2006-08-10 Thu 12:00>"
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6866,7 +6866,7 @@ A range starting a week ago and ending right now could be written as
 
 #+begin_example
 ,#+BEGIN: clocktable :tstart "<-1w>" :tend "<now>"
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6874,7 +6874,7 @@ A summary of the current subtree with % times would be
 
 #+begin_example
 ,#+BEGIN: clocktable :scope subtree :link t :formula %
-,#+END: clocktable
+,#+END:
 #+end_example
 
 #+texinfo: @noindent
@@ -6883,7 +6883,7 @@ last week would be
 
 #+begin_example
 ,#+BEGIN: clocktable :scope agenda :block lastweek :compact t
-,#+END: clocktable
+,#+END:
 #+end_example
 
 *** Resolving idle time and continuous clocking
-- 
2.34.1


[-- Attachment #3: Type: text/plain, Size: 145 bytes --]


>
>

-- 
Nick

"There are only two hard problems in computer science: cache
invalidation, naming things, and off-by-one errors." -Martin Fowler

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

* Re: [PATCH] Fix examples of clock tables in the manual
  2022-04-26 20:52   ` Nick Dokos
@ 2022-04-27  8:55     ` Ihor Radchenko
  0 siblings, 0 replies; 4+ messages in thread
From: Ihor Radchenko @ 2022-04-27  8:55 UTC (permalink / raw)
  To: Nick Dokos; +Cc: emacs-orgmode

Nick Dokos <ndokos@gmail.com> writes:

>> Note that you may need to add TINYCHANGE cookie as you appear to not
>> have the copyright assignment with FSF.
>>
>
> I'm in there (under "Nicholas Dokos").

I should have searched by surname :facepalm:

>> Also, your current patch does not apply onto main:
>>
>>>> Applying: Fix examples of clock tables in the manual
>>>> error: corrupt patch at line 10
>>
>
> Mailer mangled it - let me try attaching.
>
> Hope this is better. Thanks!

Thanks! Applied to main as e359b01a6.

Best,
Ihor


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

end of thread, other threads:[~2022-04-27  9:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-26  8:05 [PATCH] Fix examples of clock tables in the manual Nick Dokos
2022-04-26 13:46 ` Ihor Radchenko
2022-04-26 20:52   ` Nick Dokos
2022-04-27  8:55     ` Ihor Radchenko

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).