Eli Zaretskii writes:
>> From: Nicolas Goaziou
>> Cc: r...@gnu.org, 32...@debbugs.gnu.org, n...@flqt.fr, les...@watter.net,
>> right...@gmail.com, kaushal.m...@gmail.com, Rasmus
>> Date: Sat, 29 Sep 2018 20:33:35 +0200
>>
>> > Thank you. Can we have this change on the ermacs-26 branch of Emacs,
>> > please?
>>
>> I don't have access to the Emacs repository.
>>
>> You can either give me write access there, or I can send you the Texinfo
>> @node contents, or someone with write access could do it for us. I'm
>> Cc'ing Rasmus for the last option.
>
> I could install a patch that you produced from the Org repository's
> appropriate branch.
>
> Thanks.
I've tried to combine these org-manual.org changes into a patch for
org.texi. This patch should apply on the emacs-26 branch.
-- >8 --
Subject: [PATCH] org.texi: Rewrite Org Mobile section
* doc/misc/org.texi (Org Mobile): Rewrite from "MobileOrg" section.
Remove all references to non-free software. Move into
"Miscellaneous".
This reflects Nicolas Goaziou's changes from Org's b929e5d77,
46b49ab57, and 3f826b9f7.
---
doc/misc/org.texi | 293 --
1 file changed, 152 insertions(+), 141 deletions(-)
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 60647e65e8..873ce4d2cd 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -325,7 +325,6 @@ Top
* Working with source code::Export, evaluate, and tangle code blocks
* Miscellaneous:: All the rest which did not fit elsewhere
* Hacking:: How to hack your way around
-* MobileOrg:: Viewing and capture on a mobile device
* History and acknowledgments:: How Org came into being
* GNU Free Documentation License:: The license for this documentation.
* Main Index:: An index of Org's concepts and features
@@ -760,12 +759,19 @@ Top
* TTY keys::Using Org on a tty
* Interaction:: With other Emacs packages
* org-crypt:: Encrypting Org files
+* Org Mobile:: Viewing and capture on a mobile device
Interaction with other packages
* Cooperation:: Packages Org cooperates with
* Conflicts:: Packages that lead to conflicts
+Org Mobile
+
+* Setting up the staging area:: For the mobile device
+* Pushing to the mobile application:: Uploading Org files and agendas
+* Pulling from the mobile application:: Integrating captured and flagged items
+
Hacking
* Hooks:: How to reach into Org's internals
@@ -788,12 +794,6 @@ Top
* Translator functions::Copy and modify
* Radio lists:: Sending and receiving lists
-MobileOrg
-
-* Setting up the staging area:: For the mobile device
-* Pushing to MobileOrg::Uploading Org files and agendas
-* Pulling from MobileOrg:: Integrating captured and flagged items
-
@end detailmenu
@end menu
@@ -17253,6 +17253,7 @@ Miscellaneous
* TTY keys::Using Org on a tty
* Interaction:: With other Emacs packages
* org-crypt:: Encrypting Org files
+* Org Mobile:: Viewing and capture on a mobile device
@end menu
@@ -18187,6 +18188,150 @@ org-crypt
Excluding the crypt tag from inheritance prevents encrypting previously
encrypted text.
+@node Org Mobile
+@section Org Mobile
+
+@cindex smartphone
+
+Org Mobile is a protocol for synchronizing Org files between Emacs and
+other applications, e.g., on mobile devices. It enables offline-views
+and capture support for an Org mode system that is rooted on a ``real''
+computer. The external application can also record changes to
+existing entries.
+
+This appendix describes Org's support for agenda view formats
+compatible with Org Mobile. It also describes synchronizing changes,
+such as to notes, between the mobile application and the computer.
+
+To change tags and TODO states in the mobile application, first
+customize the variables @code{org-todo-keywords} and @code{org-tag-alist}.
+These should cover all the important tags and TODO keywords, even if
+Org files use only some of them. Though the mobile application is
+expected to support in-buffer settings, it is required to understand
+TODO states @emph{sets} (see @ref{Per-file keywords}) and
+@emph{mutually exclusive} tags (see @ref{Setting tags}) only for those set in
+these variables.
+
+@menu
+* Setting up the staging area:: For the mobile device
+* Pushing to the mobile application:: Uploading Org files and agendas
+* Pulling from the mobile application:: Integrating captured and flagged items
+@end menu
+
+@node Setting up the staging area
+@subsection Setting up the staging area
+
+@vindex org-mobile-directory
+The mobile application needs access to a file directory on
+a server@footnote{For a server to host files, consider using a WebDAV server,
+such as @uref{https://nextcloud.com, Nextcloud}.
