branch: main
commit bdbbbf09de9a574c994aa67d00b1a697dbc294d1
Merge: ccfc9b7083 150646f4f5
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>
Merge branch 'main' of git.sv.gnu.org:/srv/git/elpa/gnu
---
.gitignore | 3 ++-
html/index.html | 6 +++---
html/jslicense.html | 2 +-
html/layout.css | 2 +-
html/nongnu.html | 8 ++++----
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index c11ca194fb..6142edd017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,12 +10,13 @@ core
# Generated during deployment
/.pkg-descs.mk
+/doc/
/packages/
/other-packages
/archive/
/archive-devel/
GNUmakefile
-manifest.scm
+/manifest.scm
/admin
# Testing file
diff --git a/html/index.html b/html/index.html
index 18a4d7815f..98bc6d6d4e 100644
--- a/html/index.html
+++ b/html/index.html
@@ -39,8 +39,8 @@
<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>
+ <a href="https://cgit.git.savannah.gnu.org/cgit/elpa/gnu.git";>GNU
ELPA repository</a>
+ (see the <a href="https://savannah.gnu.org/git/?group=elpa";>ELPA
project page</a>
for clone instructions).
</p>
@@ -49,7 +49,7 @@
<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>.
+ <a
href="https://cgit.git.savannah.gnu.org/cgit/elpa/gnu.git/plain/README";>README</a>.
</li>
<li>
To report a bug, use the <code>M-x report-emacs-bug</code>
diff --git a/html/jslicense.html b/html/jslicense.html
index be43671d19..e73c4614cd 100644
--- a/html/jslicense.html
+++ b/html/jslicense.html
@@ -42,7 +42,7 @@
<footer>
<div class="container">
- <p>Copyright 2021-2022 <a href="https://fsf.org";>Free Software
Foundation</a>, Inc.</p>
+ <p>Copyright 2021-2026 <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
diff --git a/html/layout.css b/html/layout.css
index ac10ef9b99..88969f2ff9 100644
--- a/html/layout.css
+++ b/html/layout.css
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010-2022, 2024 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2026, 2024, 2026 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/html/nongnu.html b/html/nongnu.html
index 40dd07768e..0338846f61 100644
--- a/html/nongnu.html
+++ b/html/nongnu.html
@@ -34,8 +34,8 @@
<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>
+ <a href="https://git.savannah.gnu.org/cgit/nongnu/nongnu.git";>NonGNU
ELPA repository</a>
+ (see the <a href="https://savannah.gnu.org/git/?group=elpa";>ELPA
project page</a>
for clone instructions).
</p>
@@ -44,7 +44,7 @@
<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>.
+ <a
href="https://git.savannah.gnu.org/cgit/elpa/nongnu.git/plain/README.org";>README</a>.
</li>
<!-- <li>
To report a bug, use the <code>M-x report-emacs-bug</code>
@@ -65,7 +65,7 @@
<footer>
<div class="container">
- <p>Copyright 2016-2022 <a href="https://fsf.org";>Free Software
Foundation</a>, Inc.</p>
+ <p>Copyright 2016-2026 <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
