* [PATCH] Several typo fixes
@ 2023-07-05 14:29 Shynur Xie
2023-07-06 10:01 ` Ihor Radchenko
0 siblings, 1 reply; 4+ messages in thread
From: Shynur Xie @ 2023-07-05 14:29 UTC (permalink / raw)
To: emacs-orgmode@gnu.org
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-Several-typo-fixes.patch --]
[-- Type: application/octet-stream, Size: 3097 bytes --]
From 34d8d8a4a532eea67e485347a690781674ee3f09 Mon Sep 17 00:00:00 2001
From: Shynur <one.last.kiss@outlook.com>
Date: Wed, 5 Jul 2023 22:23:44 +0800
Subject: [PATCH] Several typo fixes
* CONTRIBUTE.org: Use the article 'an' for Org.
* org-manual.org: Use the article 'an' for Org.
Delete unnecessary whitespace at beginning of line.
Move LaTeX comment to the LaTeX code block.
---
CONTRIBUTE.org | 4 ++--
doc/org-manual.org | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CONTRIBUTE.org b/CONTRIBUTE.org
index 00532f9ab..8f94e875b 100644
--- a/CONTRIBUTE.org
+++ b/CONTRIBUTE.org
@@ -4,7 +4,7 @@ effectively.
We value a nice tone in our discussions: please check and respect the
[[https://www.gnu.org/philosophy/kind-communication.en.html][GNU Kind Communications Guidelines]].
-* Contribute as a Org user
+* Contribute as an Org user
You can contribute by helping others in various channels.
@@ -16,7 +16,7 @@ You can contribute with bug reports and patches.
See these [[https://orgmode.org/worg/org-contribute.html#org069b83a][directions]].
-* As a Org maintainer
+* As an Org maintainer
We encourage you to volunteer to maintain one of the Org files.
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 71ad4d9e8..987a29354 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -508,7 +508,7 @@ as a title for your own headings.
Some people find the many stars too noisy and would prefer an outline
that has whitespace followed by a single star as headline starters.
-This can be achieved using a Org Indent minor mode. See [[*A Cleaner
+This can be achieved using an Org Indent minor mode. See [[*A Cleaner
Outline View]] for more information.
Headlines are not numbered. However, you may want to dynamically
@@ -11284,8 +11284,8 @@ For example:
#+begin_example
\begin{equation} % arbitrary environments,
-x=\sqrt{b} % even tables, figures
-\end{equation} % etc
+x=\sqrt{b} % even tables, figures, etc
+\end{equation}
If $a^2=b$ and \( b=2 \), then the solution must be
either $$ a=+\sqrt{2} $$ or \[ a=-\sqrt{2} \].
@@ -11478,7 +11478,7 @@ see [[*Structure Templates]] for shortcuts to easily insert code blocks.
(defun org-xor (a b)
"Exclusive or."
(if a (not b) b))
- ,#+END_SRC
+,#+END_SRC
#+end_example
Both in =example= and in =src= snippets, you can add a =-n= switch to
@@ -15837,7 +15837,7 @@ Texinfo definition commands (see [[info:texinfo::Definition Commands]]).
One of them uses description lists and is described below, the other
relies on special blocks (see [[*Special blocks in Texinfo export]]).
-Items in a description list in a Org file that begin with =Function:=
+Items in a description list in an Org file that begin with =Function:=
or certain other prefixes are converted using Texinfo definition
commands. This works even if other items in the same list do not have
such a prefix; if necessary a single description list is converted
--
2.39.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Several typo fixes
2023-07-05 14:29 [PATCH] Several typo fixes Shynur Xie
@ 2023-07-06 10:01 ` Ihor Radchenko
2023-07-06 17:34 ` Shynur Xie
0 siblings, 1 reply; 4+ messages in thread
From: Ihor Radchenko @ 2023-07-06 10:01 UTC (permalink / raw)
To: Shynur Xie; +Cc: emacs-orgmode@gnu.org
Shynur Xie <one.last.kiss@outlook.com> writes:
> From 34d8d8a4a532eea67e485347a690781674ee3f09 Mon Sep 17 00:00:00 2001
> From: Shynur <one.last.kiss@outlook.com>
> Date: Wed, 5 Jul 2023 22:23:44 +0800
> Subject: [PATCH] Several typo fixes
Thanks, but the patch does not apply onto the latest WORG master:
128 git … am --3way -- /tmp/0001-Several-typo-fixes.patch
Applying: Several typo fixes
error: sha1 information is lacking or useless (CONTRIBUTE.org).
error: could not build fake ancestor
Patch failed at 0001 Several typo fixes
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
May you please rebase the patch onto the latest master?
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Several typo fixes
2023-07-06 10:01 ` Ihor Radchenko
@ 2023-07-06 17:34 ` Shynur Xie
2023-07-06 17:41 ` Ihor Radchenko
0 siblings, 1 reply; 4+ messages in thread
From: Shynur Xie @ 2023-07-06 17:34 UTC (permalink / raw)
To: Ihor Radchenko; +Cc: emacs-orgmode@gnu.org
> Ihor> the patch does not apply onto the latest WORG master:
Sorry for that; I’m new to Org and don’t know WORG before.
The PATCH I wrote is for the repository cloned fron
<git://git.savannah.gnu.org/emacs/org-mode.git>.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Several typo fixes
2023-07-06 17:34 ` Shynur Xie
@ 2023-07-06 17:41 ` Ihor Radchenko
0 siblings, 0 replies; 4+ messages in thread
From: Ihor Radchenko @ 2023-07-06 17:41 UTC (permalink / raw)
To: Shynur Xie; +Cc: emacs-orgmode@gnu.org
Shynur Xie <one.last.kiss@outlook.com> writes:
>> Ihor> the patch does not apply onto the latest WORG master:
>
> Sorry for that; I’m new to Org and don’t know WORG before.
>
> The PATCH I wrote is for the repository cloned fron
> <git://git.savannah.gnu.org/emacs/org-mode.git>.
Oh, that's my fault.
I somehow thought that the patch is for several pages in
https://orgmode.org/worg/, which is a different report.
I now applied your patch in the main Org mode repository.
Thanks!
Applied, onto main, adding TINYCHANGE cookie to the commit message (see https://orgmode.org/worg/org-contribute.html#first-patch).
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=501be358b
You are now listed as an Org contributor.
https://git.sr.ht/~bzg/worg/commit/afcb41dd
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-06 17:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-05 14:29 [PATCH] Several typo fixes Shynur Xie
2023-07-06 10:01 ` Ihor Radchenko
2023-07-06 17:34 ` Shynur Xie
2023-07-06 17:41 ` Ihor Radchenko
Code repositories for project(s) associated with this public 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).