Org Mode Documentation Patch

["Ben Phipathananunth" <siraben@disroot.org>]

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

I've begun reading the Org Mode manual, and noticed that the wording
in some places could be improved (so far I've read up to Section 4.8).
I've attached my patch.  Some of the more drastic changes:

- Changed all occurrences of "the cursor" to "point", I thought the
  inconsistency was confusing, especially since the Emacs manual
  maintains usage of "point" throughout, so too should the Org Mode
  manual.

I have a couple of questions regarding the Org Mode manual and
submitting patches:

Section 4.6 "Link abbreviations" in the Org Mode manual link to
websites that have and/or promote non-free software.  The URLs are
used to illustrate link abbreviations in Org Mode, but I suppose this
was purely coincidental because long URLs to websites such as
gnu.org/some/long/path could be used instead.  Would it be appropriate
to change the examples in a later patch?

When the PDF version of the Org Mode manual is generated with "make
docs", the footnotes (3 and 4) around Section 4.3 are incorrectly
indented, can anyone reproduce this?  What is causing it?

Should I submit my patches as smaller ones as I read sections of the
manual or bulk them together into a larger patch, or is it just a
matter of preference?

Please let me know if you have any comments about the patch.  It's my
first one, I hope I have followed the CONTRIBUTING guide properly.

Thanks!

--

Siraphob (Ben) Phipathananunth

[-- Attachment #2: 0001-Fix-various-grammatical-errors-and-terminology.patch --]
[-- Type: application/octet-stream, Size: 53012 bytes --]

From d3145b9e4f0bc18a638d0fb436ceb68ab694e53c Mon Sep 17 00:00:00 2001
From: Ben Phipathananunth <bensiraphob@hotmail.co.uk>
Date: Fri, 22 Jun 2018 22:58:27 +0700
Subject: [PATCH] Fix various grammatical errors and terminology.

---
 doc/misc/org.texi | 372 +++++++++++++++++++++++-----------------------
 1 file changed, 187 insertions(+), 185 deletions(-)

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 3bce0dd736..328db319a3 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -990,7 +990,7 @@ Activation
 use of this, you need to have @code{transient-mark-mode} turned on, which is
 the default.  If you do not like @code{transient-mark-mode}, you can create
 an active region by using the mouse to select a region, or pressing
-@kbd{C-@key{SPC}} twice before moving the cursor.
+@kbd{C-@key{SPC}} twice before moving point.
 
 @node Feedback
 @section Feedback
@@ -1257,7 +1257,7 @@ Global and local cycling
 @end example
 
 @vindex org-cycle-emulate-tab
-The cursor must be on a headline for this to work@footnote{see, however,
+Point must be on a headline for this to work@footnote{see, however,
 the option @code{org-cycle-emulate-tab}.}.
 
 @cindex global visibility states
@@ -1538,9 +1538,8 @@ Structure editing
 demotion work on all headlines in the region.  To select a region of
 headlines, it is best to place both point and mark at the beginning of a
 line, mark at the beginning of the first headline, and point at the line
-just after the last headline to change.  Note that when the cursor is
-inside a table (@pxref{Tables}), the Meta-Cursor keys have different
-functionality.
+just after the last headline to change.  Note that when point is inside a
+table (@pxref{Tables}), the Meta-Cursor keys have different functionality.
 
 
 @node Sparse trees
@@ -1697,24 +1696,24 @@ Plain lists
 @code{org-list-indent-offset}.
 
 @vindex org-list-automatic-rules
-The following commands act on items when the cursor is in the first line of
-an item (the line with the bullet or number).  Some of them imply the
+The following commands act on items when point is in the first line of an
+item (the line with the bullet or number).  Some of them imply the
 application of automatic rules to keep list structure intact.  If some of
-these actions get in your way, configure @code{org-list-automatic-rules}
-to disable them individually.
+these actions get in your way, configure @code{org-list-automatic-rules} to
+disable them individually.
 
 @table @asis
 @orgcmd{@key{TAB},org-cycle}
 @cindex cycling, in plain lists
 @vindex org-cycle-include-plain-lists
 Items can be folded just like headline levels.  Normally this works only if
-the cursor is on a plain list item.  For more details, see the variable
+point is on a plain list item.  For more details, see the variable
 @code{org-cycle-include-plain-lists}.  If this variable is set to
 @code{integrate}, plain list items will be treated like low-level
 headlines.  The level of an item is then given by the indentation of the
-bullet/number.  Items are always subordinate to real headlines, however; the
-hierarchies remain completely separated.  In a new item with no text yet, the
-first @key{TAB} demotes the item to become a child of the previous
+bullet/number.  Items are always subordinate to real headlines, however;
+the hierarchies remain completely separated.  In a new item with no text
+yet, the first @key{TAB} demotes the item to become a child of the previous
 one.  Subsequent @key{TAB}s move the item to meaningful levels in the list
 and eventually get it back to its initial position.
 @orgcmd{M-@key{RET},org-insert-heading}
@@ -1803,7 +1802,7 @@ Plain lists
 @kindex S-RIGHT
 @item S-@key{LEFT}/@key{RIGHT}
 @vindex org-support-shift-select
-This command also cycles bullet styles when the cursor in on the bullet or
+This command also cycles bullet styles when point is on the bullet or
 anywhere in an item line, details depending on
 @code{org-support-shift-select}.
 @kindex C-c ^
@@ -1844,15 +1843,15 @@ Drawers
 intercept @kbd{M-@key{TAB}} to switch windows.  Use @kbd{C-M-i} or
 @kbd{@key{ESC} @key{TAB}} instead for completion (@pxref{Completion}).}.
 
-Visibility cycling (@pxref{Visibility cycling}) on the headline will hide and
-show the entry, but keep the drawer collapsed to a single line.  In order to
-look inside the drawer, you need to move the cursor to the drawer line and
-press @key{TAB} there.  Org mode uses the @code{PROPERTIES} drawer for
-storing properties (@pxref{Properties and columns}), and you can also arrange
-for state change notes (@pxref{Tracking TODO state changes}) and clock times
-(@pxref{Clocking work time}) to be stored in a drawer @code{LOGBOOK}.  If you
-want to store a quick note in the LOGBOOK drawer, in a similar way to state
-changes, use
+Visibility cycling (@pxref{Visibility cycling}) on the headline will hide
+and show the entry, but keep the drawer collapsed to a single line.  In
+order to look inside the drawer, you need to move point to the drawer line
+and press @key{TAB} there.  Org mode uses the @code{PROPERTIES} drawer for
+storing properties (@pxref{Properties and columns}), and you can also
+arrange for state change notes (@pxref{Tracking TODO state changes}) and
+clock times (@pxref{Clocking work time}) to be stored in a drawer
+@code{LOGBOOK}.  If you want to store a quick note in the LOGBOOK drawer,
+in a similar way to state changes, use
 
 @table @kbd
 @kindex C-c C-z
@@ -1933,7 +1932,7 @@ Footnotes
 @item C-c C-x f
 The footnote action command.
 
-When the cursor is on a footnote reference, jump to the definition.  When it
+When point is on a footnote reference, jump to the definition.  When it
 is at a definition, jump to the (first) reference.
 
 @vindex org-footnote-define-inline
@@ -1972,7 +1971,7 @@ Footnotes
 
 @kindex C-c C-c
 @item C-c C-c
-If the cursor is on a footnote reference, jump to the definition.  If it is a
+If point is on a footnote reference, jump to the definition.  If it is a
 the definition, jump back to the reference.  When called at a footnote
 location with a prefix argument, offer the same menu as @kbd{C-c C-x f}.
 @kindex C-c C-o
@@ -2007,10 +2006,10 @@ Orgstruct mode
 (add-hook 'message-mode-hook 'turn-on-orgstruct++)
 @end lisp
 
-When this mode is active and the cursor is on a line that looks to Org like a
+When this mode is active and point is on a line that looks to Org like a
 headline or the first line of a list item, most structure editing commands
-will work, even if the same keys normally have different functionality in the
-major mode you are using.  If the cursor is not in one of those special
+will work, even if the same keys normally have different functionality in
+the major mode you are using.  If point is not in one of those special
 lines, Orgstruct mode lurks silently in the shadows.
 
 When you use @code{orgstruct++-mode}, Org will also export indentation and
@@ -2106,12 +2105,12 @@ Built-in table editor
 @kbd{C-c @key{RET}}.
 
 @vindex org-table-auto-blank-field
-When typing text into a field, Org treats @key{DEL}, @key{Backspace}, and all
-character keys in a special way, so that inserting and deleting avoids
-shifting other fields.  Also, when typing @emph{immediately after the cursor
-was moved into a new field with @kbd{@key{TAB}}, @kbd{S-@key{TAB}} or
-@kbd{@key{RET}}}, the field is automatically made blank.  If this behavior is
-too unpredictable for you, configure the option
+When typing text into a field, Org treats @key{DEL}, @key{Backspace}, and
+all character keys in a special way, so that inserting and deleting avoids
+shifting other fields.  Also, when typing @emph{immediately after point was
+moved into a new field with @kbd{@key{TAB}}, @kbd{S-@key{TAB}} or
+@kbd{@key{RET}}}, the field is automatically made blank.  If this behavior
+is too unpredictable for you, configure the option
 @code{org-table-auto-blank-field}.
 
 @table @kbd
@@ -2162,7 +2161,7 @@ Built-in table editor
 Kill the current column.
 @c
 @orgcmd{M-S-@key{RIGHT},org-table-insert-column}
-Insert a new column to the left of the cursor position.
+Insert a new column to the left of point.
 @c
 @orgcmdkkcc{M-@key{UP},M-@key{DOWN},org-table-move-row-up,org-table-move-row-down}
 Move the current row up/down.
@@ -2179,7 +2178,7 @@ Built-in table editor
 is created above the current line.
 @c
 @orgcmd{C-c @key{RET},org-table-hline-and-move}
-Insert a horizontal line below current row, and move the cursor into the row
+Insert a horizontal line below current row, and move point into the row
 below that line.
 @c
 @orgcmd{C-c ^,org-table-sort-lines}
@@ -2213,11 +2212,11 @@ Built-in table editor
 lines.
 @c
 @orgcmd{M-@key{RET},org-table-wrap-region}
-Split the current field at the cursor position and move the rest to the line
-below.  If there is an active region, and both point and mark are in the same
-column, the text in the column is wrapped to minimum width for the given
-number of lines.  A numeric prefix argument may be used to change the number
-of desired lines.  If there is no region, but you specify a prefix argument,
+Split the current field at point and move the rest to the line below.  If
+there is an active region, and both point and mark are in the same column,
+the text in the column is wrapped to minimum width for the given number of
+lines.  A numeric prefix argument may be used to change the number of
+desired lines.  If there is no region, but you specify a prefix argument,
 the current field is made blank, and the content is appended to the field
 above.
 
@@ -2244,13 +2243,13 @@ Built-in table editor
 
 @tsubheading{Miscellaneous}
 @orgcmd{C-c `,org-table-edit-field}
-Edit the current field in a separate window.  This is useful for fields that
-are not fully visible (@pxref{Column width and alignment}).  When called with
-a @kbd{C-u} prefix, just make the full field visible, so that it can be
-edited in place.  When called with two @kbd{C-u} prefixes, make the editor
-window follow the cursor through the table and always show the current
-field.  The follow mode exits automatically when the cursor leaves the table,
-or when you repeat this command with @kbd{C-u C-u C-c `}.
+Edit the current field in a separate window.  This is useful for fields
+that are not fully visible (@pxref{Column width and alignment}).  When
+called with a @kbd{C-u} prefix, just make the full field visible, so that
+it can be edited in place.  When called with two @kbd{C-u} prefixes, make
+the editor window follow point through the table and always show the
+current field.  The follow mode exits automatically when point leaves the
+table, or when you repeat this command with @kbd{C-u C-u C-c `}.
 @c
 @item M-x org-table-import @key{RET}
 Import a file as a table.  The table should be TAB or whitespace
@@ -2750,7 +2749,7 @@ Formula syntax for Lisp
 you provide the @samp{N} mode switch, all referenced elements will be numbers
 (non-number fields will be zero) and interpolated as Lisp numbers, without
 quotes.  If you provide the @samp{L} flag, all fields will be interpolated
-literally, without quotes.  I.e., if you want a reference to be interpreted
+literally, without quotes.  For example, if you want a reference to be interpreted
 as a string by the Lisp form, enclose the reference operator itself in
 double-quotes, like @code{"$3"}.  Ranges are inserted as space-separated
 fields, so you can embed them in list or vector syntax.
@@ -2811,7 +2810,7 @@ Field and range formulas
 
 To assign a formula to a particular field, type it directly into the field,
 preceded by @samp{:=}, for example @samp{:=vsum(@@II..III)}.  When you press
-@key{TAB} or @key{RET} or @kbd{C-c C-c} with the cursor still in the field,
+@key{TAB} or @key{RET} or @kbd{C-c C-c} with point still in the field,
 the formula will be stored as the formula for this field, evaluated, and the
 current field will be replaced with the result.
 
@@ -2824,9 +2823,9 @@ Field and range formulas
 modified in order to still reference the same field.  To avoid this, in
 particular in range references, anchor ranges at the table borders (using
 @code{@@<}, @code{@@>}, @code{$<}, @code{$>}), or at hlines using the
-@code{@@I} notation.  Automatic adaptation of field references does of course
+@code{@@I} notation.  Automatic adaptation of field references does
 not happen if you edit the table structure with normal editing
-commands---then you must fix the equations yourself.
+commands---you must fix the formulas yourself.
 
 Instead of typing an equation into the field, you may also use the following
 command
@@ -2876,9 +2875,9 @@ Column formulas
 
 To assign a formula to a column, type it directly into any field in the
 column, preceded by an equal sign, like @samp{=$1+$2}.  When you press
-@key{TAB} or @key{RET} or @kbd{C-c C-c} with the cursor still in the field,
-the formula will be stored as the formula for the current column, evaluated
-and the current field replaced with the result.  If the field contains only
+@key{TAB} or @key{RET} or @kbd{C-c C-c} with point still in the field, the
+formula will be stored as the formula for the current column, evaluated and
+the current field replaced with the result.  If the field contains only
 @samp{=}, the previously stored formula for this column is used.  For each
 column, Org will only remember the most recently used formula.  In the
 @code{#+TBLFM:} line, column formulas will look like @samp{$4=$1+$2}.  The
@@ -2965,7 +2964,7 @@ Editing and debugging formulas
 minibuffer is that you can use the command @kbd{C-c ?}.
 @orgcmd{C-c ?,org-table-field-info}
 While editing a formula in a table field, highlight the field(s)
-referenced by the reference at the cursor position in the formula.
+referenced by the reference at point in the formula.
 @kindex C-c @}
 @findex org-table-toggle-coordinate-overlays
 @item C-c @}
@@ -2980,9 +2979,9 @@ Editing and debugging formulas
 @orgcmd{C-c ',org-table-edit-formulas}
 Edit all formulas for the current table in a special buffer, where the
 formulas will be displayed one per line.  If the current field has an
-active formula, the cursor in the formula editor will mark it.
+active formula, point in the formula editor will mark it.
 While inside the special buffer, Org will automatically highlight
-any field or range reference at the cursor position.  You may edit,
+any field or range reference at point.  You may edit,
 remove and add formulas, and use the following commands:
 
 @table @kbd
@@ -3045,7 +3044,7 @@ Editing and debugging formulas
 @cindex @code{#+TBLFM}, switching
 @kindex C-c C-c
 
-You may apply the formula temporarily.  This is useful when you
+You may apply the formula temporarily.  This is useful when you want to
 switch the formula.  Place multiple @code{#+TBLFM} lines right
 after the table, and then press @kbd{C-c C-c} on the formula to
 apply.  Here is an example:
@@ -3073,7 +3072,7 @@ Editing and debugging formulas
 
 @noindent
 Note: If you recalculate this table (with @kbd{C-u C-c *}, for example), you
-will get the following result of applying only the first @code{#+TBLFM} line.
+will get the following result from applying only the first @code{#+TBLFM} line.
 
 @example
 | x | y |
@@ -3135,10 +3134,10 @@ Advanced features
 @subsection Advanced features
 
 If you want the recalculation of fields to happen automatically, or if you
-want to be able to assign @i{names}@footnote{Such names must start by an
-alphabetic character and use only alphanumeric/underscore characters.} to
-fields and columns, you need to reserve the first column of the table for
-special marking characters.
+want to be able to assign @i{names}@footnote{Such names must start with an
+alphabetic character and consist solely of alphanumeric or underscore
+characters.} to fields and columns, you need to reserve the first column of
+the table for special marking characters.
 
 @table @kbd
 @orgcmd{C-#,org-table-rotate-recalc-marks}
@@ -3329,7 +3328,7 @@ Org-Plot
 
 @subheading ASCII bar plots
 
-While the cursor is on a column, typing @kbd{C-c " a} or
+While point is on a column, typing @kbd{C-c " a} or
 @kbd{M-x orgtbl-ascii-plot @key{RET}} create a new column containing an
 ASCII-art bars plot.  The plot is implemented through a regular column
 formula.  When the source column changes, the bar plot may be updated by
@@ -3372,7 +3371,7 @@ Hyperlinks
 @chapter Hyperlinks
 @cindex hyperlinks
 
-Like HTML, Org provides links inside a file, external links to
+Like HTML, Org provides support for links inside a file, external links to
 other files, Usenet articles, emails, and much more.
 
 @menu
@@ -3409,7 +3408,7 @@ Link format
 edit also the invisible @samp{link} part, use @kbd{C-c C-l} with the
 cursor on the link.
 
-If you place the cursor at the beginning or just behind the end of the
+If you place point at the beginning or just behind the end of the
 displayed text and press @key{BACKSPACE}, you will remove the
 (invisible) bracket at that location.  This makes the link incomplete
 and the internals are again displayed as plain text.  Inserting the
@@ -3424,16 +3423,16 @@ Internal links
 @cindex targets, for links
 
 @cindex property, @code{CUSTOM_ID}
-If the link does not look like a URL, it is considered to be internal in the
-current file.  The most important case is a link like
+If the link does not look like a URL, it is considered to be internal to
+the current file.  The most important case is a link like
 @samp{[[#my-custom-id]]} which will link to the entry with the
-@code{CUSTOM_ID} property @samp{my-custom-id}.  You are responsible yourself
-to make sure these custom IDs are unique in a file.
+@code{CUSTOM_ID} property @samp{my-custom-id}.  It is up to you to make
+sure these custom IDs are unique in a file.
 
 Links such as @samp{[[My Target]]} or @samp{[[My Target][Find my target]]}
 lead to a text search in the current file.
 
-The link can be followed with @kbd{C-c C-o} when the cursor is on the link,
+The link can be followed with @kbd{C-c C-o} when point is on the link,
 or with a mouse click (@pxref{Handling links}).  Links to custom IDs will
 point to the corresponding headline.  The preferred match for a text link is
 a @i{dedicated target}: the same string in double angular brackets, like
@@ -3462,7 +3461,7 @@ Internal links
 During export, internal links will be used to mark objects and assign them
 a number.  Marked objects will then be referenced by links pointing to them.
 In particular, links without a description will appear as the number assigned
-to the marked object@footnote{When targeting a @code{#+NAME} keyword,
+to the marked object@footnote{When targeting a @code{#+NAME} keyword, the
 @code{#+CAPTION} keyword is mandatory in order to get proper numbering
 (@pxref{Images and tables}).}.  In the following excerpt from an Org buffer
 
@@ -3569,7 +3568,7 @@ External links
 
 @cindex VM links
 @cindex WANDERLUST links
-On top of these built-in link types, some are available through the
+On top of these built-in link types, additional ones are available through the
 @code{contrib/} directory (@pxref{Installation}).  For example, these links
 to VM or Wanderlust messages are available when you load the corresponding
 libraries from the @code{contrib/} directory:
@@ -3584,7 +3583,7 @@ External links
 wl:folder#id                                 @r{WANDERLUST message link}
 @end example
 
-For customizing Org to add new link types @ref{Adding hyperlink types}.
+For more on customizing Org to add new link types see @ref{Adding hyperlink types}.
 
 A link should be enclosed in double brackets and may contain a descriptive
 text to be displayed instead of the URL (@pxref{Link format}), for example:
@@ -3596,7 +3595,7 @@ External links
 @noindent
 If the description is a file name or URL that points to an image, HTML
 export (@pxref{HTML export}) will inline the image as a clickable
-button.  If there is no description at all and the link points to an
+button.  If there is no description and the link points to an
 image,
 that image will be inlined into the exported HTML file.
 
@@ -3605,7 +3604,7 @@ External links
 Org also finds external links in the normal text and activates them
 as links.  If spaces must be part of the link (for example in
 @samp{bbdb:Richard Stallman}), or if you need to remove ambiguities
-about the end of the link, enclose them in square brackets.
+about the end of the link, enclose the link in square brackets.
 
 @node Handling links
 @section Handling links
@@ -3620,11 +3619,11 @@ Handling links
 Store a link to the current location.  This is a @emph{global} command (you
 must create the key binding yourself) which can be used in any buffer to
 create a link.  The link will be stored for later insertion into an Org
-buffer (see below).  What kind of link will be created depends on the current
-buffer:
+buffer (see below).  The kind of link that will be created depends on the
+current buffer:
 
 @b{Org mode buffers}@*
-For Org files, if there is a @samp{<<target>>} at the cursor, the link points
+For Org files, if there is a @samp{<<target>>} at point, the link points
 to the target.  Otherwise it points to the current headline, which will also
 be the description@footnote{If the headline contains a timestamp, it will be
 removed from the link and result in a wrong link---you should avoid putting
@@ -3634,23 +3633,24 @@ Handling links
 @cindex property, @code{CUSTOM_ID}
 @cindex property, @code{ID}
 If the headline has a @code{CUSTOM_ID} property, a link to this custom ID
-will be stored.  In addition or alternatively (depending on the value of
-@code{org-id-link-to-org-use-id}), a globally unique @code{ID} property will
-be created and/or used to construct a link@footnote{The library
-@file{org-id.el} must first be loaded, either through @code{org-customize} by
-enabling @code{org-id} in @code{org-modules}, or by adding @code{(require
-'org-id)} in your Emacs init file.}.  So using this command in Org buffers
-will potentially create two links: a human-readable from the custom ID, and
-one that is globally unique and works even if the entry is moved from file to
-file.  Later, when inserting the link, you need to decide which one to use.
+will be stored.  Depending on the value of
+@code{org-id-link-to-org-use-id}), a globally unique @code{ID} property
+will be created and/or used to construct a link@footnote{The library
+@file{org-id.el} must first be loaded, either through @code{org-customize}
+by enabling @code{org-id} in @code{org-modules}, or by adding
+@code{(require 'org-id)} in your Emacs init file.}.  So using this command
+in Org buffers will potentially create two links: a human-readable from the
+custom ID, and one that is globally unique and works even if the entry is
+moved from file to file.  Later, when inserting the link, you need to
+decide which one to use.
 
 @b{Email/News clients: VM, Rmail, Wanderlust, MH-E, Gnus}@*
 Pretty much all Emacs mail clients are supported.  The link will point to the
 current article, or, in some GNUS buffers, to the group.  The description is
 constructed from the author and the subject.
 
-@b{Web browsers: Eww, W3 and W3M}@*
-Here the link will be the current URL, with the page title as description.
+@b{Web browsers: EWW, W3 and W3M}@*
+Here the link will be the current URL, with the page title as the description.
 
 @b{Contacts: BBDB}@*
 Links created in a BBDB buffer will point to the current entry.
@@ -3666,13 +3666,12 @@ Handling links
 For any other files, the link will point to the file, with a search string
 (@pxref{Search options}) pointing to the contents of the current line.  If
 there is an active region, the selected words will form the basis of the
-search string.  If the automatically created link is not working correctly or
-accurately enough, you can write custom functions to select the search string
+search string.  You can write custom Lisp functions to select the search string
 and to do the search for particular file types---see @ref{Custom searches}.
 The key binding @kbd{C-c l} is only a suggestion---see @ref{Installation}.
 
 @b{Agenda view}@*
-When the cursor is in an agenda view, the created link points to the
+When point is in an agenda view, the created link points to the
 entry referenced by the current line.
 
 @c
@@ -3684,17 +3683,18 @@ Handling links
 @vindex org-link-parameters
 Insert a link@footnote{Note that you don't have to use this command to
 insert a link.  Links in Org are plain text, and you can type or paste them
-straight into the buffer.  By using this command, the links are automatically
-enclosed in double brackets, and you will be asked for the optional
-descriptive text.}.  This prompts for a link to be inserted into the buffer.
-You can just type a link, using text for an internal link, or one of the link
-type prefixes mentioned in the examples above.  The link will be inserted
-into the buffer@footnote{After insertion of a stored link, the link will be
-removed from the list of stored links.  To keep it in the list later use, use
-a triple @kbd{C-u} prefix argument to @kbd{C-c C-l}, or configure the option
-@code{org-keep-stored-link-after-insertion}.}, along with a descriptive text.
-If some text was selected when this command is called, the selected text
-becomes the default description.
+straight into the buffer.  By using this command, the links are
+automatically enclosed in double brackets, and you will be asked for the
+optional descriptive text.}.  This prompts for a link to be inserted into
+the buffer.  You can just type a link, using text for an internal link, or
+one of the link type prefixes mentioned in the examples above.  The link
+will be inserted into the buffer@footnote{After insertion of a stored link,
+the link will be removed from the list of stored links.  To keep it in the
+list for later use, use a triple @kbd{C-u} prefix argument to @kbd{C-c
+C-l}, or configure the option
+@code{org-keep-stored-link-after-insertion}.}, along with a descriptive
+text.  If some text was selected when this command is called, the selected
+text becomes the default description.
 
 @b{Inserting stored links}@*
 All links stored during the
@@ -3724,7 +3724,7 @@ Handling links
 force an absolute path with two @kbd{C-u} prefixes.
 @c
 @item C-c C-l @ @r{(with cursor on existing link)}
-When the cursor is on an existing link, @kbd{C-c C-l} allows you to edit the
+When point is on an existing link, @kbd{C-c C-l} allows you to edit the
 link and description parts of the link.
 @c
 @cindex following links
@@ -3735,15 +3735,15 @@ Handling links
 @command{browse-url-at-point}), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for
 the corresponding links, and execute the command in a shell link.  When the
 cursor is on an internal link, this command runs the corresponding search.
-When the cursor is on a TAG list in a headline, it creates the corresponding
-TAGS view.  If the cursor is on a timestamp, it compiles the agenda for that
+When point is on a TAG list in a headline, it creates the corresponding
+TAGS view.  If point is on a timestamp, it compiles the agenda for that
 date.  Furthermore, it will visit text and remote files in @samp{file:} links
 with Emacs and select a suitable application for local non-text files.
 Classification of files is based on file extension only.  See option
 @code{org-file-apps}.  If you want to override the default application and
 visit the file with Emacs, use a @kbd{C-u} prefix.  If you want to avoid
 opening in Emacs, use a @kbd{C-u C-u} prefix.@*
-If the cursor is on a headline, but not on a link, offer all links in the
+If point is on a headline, but not on a link, offer all links in the
 headline and entry text.  If you want to setup the frame configuration for
 following links, customize @code{org-link-frame-setup}.
 
@@ -3781,7 +3781,7 @@ Handling links
 @code{#+STARTUP} keywords @code{inlineimages} and @code{noinlineimages}}.
 @orgcmd{C-c %,org-mark-ring-push}
 @cindex mark ring
-Push the current position onto the mark ring, to be able to return
+Push the current position onto Org's mark ring, to be able to return
 easily.  Commands following an internal link do this automatically.
 @c
 @orgcmd{C-c &,org-mark-ring-goto}
@@ -3793,7 +3793,7 @@ Handling links
 @c
 @orgcmdkkcc{C-c C-x C-n,C-c C-x C-p,org-next-link,org-previous-link}
 @cindex links, finding next/previous
-Move forward/backward to the next link in the buffer.  At the limit of
+Move forward/backward to the next link in the buffer.  At the end of
 the buffer, the search fails once, and then wraps around.  The key
 bindings for this are really too long; you might want to bind this also
 to @kbd{C-n} and @kbd{C-p}
@@ -3808,16 +3808,17 @@ Handling links
 @node Using links outside Org
 @section Using links outside Org
 
-You can insert and follow links that have Org syntax not only in
-Org, but in any Emacs buffer.  For this, you should create two
-global commands, like this (please select suitable global keys
-yourself):
+You can insert and follow links that have Org syntax not only in Org, but
+in any Emacs buffer.  To achieve this, you can create two global key
+bindings, using Lisp code like this (alternative keys may be chosen):
 
 @lisp
 (global-set-key "\C-c L" 'org-insert-link-global)
 (global-set-key "\C-c o" 'org-open-at-point-global)
 @end lisp
 
+This can be placed in your Init file, for instance.
+
 @node Link abbreviations
 @section Link abbreviations
 @cindex link abbreviations
@@ -3855,12 +3856,12 @@ Link abbreviations
 replaced with the tag.  Using @samp{%h} instead of @samp{%s} will
 url-encode the tag (see the example above, where we need to encode
 the URL parameter.)  Using @samp{%(my-function)} will pass the tag
-to a custom function, and replace it by the resulting string.
+to a custom Lisp function, and replace it by the resulting string.
 
 If the replacement text doesn't contain any specifier, the tag will simply be
 appended in order to create the link.
 
-Instead of a string, you may also specify a function that will be
+Instead of a string, you may also specify a Lisp function that will be
 called with the tag as the only argument to create the link.
 
 With the above setting, you could link to a specific bug with
@@ -3882,10 +3883,11 @@ Link abbreviations
 
 @noindent
 In-buffer completion (@pxref{Completion}) can be used after @samp{[} to
-complete link abbreviations.  You may also define a function that implements
-special (e.g., completion) support for inserting such a link with @kbd{C-c
-C-l}.  Such a function should not accept any arguments, and return the full
-link with prefix.  You can add a completion function to a link like this:
+complete link abbreviations.  You may also define a Lisp function that
+implements special (e.g. completion) support for inserting such a link with
+@kbd{C-c C-l}.  Such a function should not accept any arguments, and should
+return the full link with a prefix.  You can add a completion function to a
+link like this:
 
 @lisp
 (org-link-set-parameters ``type'' :complete #'some-function)
@@ -3907,7 +3909,7 @@ Search options
 link with @kbd{C-c C-o}.
 
 Here is the syntax of the different ways to attach a search to a file
-link, together with an explanation:
+link, together with explanations for each:
 
 @example
 [[file:~/code/main.c::255]]
@@ -3958,15 +3960,15 @@ Custom searches
 
 @vindex org-create-file-search-functions
 @vindex org-execute-file-search-functions
-If you come across such a problem, you can write custom functions to set
-the right search string for a particular file type, and to do the search
-for the string in the file.  Using @code{add-hook}, these functions need
-to be added to the hook variables
+If you come across such a problem, you can write custom Lisp functions to
+set the right search string for a particular file type, and to do the
+search for the string in the file.  Using @code{add-hook}, these functions
+need to be added to the hook variables
 @code{org-create-file-search-functions} and
 @code{org-execute-file-search-functions}.  See the docstring for these
-variables for more information.  Org actually uses this mechanism
-for Bib@TeX{} database files, and you can use the corresponding code as
-an implementation example.  See the file @file{org-bibtex.el}.
+variables for more information.  Org actually uses this mechanism for
+Bib@TeX{} database files, and you can use the corresponding code as an
+implementation example.  See the file @file{org-bibtex.el}.
 
 @node TODO items
 @chapter TODO items
@@ -4268,7 +4270,7 @@ Per-file keywords
 Remember that the keywords after the vertical bar (or the last keyword
 if no bar is there) must always mean that the item is DONE (although you
 may use a different word).  After changing one of these lines, use
-@kbd{C-c C-c} with the cursor still in the line to make the changes
+@kbd{C-c C-c} with point still in the line to make the changes
 known to Org mode@footnote{Org mode parses these lines only when
 Org mode is activated after visiting a file.  @kbd{C-c C-c} with the
 cursor in a line starting with @samp{#+} is simply restarting Org mode
@@ -4808,7 +4810,7 @@ Checkboxes
 and set all remaining boxes to the same status as the first.  With a prefix
 arg, add or remove the checkbox for all items in the region.
 @item
-If the cursor is in a headline, toggle the state of the first checkbox in the
+If point is in a headline, toggle the state of the first checkbox in the
 region between this headline and the next---so @emph{not} the entire
 subtree---and propagate this new state to all other checkboxes in the same
 area.
@@ -4816,7 +4818,7 @@ Checkboxes
 If there is no active region, just toggle the checkbox at point.
 @end itemize
 @orgcmd{M-S-@key{RET},org-insert-todo-heading}
-Insert a new item with a checkbox.  This works only if the cursor is already
+Insert a new item with a checkbox.  This works only if point is already
 in a plain list item (@pxref{Plain lists}).
 @orgcmd{C-c C-x o,org-toggle-ordered-property}
 @vindex org-track-ordered-property-with-tag
@@ -4940,7 +4942,7 @@ Setting tags
 demotion, and TODO state changes (@pxref{TODO basics}).
 
 @orgcmd{C-c C-c,org-set-tags-command}
-When the cursor is in a headline, this does the same as @kbd{C-c C-q}.
+When point is in a headline, this does the same as @kbd{C-c C-q}.
 @end table
 
 @vindex org-tag-alist
@@ -5022,7 +5024,7 @@ Setting tags
 @noindent you indicate that at most one of @samp{@@work}, @samp{@@home},
 and @samp{@@tennisclub} should be selected.  Multiple such groups are allowed.
 
-@noindent Don't forget to press @kbd{C-c C-c} with the cursor in one of
+@noindent Don't forget to press @kbd{C-c C-c} with point in one of
 these lines to activate any changes.
 
 @noindent
@@ -5380,7 +5382,7 @@ Property syntax
 inserted early in the entry, but after the lines with planning
 information like deadlines.
 @orgcmd{C-c C-c,org-property-action}
-With the cursor in a property drawer, this executes property commands.
+With point in a property drawer, this executes property commands.
 @orgcmd{C-c C-c s,org-set-property}
 Set a property in the current entry.  Both the property and the value
 can be inserted using completion.
@@ -5697,7 +5699,7 @@ Using column view
 @tsubheading{Turning column view on and off}
 @orgcmd{C-c C-x C-c,org-columns}
 @vindex org-columns-default-format
-Turn on column view.  If the cursor is before the first headline in the file,
+Turn on column view.  If point is before the first headline in the file,
 or the function called with the universal prefix argument, column view is
 turned on for the entire file, using the @code{#+COLUMNS} definition.  If the
 cursor is somewhere inside the outline, this command searches the hierarchy,
@@ -5966,7 +5968,7 @@ Creating timestamps
 
 @table @kbd
 @orgcmd{C-c .,org-time-stamp}
-Prompt for a date and insert a corresponding timestamp.  When the cursor is
+Prompt for a date and insert a corresponding timestamp.  When point is
 at an existing timestamp in the buffer, the command is used to modify this
 timestamp instead of inserting a new one.  When this command is used twice in
 succession, a time range is inserted.
@@ -5988,7 +5990,7 @@ Creating timestamps
 Normalize timestamp, insert/fix day name if missing or wrong.
 @c
 @orgcmd{C-c <,org-date-from-calendar}
-Insert a timestamp corresponding to the cursor date in the Calendar.
+Insert a timestamp corresponding to point date in the Calendar.
 @c
 @orgcmd{C-c >,org-goto-calendar}
 Access the Emacs calendar for the current date.  If there is a
@@ -6004,11 +6006,11 @@ Creating timestamps
 shift-selection and related modes (@pxref{Conflicts}).
 @c
 @orgcmdkkcc{S-@key{UP},S-@key{DOWN},org-timestamp-up,org-timestamp-down-down}
-Change the item under the cursor in a timestamp.  The cursor can be on a
+Change the item under point in a timestamp.  point can be on a
 year, month, day, hour or minute.  When the timestamp contains a time range
 like @samp{15:30-16:30}, modifying the first time will also shift the second,
 shifting the time block with constant length.  To change the length, modify
-the second time.  Note that if the cursor is in a headline and not at a
+the second time.  Note that if point is in a headline and not at a
 timestamp, these same keys modify the priority of an item.
 (@pxref{Priorities}).  The key bindings also conflict with shift-selection and
 related modes (@pxref{Conflicts}).
@@ -6182,11 +6184,11 @@ Custom time format
 following consequences:
 @itemize @bullet
 @item
-You cannot place the cursor onto a timestamp anymore, only before or
+You cannot place point onto a timestamp anymore, only before or
 after.
 @item
 The @kbd{S-@key{UP}/@key{DOWN}} keys can no longer be used to adjust
-each component of a timestamp.  If the cursor is at the beginning of
+each component of a timestamp.  If point is at the beginning of
 the stamp, @kbd{S-@key{UP}/@key{DOWN}} will change the stamp by one day,
 just like @kbd{S-@key{LEFT}/@key{RIGHT}}.  At the end of the stamp, the
 time will be changed by one minute.
@@ -6585,7 +6587,7 @@ The clock table
 @table @kbd
 @orgcmd{C-c C-x C-r,org-clock-report}
 Insert a dynamic block (@pxref{Dynamic blocks}) containing a clock
-report as an Org mode table into the current file.  When the cursor is
+report as an Org mode table into the current file.  When point is
 at an existing clock table, just update it.  When called with a prefix
 argument, jump to the first clock report in the current document and
 update it.  The clock table always includes also trees with
@@ -6596,7 +6598,7 @@ The clock table
 Update all dynamic blocks (@pxref{Dynamic blocks}).  This is useful if
 you have several clock table blocks in a buffer.
 @orgcmdkxkc{S-@key{LEFT},S-@key{RIGHT},org-clocktable-try-shift}
-Shift the current @code{:block} interval and update the table.  The cursor
+Shift the current @code{:block} interval and update the table.  point
 needs to be in the @code{#+BEGIN: clocktable} line for this command.  If
 @code{:block} is @code{today}, it will be shifted to @code{today-1} etc.
 @end table
@@ -7005,9 +7007,9 @@ Using capture
 @orgcmd{C-c C-w,org-capture-refile}
 Finalize the capture process by refiling (@pxref{Refile and copy}) the note to
 a different place.  Please realize that this is a normal refiling command
-that will be executed---so the cursor position at the moment you run this
+that will be executed---so point position at the moment you run this
 command is important.  If you have inserted a tree with a parent and
-children, first move the cursor back to the parent.  Any prefix argument
+children, first move point back to the parent.  Any prefix argument
 given to this command will be passed on to the @code{org-refile} command.
 
 @orgcmd{C-c C-k,org-capture-kill}
@@ -7017,7 +7019,7 @@ Using capture
 
 You can also call @code{org-capture} in a special way from the agenda, using
 the @kbd{k c} key combination.  With this access, any timestamps inserted by
-the selected capture template will default to the cursor date in the agenda,
+the selected capture template will default to point date in the agenda,
 rather than to the current date.
 
 To find the locations of the last stored capture, use @code{org-capture} with
@@ -7172,7 +7174,7 @@ Template elements
 For non-unique headings, the full path is safer.
 
 @item (file+regexp  "path/to/file" "regexp to find location")
-Use a regular expression to position the cursor.
+Use a regular expression to position point.
 
 @item (file+olp+datetree "path/to/file" [ "Level 1 heading" ....])
 This target@footnote{Org used to offer four different targets for date/week
@@ -7344,7 +7346,7 @@ Template expansion
 @end smallexample
 
 @noindent
-To place the cursor after template expansion use:
+To place point after template expansion use:
 
 @smallexample
 %?          @r{After completing the template, position cursor here.}
@@ -7804,13 +7806,13 @@ Moving subtrees
 @table @kbd
 @orgcmdkskc{C-c C-x C-s,C-c $,org-archive-subtree}
 @vindex org-archive-location
-Archive the subtree starting at the cursor position to the location
+Archive the subtree starting at point position to the location
 given by @code{org-archive-location}.
 @orgkey{C-u C-c C-x C-s}
 Check if any direct children of the current headline could be moved to
 the archive.  To do this, each subtree is checked for open TODO entries.
 If none are found, the command offers to move it to the archive
-location.  If the cursor is @emph{not} on a headline when this command
+location.  If point is @emph{not} on a headline when this command
 is invoked, the level 1 trees will be checked.
 @orgkey{C-u C-u C-c C-x C-s}
 As above, but check subtree for timestamps instead of TODO entries.  The
@@ -8032,7 +8034,7 @@ Agenda files
 @table @kbd
 @orgcmd{C-c C-x <,org-agenda-set-restriction-lock}
 Permanently restrict the agenda to the current subtree.  When with a
-prefix argument, or with the cursor before the first headline in a file,
+prefix argument, or with point before the first headline in a file,
 the agenda scope is set to the entire file.  This restriction remains in
 effect until removed with @kbd{C-c C-x >}, or by typing either @kbd{<}
 or @kbd{>} in the agenda dispatcher.  If there is a window displaying an
@@ -8048,7 +8050,7 @@ Agenda files
 @table @kbd
 @orgcmdtkc{< @r{in the speedbar frame},<,org-speedbar-set-agenda-restriction}
 Permanently restrict the agenda to the item---either an Org file or a subtree
-in such a file---at the cursor in the Speedbar frame.
+in such a file---at point in the Speedbar frame.
 If there is a window displaying an agenda view, the new restriction takes
 effect immediately.
 @orgcmdtkc{> @r{in the speedbar frame},>,org-agenda-remove-restriction-lock}
@@ -8242,7 +8244,7 @@ Weekly/daily agenda
 @end example
 
 You can then go ahead and define anniversaries for a BBDB record.  Basically,
-you need to press @kbd{C-o anniversary @key{RET}} with the cursor in a BBDB
+you need to press @kbd{C-o anniversary @key{RET}} with point in a BBDB
 record and then add the date in the format @code{YYYY-MM-DD} or @code{MM-DD},
 followed by a space and the class of the anniversary (@samp{birthday} or
 @samp{wedding}, or a format string).  If you omit the class, it will default to
@@ -8935,7 +8937,7 @@ Agenda commands
 removing the risk that your agenda and note files may diverge.
 
 Some commands can be executed with mouse clicks on agenda lines.  For
-the other commands, the cursor needs to be in the desired line.
+the other commands, point needs to be in the desired line.
 
 @table @kbd
 @tsubheading{Motion}
@@ -8964,7 +8966,7 @@ Agenda commands
 @c
 @orgcmd{F,org-agenda-follow-mode}
 @vindex org-agenda-start-with-follow-mode
-Toggle Follow mode.  In Follow mode, as you move the cursor through
+Toggle Follow mode.  In Follow mode, as you move point through
 the agenda buffer, the other window always shows the corresponding
 location in the Org file.  The initial setting for this mode in new
 agenda buffers can be set with the variable
@@ -9378,12 +9380,12 @@ Agenda commands
 @c
 @orgcmd{c,org-calendar-goto-agenda}
 When in the calendar, compute and show the Org mode agenda for the
-date at the cursor.
+date at point.
 @c
 @cindex diary entries, creating from agenda
 @orgcmd{i,org-agenda-diary-entry}
 @vindex org-agenda-diary-file
-Insert a new entry into the diary, using the date at the cursor and (for
+Insert a new entry into the diary, using the date at point and (for
 block entries) the date at the mark.  This will add to the Emacs diary
 file@footnote{This file is parsed for the agenda when
 @code{org-agenda-include-diary} is set.}, in a way similar to the @kbd{i}
@@ -9413,7 +9415,7 @@ Agenda commands
 calendars.
 @c
 @orgcmd{H,org-agenda-holidays}
-Show holidays for three months around the cursor date.
+Show holidays for three months around the date at point.
 
 @item M-x org-icalendar-combine-agenda-files @key{RET}
 Export a single iCalendar file containing entries from all agenda files.
@@ -10373,7 +10375,7 @@ Previewing @LaTeX{} fragments
 over the source code.  If there is no fragment at point, process all
 fragments in the current entry (between two headlines).  When called
 with a prefix argument, process the entire subtree.  When called with
-two prefix arguments, or when the cursor is before the first headline,
+two prefix arguments, or when point is before the first headline,
 process the entire buffer.
 @kindex C-c C-c
 @item C-c C-c
@@ -10420,11 +10422,11 @@ CDLaTeX mode
 Environment templates can be inserted with @kbd{C-c @{}.
 @item
 @kindex TAB
-The @key{TAB} key will do template expansion if the cursor is inside a
-@LaTeX{} fragment@footnote{Org mode has a method to test if the cursor is
+The @key{TAB} key will do template expansion if point is inside a
+@LaTeX{} fragment@footnote{Org mode has a method to test if point is
 inside such a fragment, see the documentation of the function
 @code{org-inside-LaTeX-fragment-p}.}.  For example, @key{TAB} will
-expand @code{fr} to @code{\frac@{@}@{@}} and position the cursor
+expand @code{fr} to @code{\frac@{@}@{@}} and position point
 correctly inside the first brace.  Another @key{TAB} will get you into
 the second brace.  Even outside fragments, @key{TAB} will expand
 environment abbreviations at the beginning of a line.  For example, if
@@ -10576,9 +10578,9 @@ The export dispatcher
 @item C-s
 @vindex org-export-initial-scope
 Toggle sub-tree export.  When turned on, Org exports only the sub-tree starting
-from the cursor position at the time the export dispatcher was invoked.  Org
-uses the top heading of this sub-tree as the document's title.  If the cursor
-is not on a heading, Org uses the nearest enclosing header.  If the cursor is
+from point position at the time the export dispatcher was invoked.  Org
+uses the top heading of this sub-tree as the document's title.  If point
+is not on a heading, Org uses the nearest enclosing header.  If point is
 in the document preamble, Org signals an error and aborts export.
 
 To make the sub-tree export the default, customize the variable,
@@ -17360,7 +17362,7 @@ Speed keys
 @section Speed keys
 @cindex speed keys
 
-Single keystrokes can execute custom commands in an Org file when the cursor
+Single keystrokes can execute custom commands in an Org file when point
 is on a headline.  Without the extra burden of a meta or modifier key, Speed
 Keys can speed navigation or execute custom commands.  Besides faster
 navigation, Speed Keys may come in handy on small mobile devices that do not
@@ -17370,7 +17372,7 @@ Speed keys
 @vindex org-use-speed-commands
 By default, Org has Speed Keys disabled.  To activate Speed Keys, set the
 variable @code{org-use-speed-commands} to a non-@code{nil} value.  To trigger
-a Speed Key, the cursor must be at the beginning of an Org headline, before
+a Speed Key, point must be at the beginning of an Org headline, before
 any of the stars.
 
 @vindex org-speed-commands-user
@@ -17513,7 +17515,7 @@ In-buffer settings
 also parses and loads the document during normal exporting process.  Org
 parses the contents of this document as if it was included in the buffer.  It
 can be another Org file.  To visit the file (not a URL), @kbd{C-c '} while
-the cursor is on the line with the file name.
+point is on the line with the file name.
 @item #+STARTUP:
 @cindex @code{#+STARTUP}
 Startup options Org uses when first visiting a file.
@@ -17753,41 +17755,41 @@ The very busy C-c C-c key
 If any highlights shown in the buffer from the creation of a sparse tree, or
 from clock display, remove such highlights.
 @item
-If the cursor is in one of the special @code{#+KEYWORD} lines, scan the
+If point is in one of the special @code{#+KEYWORD} lines, scan the
 buffer for these lines and update the information.  Also reset the Org file
 cache used to temporary store the contents of URLs used as values for
 keywords like @code{#+SETUPFILE}.
 @item
-If the cursor is inside a table, realign the table.  The table realigns even
+If point is inside a table, realign the table.  The table realigns even
 if automatic table editor is turned off.
 @item
-If the cursor is on a @code{#+TBLFM} line, re-apply the formulas to
+If point is on a @code{#+TBLFM} line, re-apply the formulas to
 the entire table.
 @item
 If the current buffer is a capture buffer, close the note and file it.  With
 a prefix argument, also jump to the target location after saving the note.
 @item
-If the cursor is on a @code{<<<target>>>}, update radio targets and
+If point is on a @code{<<<target>>>}, update radio targets and
 corresponding links in this buffer.
 @item
-If the cursor is on a property line or at the start or end of a property
+If point is on a property line or at the start or end of a property
 drawer, offer property commands.
 @item
-If the cursor is at a footnote reference, go to the corresponding
+If point is at a footnote reference, go to the corresponding
 definition, and @emph{vice versa}.
 @item
-If the cursor is on a statistics cookie, update it.
+If point is on a statistics cookie, update it.
 @item
-If the cursor is in a plain list item with a checkbox, toggle the status
+If point is in a plain list item with a checkbox, toggle the status
 of the checkbox.
 @item
-If the cursor is on a numbered item in a plain list, renumber the
+If point is on a numbered item in a plain list, renumber the
 ordered list.
 @item
-If the cursor is on the @code{#+BEGIN} line of a dynamic block, the
+If point is on the @code{#+BEGIN} line of a dynamic block, the
 block is updated.
 @item
-If the cursor is at a timestamp, fix the day name in the timestamp.
+If point is at a timestamp, fix the day name in the timestamp.
 @end itemize
 
 @node Clean view
@@ -18014,7 +18016,7 @@ Cooperation
 Ota tables cannot be edited directly in the Org buffer.
 @table @kbd
 @orgcmd{C-c ',org-edit-special}
-Edit a @file{table.el} table.  Works when the cursor is in a table.el table.
+Edit a @file{table.el} table.  Works when point is in a table.el table.
 @c
 @orgcmd{C-c ~,org-table-create-with-table.el}
 Insert a @file{table.el} table.  If there is already a table at point, this
@@ -18039,7 +18041,7 @@ Conflicts
 variable @code{org-support-shift-select} for customization.  Org mode
 accommodates shift selection by (i) making it available outside of the
 special contexts where special commands apply, and (ii) extending an
-existing active region even if the cursor moves across a special context.
+existing active region even if point moves across a special context.
 
 @item @file{CUA.el} by Kim. F. Storm
 @cindex @file{CUA.el}
@@ -19056,12 +19058,12 @@ Using the mapping API
 @defun org-map-entries func &optional match scope &rest skip
 Call @samp{FUNC} at each headline selected by @code{MATCH} in @code{SCOPE}.
 
-@samp{FUNC} is a function or a Lisp form.  With the cursor positioned at the
+@samp{FUNC} is a function or a Lisp form.  With point positioned at the
 beginning of the headline, call the function without arguments.  Org returns
 an alist of return values of calls to the function.
 
 To avoid preserving point, Org wraps the call to @code{FUNC} in
-save-excursion form.  After evaluation, Org moves the cursor to the end of
+save-excursion form.  After evaluation, Org moves point to the end of
 the line that was just processed.  Search continues from that point forward.
 This may not always work as expected under some conditions, such as if the
 current sub-tree was removed by a previous archiving operation.  In such rare
@@ -19263,7 +19265,7 @@ Pulling from MobileOrg
 @item
 Org generates an agenda view for flagged entries for user intervention to
 clean up.  For notes stored in flagged entries, MobileOrg displays them in
-the echo area when the cursor is on the corresponding agenda item.
+the echo area when point is on the corresponding agenda item.
 
 @table @kbd
 @kindex ?
-- 
2.17.1