6 files changed, 24 insertions, 18 deletions
diff --git a/doc/geiser.texi b/doc/geiser.texi
index 29166d8..ea27717 100644
--- a/doc/geiser.texi
+++ b/doc/geiser.texi
@@ -8,7 +8,7 @@
 @copying
 This manual documents Geiser, an Emacs environment to hack in Scheme.
 
-Copyright @copyright{} 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2020, 2021  Jose Antonio Ortega Ruiz
+Copyright @copyright{} 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2020, 2021, 2026  Jose Antonio Ortega Ruiz
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -103,8 +103,8 @@ Cheat sheet
 @html
 <br/>
 <div class="navigation" align="right">
-<a class="navlink" href="https://gitlab.com/groups/emacs-geiser/-/issues">Bugs</a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a class="navlink" href="https://gitlab.com/emacs-geiser">Source</a>&nbsp;&nbsp;&nbsp;&nbsp;
+<a class="navlink" href="https://codeberg.org/org/geiser/issues">Bugs</a>&nbsp;&nbsp;&nbsp;&nbsp;
+<a class="navlink" href="https://codeberg.org/geiser">Source</a>&nbsp;&nbsp;&nbsp;&nbsp;
 <a class="navlink" href="http://lists.nongnu.org/mailman/listinfo/geiser-users">Mailing list</a>&nbsp;
 </div>
 @end html
diff --git a/doc/install.texi b/doc/install.texi
index b6eb030..0675af9 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -19,16 +19,16 @@ recent Emacs snapshot) and at least one of the supported Schemes,
 namely:
 
 @itemize @bullet
+@gsupimpl{GNU Kawa, http://www.gnu.org/software/kawa/index.html, 3.1, kawa}
+@gsupimpl{Gauche, http://practical-scheme.net/gauche/, 0.9.6, gauche}
+@gsupimpl{Stklos, https://stklos.net/, 1.50, stklos}
 @supimpl{Chez, http://www.scheme.com, 9.4,chez}
 @supimpl{Chibi, http://synthcode.com/scheme/chibi, 0.7.3,chibi}
 @supimpl{Chicken, http://call-cc.org, 4.8.0, chicken}
 @supimpl{Gambit, http://gambitscheme.org/wiki/index.php/Main_Page, 4.9.3, gambit}
-@supimpl{Gauche, http://practical-scheme.net/gauche/, 0.9.6, gauche}
 @supimpl{Guile, http://www.gnu.org/software/guile, 2.2, guile}
-@supimpl{GNU Kawa, http://www.gnu.org/software/kawa/index.html, 3.1, kawa}
 @supimpl{MIT/GNU Scheme, https://www.gnu.org/software/mit-scheme, 9.0, mit}
 @supimpl{Racket, http://www.racket-lang.org, 7.0, racket}
-@supimpl{Stklos, https://stklos.net/, 1.50, stklos}
 @end itemize
 
 Since Geiser supports multiple REPLs, having all of them will just add
diff --git a/doc/macros.texi b/doc/macros.texi
index c218dff..b1f99cd 100644
--- a/doc/macros.texi
+++ b/doc/macros.texi
@@ -1,11 +1,17 @@
-@set VERSION 0.20
+@set VERSION 0.33
 @set VERSION_NICK
-@set RELEASE_DATE December 2021
-@set EMACS_VERSION 24.4
+@set RELEASE_DATE May 2025
+@set EMACS_VERSION 27.1
+@set CODEBERG https://codeberg.org/geiser/
 @set GITLAB https://gitlab.com/emacs-geiser/
 
 @macro supimpl{NAME,URL,VERS,NM}
 @item
+@uref{\URL\, \NAME\} \VERS\ or better, via @uref{@value{CODEBERG}\NM\, geiser-\NM\}
+@end macro
+
+@macro gsupimpl{NAME,URL,VERS,NM}
+@item
 @uref{\URL\, \NAME\} \VERS\ or better, via @uref{@value{GITLAB}\NM\, geiser-\NM\}
 @end macro
 
diff --git a/doc/parens.texi b/doc/parens.texi
index 82c2e2c..b4c6319 100644
--- a/doc/parens.texi
+++ b/doc/parens.texi
@@ -99,7 +99,7 @@ for you to first call @code{geiser}
 (or @ref{choosing-impl,,one of its variants}),
 @end ifhtml
 @ifnothtml
-(or one of its variants, e.g. @code{run-guile}),
+(or one of its variants, e.g. @code{geiser-guile}),
 @end ifnothtml
 and then open some Scheme files;
 but there's nothing wrong in first opening a couple Scheme buffers and
diff --git a/doc/repl.texi b/doc/repl.texi
index 01a0a18..a522a82 100644
--- a/doc/repl.texi
+++ b/doc/repl.texi
@@ -382,12 +382,12 @@ some related tips.
 Instead of using the generic @command{geiser} command, you can directly
 start your Scheme of choice using any of the following commands:
 @itemize @bullet
-@item @command{run-racket}
-@item @command{run-guile}
-@item @command{run-chicken}
-@item @command{run-mit}
-@item @command{run-chibi}
-@item @command{run-chez}
+@item @command{geiser-racket}
+@item @command{geiser-guile}
+@item @command{geiser-chicken}
+@item @command{geiser-mit}
+@item @command{geiser-chibi}
+@item @command{geiser-chez}
 @end itemize
   @anchor{active-implementations} In addition, the
 variable @code{geiser-active-implementations} contains a list of those
diff --git a/doc/thanks.texi b/doc/thanks.texi
index 14eae9b..856afad 100644
--- a/doc/thanks.texi
+++ b/doc/thanks.texi
@@ -78,8 +78,8 @@ gmane.lisp.scheme.geiser}.
 @item
 @cindex bug tracker
 You can submit bug reports either to the mailing list or to
-@uref{https://gitlab.com/groups/emacs-geiser/-/issues, our bug tracker} over at
-Gitlab.
+@uref{https://codeberg.org/org/geiser/issues, our bug tracker} over at
+Codeberg.
 @item
 @cindex IRC channel
 The Freenode IRC channel @i{#geiser} is the Geiserati's meeting point in