branch: main
commit 9d3f52e57de646dab2f3f0d7de758ee5d61e4276
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>

    html/*.html: Change license to CC BY-SA
    
    * html/index.html: Remove comment about Emacs-24.
    Update recommendation about `package-initialize`.
    Change license to CC BY-SA.  Reindent.
    
    * html/layout.css (small): Give it the usual appearence.
    
    * html/nongnu.html: Change license to CC BY-SA.  Reindent.
---
 html/index.html  | 145 ++++++++++++++++++++++++++++---------------------------
 html/layout.css  |   4 +-
 html/nongnu.html | 133 +++++++++++++++++++++++++-------------------------
 3 files changed, 142 insertions(+), 140 deletions(-)

diff --git a/html/index.html b/html/index.html
index afde7e52a3..b25e6d374b 100644
--- a/html/index.html
+++ b/html/index.html
@@ -1,85 +1,86 @@
 <!doctype html>
 <html lang="en" xml:lang="en">
-    <head>
-        <title>GNU Emacs Lisp Package Archive</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="shortcut icon" type="image/png" href="favicon.png">
-        <link rel="stylesheet" href="//code.cdn.mozilla.net/fonts/fira.css">
-        <link rel="stylesheet" type="text/css" href="layout.css">
-        <meta name="viewport" 
content="initial-scale=1.0,maximum-scale=1.0,width=device-width" />
-    </head>
+  <head>
+    <title>GNU Emacs Lisp Package Archive</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link rel="shortcut icon" type="image/png" href="favicon.png" />
+    <link rel="stylesheet" href="//code.cdn.mozilla.net/fonts/fira.css" />
+    <link rel="stylesheet" type="text/css" href="layout.css" />
+    <meta name="viewport" 
content="initial-scale=1.0,maximum-scale=1.0,width=device-width" />
+  </head>
 
-    <body>
-        <div class="wrapper">
-            <div class="header">
-                <div class="container">
-                    <img src="images/elpa.png" alt="ELPA"/>
-                    <h1>GNU Emacs Lisp Package Archive</h1>
+  <body>
+    <div class="wrapper">
+      <div class="header">
+        <div class="container">
+          <img src="images/elpa.png" alt="ELPA"/>
+          <h1>GNU Emacs Lisp Package Archive</h1>
 
-                    <p>
-                        The default package repository for 
-                        <a href="https://www.gnu.org/software/emacs/";>GNU 
Emacs</a>.
-                    </p>                
-                </div>
-            </div>
+          <p>
+            The default package repository for
+            <a href="https://www.gnu.org/software/emacs/";>GNU Emacs</a>.
+          </p>
+        </div>
+      </div>
 
-            <div class="container">
-                <p>
-                    To use it, type <tt>M-x list-packages</tt> in Emacs.
-                    (This requires Emacs version 24.1 or higher.) <br/>
-                    
-                    Since you'll probably want to use your installed packages, 
it's also
-                    <a 
href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Installation.html#Package-Installation";>recommended</a>
-                    that you add <code>(package-initialize)</code> somewhere
-                    in your <code>~/.emacs</code> file.
-                </p>
+      <div class="container">
+        <p>
+          To use it, type <code>M-x list-packages</code> in Emacs. <br/>
+        </p>
+        <p><small>
+          If you use in Emacs&lt;27, you
+          may want to add something like <code>(unless (fboundp
+          'package-activate-all) (package-initialize))</code> somewhere
+          in your init file (e.g. <code>~/.emacs</code>) to make sure your
+          installed packages are activated at startup.
+        </small></p>
 
-                <p class="centered"><a class="button" href="packages/">Browse 
the packages</a></p>
+        <p class="centered"><a class="button" href="packages/">Browse the 
packages</a></p>
 
-                <p>
-                    Packages are managed through the
-                    <a 
href="https://git.savannah.gnu.org/cgit/emacs/elpa.git";>GNU ELPA repository</a>
-                    (see the <a 
href="https://savannah.gnu.org/projects/emacs";>GNU Emacs project page</a>
-                    for clone instructions).
-                </p>
+        <p>
+          Packages are managed through the
+          <a href="https://git.savannah.gnu.org/cgit/emacs/elpa.git";>GNU ELPA 
repository</a>
+          (see the <a href="https://savannah.gnu.org/projects/emacs";>GNU Emacs 
project page</a>
+          for clone instructions).
+        </p>
 
-                <h3>Contact</h3>
+        <h3>Contact</h3>
 
-                <ul>
-                  <li>
-                    To contribute a new package, refer to the
-                    <a 
href="https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/README";>README</a>.
-                  </li>
-                  <li>
-                    To report a bug, use the <code>M-x report-emacs-bug</code>
-                    command in Emacs.<br />For more information on reporting 
bugs, see
-                    <a 
href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html";>the
-                    Emacs Manual</a>.
-                  </li>
-                  <li>
-                    If you need help, you could try the <a 
href="https://lists.gnu.org/mailman/listinfo/help-gnu-emacs";>help-gnu-emacs 
mailing list</a>.
-                  </li>
-                  <li>
-                    For general inquiries, please contact the <a 
href="https://lists.gnu.org/mailman/listinfo/emacs-devel";>emacs-devel mailing 
list</a>.
-                  </li>
-                </ul>
+        <ul>
+          <li>
+            To contribute a new package, refer to the
+            <a 
href="https://git.savannah.gnu.org/cgit/emacs/elpa.git/plain/README";>README</a>.
+          </li>
+          <li>
+            To report a bug, use the <code>M-x report-emacs-bug</code>
+            command in Emacs.<br />For more information on reporting bugs, see
+            <a 
href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html";>the
+              Emacs Manual</a>.
+          </li>
+          <li>
+            If you need help, you could try the <a 
href="https://lists.gnu.org/mailman/listinfo/help-gnu-emacs";>help-gnu-emacs 
mailing list</a>.
+          </li>
+          <li>
+            For general inquiries, please contact the <a 
href="https://lists.gnu.org/mailman/listinfo/emacs-devel";>emacs-devel mailing 
list</a>.
+          </li>
+        </ul>
 
-                <!-- <p> You can grab the <a 
href="emacs-packages-latest.tgz">latest package snapshot</a>. -->            
-            </div>
-            <div class="push"></div>
-        </div>
+        <!-- <p> You can grab the <a href="emacs-packages-latest.tgz">latest 
package snapshot</a>. -->
+      </div>
+      <div class="push"></div>
+    </div>
 
-        <div class="footer">
-            <div class="container">
-                <p>Copyright 2016-2022 <a href="https://fsf.org";>Free Software 
Foundation</a>, Inc.</p>
-                <p>Design provided by <a 
href="https://nicolas.petton.fr";>Nicolas Petton</a></p>
-                <p>
-                    This website is licensed under the
-                    <a 
href="https://creativecommons.org/licenses/by-nd/4.0/";>CC BY-ND 4.0</a>
-                    International License.
-                </p>
-            </div>
-        </div>
+    <div class="footer">
+      <div class="container">
+        <p>Copyright 2016-2022 <a href="https://fsf.org";>Free Software 
Foundation</a>, Inc.</p>
+        <p>Design provided by <a href="https://nicolas.petton.fr";>Nicolas 
Petton</a></p>
+        <p>
+          This website is licensed under the
+          <a href="https://creativecommons.org/licenses/by-sa/4.0/";>CC BY-SA 
4.0</a>
+          International License.
+        </p>
+      </div>
+    </div>
 
-    </body>
+  </body>
 </html>
diff --git a/html/layout.css b/html/layout.css
index ba046883fb..4f5c50d393 100644
--- a/html/layout.css
+++ b/html/layout.css
@@ -106,7 +106,9 @@ a {
   color: #c73a6c;
   text-decoration: none;
 }
-
+small {
+  font-size: smaller;
+}
 a:hover {
   color: #973066;
   text-decoration: underline;
diff --git a/html/nongnu.html b/html/nongnu.html
index bfe2a4af43..b0a2de6e93 100644
--- a/html/nongnu.html
+++ b/html/nongnu.html
@@ -1,80 +1,79 @@
 <!doctype html>
 <html lang="en" xml:lang="en">
-    <head>
-        <title>NonGNU Emacs Lisp Package Archive</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="shortcut icon" type="image/png" href="favicon.png">
-        <link rel="stylesheet" href="//code.cdn.mozilla.net/fonts/fira.css">
-        <link rel="stylesheet" type="text/css" href="layout.css">
-        <meta name="viewport" 
content="initial-scale=1.0,maximum-scale=1.0,width=device-width" />
-    </head>
+  <head>
+    <title>NonGNU Emacs Lisp Package Archive</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link rel="shortcut icon" type="image/png" href="favicon.png" />
+    <link rel="stylesheet" href="//code.cdn.mozilla.net/fonts/fira.css" />
+    <link rel="stylesheet" type="text/css" href="layout.css" />
+    <meta name="viewport" 
content="initial-scale=1.0,maximum-scale=1.0,width=device-width" />
+  </head>
 
-    <body>
-        <div class="wrapper">
-            <div class="header">
-                <div class="container">
-                    <img src="images/elpa.png" alt="ELPA"/>
-                    <h1>NonGNU Emacs Lisp Package Archive</h1>
+  <body>
+    <div class="wrapper">
+      <div class="header">
+        <div class="container">
+          <img src="images/elpa.png" alt="ELPA"/>
+          <h1>NonGNU Emacs Lisp Package Archive</h1>
 
-                    <p>
-                        A package repository for 
-                        <a href="https://www.gnu.org/software/emacs/";>GNU 
Emacs</a>.
-                    </p>
-                </div>
-            </div>
+          <p>
+            A package repository for
+            <a href="https://www.gnu.org/software/emacs/";>GNU Emacs</a>.
+          </p>
+        </div>
+      </div>
 
-            <div class="container">
-                <p> To use it, type <tt>M-x list-packages</tt> in Emacs. </p>
+      <div class="container">
+        <p> To use it, type <code>M-x list-packages</code> in Emacs. </p>
 
-                <p class="centered"><a class="button" href="nongnu/">Browse 
the packages</a></p>
+        <p class="centered"><a class="button" href="nongnu/">Browse the 
packages</a></p>
 
-                <p>To use it in Emacs&lt;28, you need to add something like 
the following to your init file:
-               <pre>(with-eval-after-load 'package
-  (add-to-list 'package-archives '("nongnu" . 
"https://elpa.nongnu.org/nongnu/";)))</pre>
-               </p>
+        <p>To use it in Emacs&lt;28, you need to add something like the 
following to your init file:</p>
+       <pre><code>(with-eval-after-load 'package
+  (add-to-list 'package-archives '("nongnu" . 
"https://elpa.nongnu.org/nongnu/";)))</code></pre>
 
-                <p>
-                    Packages are managed through the
-                    <a 
href="https://git.savannah.gnu.org/cgit/emacs/nongnu.git";>NonGNU ELPA 
repository</a>
-                    (see the <a 
href="https://savannah.gnu.org/projects/emacs";>GNU Emacs project page</a>
-                    for clone instructions).
-                </p>
+        <p>
+          Packages are managed through the
+          <a href="https://git.savannah.gnu.org/cgit/emacs/nongnu.git";>NonGNU 
ELPA repository</a>
+          (see the <a href="https://savannah.gnu.org/projects/emacs";>GNU Emacs 
project page</a>
+          for clone instructions).
+        </p>
 
-                <h3>Contact</h3>
+        <h3>Contact</h3>
 
-                <ul>
-                  <li>
-                    To contribute a new package refer to the
-                    <a 
href="https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/README.org";>README</a>.
-                  </li>
-                  <!-- <li>
-                    To report a bug, use the <code>M-x report-emacs-bug</code>
-                    command in Emacs.<br />For more information on reporting 
bugs, see
-                    <a 
href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html";>the
-                    Emacs Manual</a>.
-                  </li> -->
-                  <li>
-                    If you need help, you could try the <a 
href="https://lists.gnu.org/mailman/listinfo/help-gnu-emacs";>help-gnu-emacs 
mailing list</a>.
-                  </li>
-                  <li>
-                    For general inquiries, please contact <a 
href="https://lists.gnu.org/mailman/listinfo/emacs-devel";>emacs-devel mailing 
list</a>.
-                  </li>
-                </ul>
-            </div>
-            <div class="push"></div>
-        </div>
+        <ul>
+          <li>
+            To contribute a new package refer to the
+            <a 
href="https://git.savannah.gnu.org/cgit/emacs/nongnu.git/plain/README.org";>README</a>.
+          </li>
+          <!-- <li>
+               To report a bug, use the <code>M-x report-emacs-bug</code>
+               command in Emacs.<br />For more information on reporting bugs, 
see
+               <a 
href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html";>the
+                 Emacs Manual</a>.
+          </li> -->
+          <li>
+            If you need help, you could try the <a 
href="https://lists.gnu.org/mailman/listinfo/help-gnu-emacs";>help-gnu-emacs 
mailing list</a>.
+          </li>
+          <li>
+            For general inquiries, please contact <a 
href="https://lists.gnu.org/mailman/listinfo/emacs-devel";>emacs-devel mailing 
list</a>.
+          </li>
+        </ul>
+      </div>
+      <div class="push"></div>
+    </div>
 
-        <div class="footer">
-            <div class="container">
-                <p>Copyright 2016-2022 <a href="https://fsf.org";>Free Software 
Foundation</a>, Inc.</p>
-                <p>Design provided by <a 
href="https://nicolas.petton.fr";>Nicolas Petton</a></p>
-                <p>
-                    This website is licensed under the
-                    <a 
href="https://creativecommons.org/licenses/by-nd/4.0/";>CC BY-ND 4.0</a>
-                    International License.
-                </p>
-            </div>
-        </div>
+    <div class="footer">
+      <div class="container">
+        <p>Copyright 2016-2022 <a href="https://fsf.org";>Free Software 
Foundation</a>, Inc.</p>
+        <p>Design provided by <a href="https://nicolas.petton.fr";>Nicolas 
Petton</a></p>
+        <p>
+          This website is licensed under the
+          <a href="https://creativecommons.org/licenses/by-sa/4.0/";>CC BY-SA 
4.0</a>
+          International License.
+        </p>
+      </div>
+    </div>
 
-    </body>
+  </body>
 </html>

Reply via email to