bug#48023: download.html has better instructions for non-free systems

[Stefan Kangas]

tags 48023 + fixed
close 48023
thanks

Richard Stallman <rms@gnu.org> writes:

>   >     If your GNU/Linux distribution includes a graphical package manager,
>   >     this is often the easiest way to install Emacs.  Please refer to the
>   >     documentation for your distribution for full instructions on how to
>   >     install a package.
>
>   >     You might prefer installing from the command-line.  Here are some of
>   >     the commands that various GNU/Linux distributions use to install a
>   >     package named 'emacs'.
>
>   >     [commands here]
>
> LGTM.

Thanks, I've installed the below change.

--- download.html.~1.23.~       2021-04-28 11:47:24.726860127 +0200
+++ download.html       2021-04-28 11:52:37.696388947 +0200
@@ -46,7 +46,7 @@
                     <div class="logo">
                         <a href="index.html"><img
src="images/emacs.png" alt="Emacs"/></a>
                         <h1>GNU Emacs</h1>
-                        <h2>Download & installation</h2>
+                        <h2>Download & Install</h2>
                     </div>
                 </div>
             </div>
@@ -59,13 +59,6 @@
                        FreeBSD, NetBSD, OpenBSD, MacOS, MS Windows and Solaris.
                     </p>

-                    <h2 id="gnu-linux">GNU/Linux</h2>
-
-                    <p>Most GNU/Linux distributions provide GNU
-                        Emacs in their repositories, which is the recommended
-                        way to install Emacs unless you always want to use the
-                        latest release.</p>
-
                     <p>You can download GNU Emacs releases from a
                         <a
href="http://ftpmirror.gnu.org/emacs/";>nearby GNU mirror</a>;
                         or if automatic redirection does not work see
the list of
@@ -73,11 +66,45 @@
                         the <a
href="http://ftp.gnu.org/gnu/emacs";>main GNU ftp</a> server.
                     </p>

-
                     <p>GNU Emacs source code and development is hosted on
                         <a
href="http://savannah.gnu.org/projects/emacs/";>savannah.gnu.org</a>.
                     </p>

+                    <h2 id="gnu-linux">GNU/Linux</h2>
+
+                    <p>Most GNU/Linux distributions provide GNU
+                        Emacs in their repositories, which is the recommended
+                        way to install Emacs unless you always want to use the
+                        latest release.</p>
+
+                    <p>If your GNU/Linux distribution includes a
graphical package manager,
+                      this is often the easiest way to install Emacs.
Please refer to the
+                      documentation for your distribution for full
instructions on how to
+                      install a package.
+                    </p>
+
+                    <p>You might prefer installing from the command-line.  Here
+                      are some of the commands that various GNU/Linux
+                      distributions use to install a package named 'emacs'.
+                    </p>
+
+                    <!-- NOTE: We want to be restrictive with adding more
+                    commands to this list, as it is a maintenance burden.  -->
+
+                    <pre>guix package -i emacs</pre>
+
+                    <pre>sudo apt-get install emacs</pre>
+
+                    <pre>sudo pacman -S emacs</pre>
+
+                    <pre>sudo dnf install emacs</pre>
+
+                    <pre>sudo zypper install emacs</pre>
+
+                    <p>On some systems, the package name must include the Emacs
+                      version number, such as  'emacs-27.1', instead
of  'emacs'.
+                      </p>
+
                    <h2 id="bsd">BSDs</h2>

                     <p>The BSDs provide GNU Emacs in their
repositories, which is the recommended