mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Merge branch 'master' into scratch/org-mode-merge
This commit is contained in:
Bastien
commit
5ca1888fe6
113 changed files with 4936 additions and 2031 deletions
|
|
@ -405,7 +405,7 @@ variable will cause @samp{text/html} parts to be treated as attachments.
|
|||
@item mm-text-html-renderer
|
||||
@vindex mm-text-html-renderer
|
||||
This selects the function used to render @acronym{HTML}. The predefined
|
||||
renderers are selected by the symbols @code{gnus-article-html},
|
||||
renderers are selected by the symbols @code{shr}, @code{gnus-w3m},
|
||||
@code{w3m}@footnote{See @uref{http://emacs-w3m.namazu.org/} for more
|
||||
information about emacs-w3m}, @code{links}, @code{lynx},
|
||||
@code{w3m-standalone} or @code{html2text}. If @code{nil} use an
|
||||
|
|
|
|||
|
|
@ -72,21 +72,21 @@ local and the remote host, whereas @value{tramp} uses a combination of
|
|||
@command{ssh}/@command{scp}.
|
||||
|
||||
You can find the latest version of this document on the web at
|
||||
@uref{http://www.gnu.org/software/tramp/}.
|
||||
@uref{https://www.gnu.org/software/tramp/}.
|
||||
|
||||
@ifhtml
|
||||
The latest release of @value{tramp} is available for
|
||||
@uref{ftp://ftp.gnu.org/gnu/tramp/, download}, or you may see
|
||||
@uref{https://ftp.gnu.org/gnu/tramp/, download}, or you may see
|
||||
@ref{Obtaining Tramp} for more details, including the Git server
|
||||
details.
|
||||
|
||||
@value{tramp} also has a @uref{http://savannah.gnu.org/projects/tramp/,
|
||||
@value{tramp} also has a @uref{https://savannah.gnu.org/projects/tramp/,
|
||||
Savannah Project Page}.
|
||||
@end ifhtml
|
||||
|
||||
There is a mailing list for @value{tramp}, available at
|
||||
@email{tramp-devel@@gnu.org}, and archived at
|
||||
@uref{http://lists.gnu.org/archive/html/tramp-devel/, the
|
||||
@uref{https://lists.gnu.org/archive/html/tramp-devel/, the
|
||||
@value{tramp} Mail Archive}.
|
||||
|
||||
@page
|
||||
|
|
@ -321,7 +321,7 @@ behind the scenes when you open a file with @value{tramp}.
|
|||
@value{tramp} is included as part of Emacs (since Emacs version 22.1).
|
||||
|
||||
@value{tramp} is also freely packaged for download on the Internet at
|
||||
@uref{ftp://ftp.gnu.org/gnu/tramp/}.
|
||||
@uref{https://ftp.gnu.org/gnu/tramp/}.
|
||||
|
||||
@value{tramp} development versions are available on Git servers.
|
||||
Development versions contain new and incomplete features.
|
||||
|
|
@ -331,7 +331,7 @@ page at the following URL and then clicking on the Git link in the
|
|||
navigation bar at the top.
|
||||
|
||||
@noindent
|
||||
@uref{http://savannah.gnu.org/projects/tramp/}
|
||||
@uref{https://savannah.gnu.org/projects/tramp/}
|
||||
|
||||
@noindent
|
||||
Another way is to follow the terminal session below:
|
||||
|
|
@ -349,7 +349,7 @@ From behind a firewall:
|
|||
@example
|
||||
@group
|
||||
] @strong{git config --global http.proxy http://user:pwd@@proxy.server.com:8080}
|
||||
] @strong{git clone http://git.savannah.gnu.org/r/tramp.git}
|
||||
] @strong{git clone https://git.savannah.gnu.org/r/tramp.git}
|
||||
@end group
|
||||
@end example
|
||||
|
||||
|
|
@ -917,7 +917,7 @@ numbers are not applicable to Android devices connected through USB@.
|
|||
@cindex dbus
|
||||
|
||||
GVFS is the virtual file system for the Gnome Desktop,
|
||||
@uref{http://en.wikipedia.org/wiki/GVFS}. Remote files on GVFS are
|
||||
@uref{https://en.wikipedia.org/wiki/GVFS}. Remote files on GVFS are
|
||||
mounted locally through FUSE and @value{tramp} uses this locally
|
||||
mounted directory internally.
|
||||
|
||||
|
|
@ -1896,12 +1896,16 @@ where @samp{192.168.0.1} is the remote host IP address
|
|||
@value{tramp} uses the @option{adb} method to access Android devices.
|
||||
Android devices provide a restricted shell access through an USB
|
||||
connection. The local host must have the @command{adb} program
|
||||
installed.
|
||||
installed. Usually, it is sufficient to open the file
|
||||
@file{@trampfn{adb,,/}}. Then you can navigate in the filesystem via
|
||||
@code{dired}.
|
||||
|
||||
Applications such as @code{SSHDroid} that run @command{sshd} process
|
||||
on the Android device can accept any @option{ssh}-based methods
|
||||
provided these settings are adjusted:
|
||||
Alternatively, applications such as @code{SSHDroid} that run
|
||||
@command{sshd} process on the Android device can accept any
|
||||
@option{ssh}-based methods provided these settings are adjusted:
|
||||
|
||||
@itemize
|
||||
@item
|
||||
@command{sh} must be specified for remote shell since Android devices
|
||||
do not provide @command{/bin/sh}. @command{sh} will then invoke
|
||||
whatever shell is installed on the device with this setting:
|
||||
|
|
@ -1917,6 +1921,7 @@ whatever shell is installed on the device with this setting:
|
|||
where @samp{192.168.0.26} is the Android device's IP address.
|
||||
(@pxref{Predefined connection information}).
|
||||
|
||||
@item
|
||||
@value{tramp} requires preserving @env{PATH} environment variable from
|
||||
user settings. Android devices prefer @file{/system/xbin} path over
|
||||
@file{/system/bin}. Both of these are set as follows:
|
||||
|
|
@ -1928,7 +1933,7 @@ user settings. Android devices prefer @file{/system/xbin} path over
|
|||
@end group
|
||||
@end lisp
|
||||
|
||||
@noindent
|
||||
@item
|
||||
When the Android device is not @samp{rooted}, specify a writable
|
||||
directory for temporary files:
|
||||
|
||||
|
|
@ -1936,7 +1941,7 @@ directory for temporary files:
|
|||
(add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME")
|
||||
@end lisp
|
||||
|
||||
@noindent
|
||||
@item
|
||||
Open a remote connection with the command @kbd{C-x C-f
|
||||
@trampfn{ssh,192.168.0.26#2222,}}, where @command{sshd} is listening
|
||||
on port @samp{2222}.
|
||||
|
|
@ -1967,6 +1972,7 @@ the previous example, fix the connection properties as follows:
|
|||
@noindent
|
||||
Open a remote connection with a more concise command @kbd{C-x C-f
|
||||
@trampfn{ssh,android,}}.
|
||||
@end itemize
|
||||
|
||||
|
||||
@node Auto-save and Backup
|
||||
|
|
@ -2083,7 +2089,7 @@ Pseudo-terminal will not be allocated because stdin is not a terminal.
|
|||
|
||||
Some older versions of Cygwin's @command{ssh} work with the
|
||||
@option{sshx} access method. Consult Cygwin's FAQ at
|
||||
@uref{http://cygwin.com/faq/} for details.
|
||||
@uref{https://cygwin.com/faq/} for details.
|
||||
|
||||
@cindex Cygwin and fakecygpty
|
||||
@cindex fakecygpty and Cygwin
|
||||
|
|
@ -2797,7 +2803,7 @@ this address go to all the subscribers. This is @emph{not} the
|
|||
address to send subscription requests to.
|
||||
|
||||
To subscribe to the mailing list, visit:
|
||||
@uref{http://lists.gnu.org/mailman/listinfo/tramp-devel/, the
|
||||
@uref{https://lists.gnu.org/mailman/listinfo/tramp-devel/, the
|
||||
@value{tramp} Mail Subscription Page}.
|
||||
|
||||
@ifset installchapter
|
||||
|
|
@ -2849,13 +2855,13 @@ Where is the latest @value{tramp}?
|
|||
@value{tramp} is available at the GNU URL:
|
||||
|
||||
@noindent
|
||||
@uref{ftp://ftp.gnu.org/gnu/tramp/}
|
||||
@uref{https://ftp.gnu.org/gnu/tramp/}
|
||||
|
||||
@noindent
|
||||
@value{tramp}'s GNU project page is located here:
|
||||
|
||||
@noindent
|
||||
@uref{http://savannah.gnu.org/projects/tramp/}
|
||||
@uref{https://savannah.gnu.org/projects/tramp/}
|
||||
|
||||
|
||||
@item
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
@c In the Tramp GIT, the version number is auto-frobbed from
|
||||
@c configure.ac, so you should edit that file and run
|
||||
@c "autoconf && ./configure" to change the version number.
|
||||
@set trampver 2.3.2-pre
|
||||
@set trampver 2.3.2
|
||||
|
||||
@c Other flags from configuration
|
||||
@set instprefix /usr/local
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue