diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-08-03 09:50:35 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-08-03 09:50:35 +0200 |
| commit | 6edb499a5eb7c5f22ceb3b8ea0e878d749c2a778 (patch) | |
| tree | eec524e2a557b2727e14a63f3828f5476a42d311 | |
| parent | bb3e281236bd39c2fbd0702c4f3e07dfaec7afe2 (diff) | |
| parent | f23d45603918721ec80bfcef883d22fab15cb9f1 (diff) | |
| download | emacs-6edb499a5eb7c5f22ceb3b8ea0e878d749c2a778.tar.gz | |
Merge from origin/emacs-28
f23d456039 * lisp/term.el: Doc fix; don't mention rlogin.
f522d2d90b ; * admin/make-tarball.txt: Minor tweaks.
| -rw-r--r-- | admin/make-tarball.txt | 14 | ||||
| -rw-r--r-- | lisp/term.el | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 6990f27bfa0..f5b9d56c4d4 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -183,12 +183,12 @@ General steps (for each step, check for possible errors): yourself, find it at <https://alpha.gnu.org/gnu/emacs/pretest>. Releases are of course at <https://ftp.gnu.org/pub/gnu/emacs/>. - ./admin/diff-tar-files emacs-OLD.tar.gz emacs-NEW.tar.gz + ./admin/diff-tar-files emacs-OLD.tar emacs-NEW.tar Alternatively: - tar tJf emacs-OLD.tar.xz | sed -e 's,^[^/]*,,' | sort > old_tmp - tar tJf emacs-NEW.tar.xz | sed -e 's,^[^/]*,,' | sort > new_tmp + tar tf emacs-OLD.tar | sed -e 's,^[^/]*,,' | sort > old_tmp + tar tf emacs-NEW.tar | sed -e 's,^[^/]*,,' | sort > new_tmp diff -u old_tmp new_tmp If this is the first pretest of a major release, just comparing @@ -203,7 +203,7 @@ General steps (for each step, check for possible errors): The output of this command might be easier to compare to the tarball than the one you get from find. -7. tar -xf emacs-NEW.tar; cd emacs-NEW +7. tar xf emacs-NEW.tar; cd emacs-NEW ./configure --prefix=/tmp/emacs && make check && make install Use 'script' or M-x compile to save the compilation log in @@ -288,7 +288,7 @@ General steps (for each step, check for possible errors): https://ftp.gnu.org/gnu/emacs/ for a release. Download them and check the signatures and SHA1/SHA256 checksums. - Check they build. + Check they build (./configure --with-native-compilation). 11. Send an announcement to: emacs-devel, and bcc: info-gnu-emacs@gnu.org. For a pretest, also bcc: platform-testers@gnu.org. @@ -309,8 +309,8 @@ General steps (for each step, check for possible errors): sha1sum emacs-NEW.tar.xz sha256sum emacs-NEW.tar.xz - You can optionally sign the announcement email, probably using the - same PGP key that you used for signing the tarball. + You can optionally sign the announcement email, preferably using + the same PGP key that you used for signing the tarball. (Use e.g. `M-x mml-secure-message-sign' in `message-mode' to sign an email.) diff --git a/lisp/term.el b/lisp/term.el index a28d8c5d761..11c2d2aaa16 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -78,7 +78,7 @@ ;; directory/username/host tracking: the only drawback is that you will ;; have to modify your shell start-up script. It's worth it, believe me :). ;; -;; When you rlogin/su/telnet and the account you access has a modified +;; When you ssh/sudo/su and the account you access has a modified ;; startup script, you will be able to access the remote files as usual ;; with C-x C-f, if it's needed you will have to enter a password, ;; otherwise the file should get loaded straight away. |