1 files changed, 28 insertions, 17 deletions

diff --git a/doc/htmlxref.cnf b/doc/htmlxref.cnf
index 8daa4a5c190..960f0f08fe2 100644
--- a/doc/htmlxref.cnf
+++ b/doc/htmlxref.cnf
@@ -1,9 +1,9 @@
 # htmlxref.cnf - reference file for free Texinfo manuals on the web.
 # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
 
-htmlxrefversion=2019-05-04.20; # UTC
+htmlxrefversion=2020-01-11.22; # UTC
 
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2019 Free Software Foundation, Inc.
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2019, 2020 Free Software Foundation, Inc.
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -68,12 +68,12 @@ autogen		node	${GS}/autoconf/manual/html_node/
 automake        mono    ${GS}/automake/manual/automake.html
 automake        node    ${GS}/automake/manual/html_node/
 
-avl             node    http://www.stanford.edu/~blp/avl/libavl.html/
+avl             node    http://adtinfo.org/libavl.html/
 
 bash            mono    ${GS}/bash/manual/bash.html
 bash            node    ${GS}/bash/manual/html_node/
 
-BINUTILS = http://sourceware.org/binutils/docs
+BINUTILS = https://sourceware.org/binutils/docs
 binutils        node    ${BINUTILS}/binutils/
  as             node    ${BINUTILS}/as/
  bfd            node    ${BINUTILS}/bfd/
@@ -110,13 +110,15 @@ cpio		node	${GS}/cpio/manual/html_node/
 
 cssc            node    ${GS}/cssc/manual/
 
-#cvs cannot be handled here; see http://ximbiot.com/cvs/manual.
+CVS = ${GS}/trans-coord/manual
+cvs            mono    ${CVS}/cvs/cvs.html
+cvs            node    ${CVS}/cvs/html_node/
 
 ddd             mono    ${GS}/ddd/manual/html_mono/ddd.html
 
 ddrescue        mono    ${GS}/ddrescue/manual/ddrescue_manual.html
 
-DICO = http://puszcza.gnu.org.ua/software/dico/manual
+DICO = https://puszcza.gnu.org.ua/software/dico/manual
 dico            mono    ${DICO}/dico.html
 dico            chapter ${DICO}/html_chapter/
 dico            section ${DICO}/html_section/
@@ -167,6 +169,9 @@ emacs		node	${EMACS}/html_node/emacs/
  eshell         mono    ${EMACS}/html_mono/eshell.html
  eshell         node    ${EMACS}/html_node/eshell/
  #
+ eww            mono    ${EMACS}/html_mono/eww.html
+ eww            node    ${EMACS}/html_node/eww/
+ #
  flymake        mono    ${EMACS}/html_mono/flymake.html
  flymake        node    ${EMACS}/html_node/flymake/
  #
@@ -234,8 +239,7 @@ find		node	${GS}/findutils/manual/html_node/find_html
 findutils       mono    ${GS}/findutils/manual/html_mono/find.html
 findutils       node    ${GS}/findutils/manual/html_node/find_html
 
-FLEX = http://flex.sourceforge.net
-flex            node    ${FLEX}/manual/
+flex            node    https://westes.github.io/flex/manual/
 
 gama            mono    ${GS}/gama/manual/gama.html
 gama            node    ${GS}/gama/manual/html_node/
@@ -249,7 +253,7 @@ gawk		node	${GAWK}/html_node/
 gcal            mono    ${GS}/gcal/manual/gcal.html
 gcal            node    ${GS}/gcal/manual/html_node/
 
-GCC = http://gcc.gnu.org/onlinedocs
+GCC = https://gcc.gnu.org/onlinedocs
 gcc             node    ${GCC}/gcc/
  cpp            node    ${GCC}/cpp/
  gcj            node    ${GCC}/gcj/
@@ -265,7 +269,7 @@ gcc		node	${GCC}/gcc/
  gnat-style     node    ${GCC}/gnat-style/
  libiberty      node    ${GCC}/libiberty/
 
-GDB = http://sourceware.org/gdb/current/onlinedocs
+GDB = https://sourceware.org/gdb/current/onlinedocs
 gdb             node    ${GDB}/gdb/
  stabs          node    ${GDB}/stabs/
 
@@ -282,13 +286,13 @@ geiser		chapter	http://geiser.nongnu.org/
 gettext         mono    ${GS}/gettext/manual/gettext.html
 gettext         node    ${GS}/gettext/manual/html_node/
 
-gforth          node    http://www.complang.tuwien.ac.at/forth/gforth/Docs-html/
+gforth          node    https://www.complang.tuwien.ac.at/forth/gforth/Docs-html/
 
 global          mono    ${GS}/global/manual/global.html
 
 gmediaserver    node    ${GS}/gmediaserver/manual/
 
-gmp             node    http://www.gmplib.org/manual/
+gmp             node    https://www.gmplib.org/manual/
 
 gnu-arch        node    ${GS}/gnu-arch/tutorial/
 
@@ -311,7 +315,7 @@ gnun		node	${GNUN}/gnun/html_node/
  web-trans      mono    ${GNUN}/web-trans/web-trans.html
  web-trans      node    ${GNUN}/web-trans/html_node/
 
-GNUPG = http://www.gnupg.org/documentation/manuals
+GNUPG = https://www.gnupg.org/documentation/manuals
 gnupg           node    ${GNUPG}/gnupg/
  dirmngr        node    ${GNUPG}/dirmngr/
  gcrypt         node    ${GNUPG}/gcrypt/
@@ -399,6 +403,10 @@ guix.es		mono	${GS}/guix/manual/es/guix.html
 guix.es         node    ${GS}/guix/manual/es/html_node/
 guix.fr         mono    ${GS}/guix/manual/fr/guix.html
 guix.fr         node    ${GS}/guix/manual/fr/html_node/
+guix.ru         mono    ${GS}/guix/manual/ru/guix.html
+guix.ru         node    ${GS}/guix/manual/ru/html_node/
+guix.zh_CN      mono    ${GS}/guix/manual/zh-cn/guix.html
+guix.zh_CN      node    ${GS}/guix/manual/zh-cn/html_node/
 guix            mono    ${GS}/guix/manual/en/guix.html
 guix            node    ${GS}/guix/manual/en/html_node/
 
@@ -499,6 +507,9 @@ METAEXCHANGE = http://ftp.gwdg.de/pub/gnu2/iwfmdh/doc/texinfo
  iwf_mh         node    ${METAEXCHANGE}/iwf_mh.html
  scantest       node    ${METAEXCHANGE}/scantest.html
 
+mes             mono    ${GS}/mes/manual/mes.html
+mes             node    ${GS}/mes/manual/html_node/
+
 MIT_SCHEME = ${GS}/mit-scheme/documentation
  mit-scheme-ref   node  ${MIT_SCHEME}/mit-scheme-ref/
  mit-scheme-user  node  ${MIT_SCHEME}/mit-scheme-user/
@@ -515,9 +526,9 @@ mpfr		mono	http://www.mpfr.org/mpfr-current/mpfr.html
 
 mtools          mono    ${GS}/mtools/manual/mtools.html
 
-myserver        node    http://www.myserverproject.net/documentation/
+myserver        mono    http://www.myserverproject.net/doc.php
 
-nano            mono    http://www.nano-editor.org/dist/latest/nano.html
+nano            mono    https://www.nano-editor.org/dist/latest/nano.html
 
 nettle          chapter http://www.lysator.liu.se/~nisse/nettle/nettle.html
 
@@ -550,7 +561,7 @@ pspp		node	${GS}/pspp/manual/html_node/
 pyconfigure     mono    ${GS}/pyconfigure/manual/pyconfigure.html
 pyconfigure     node    ${GS}/pyconfigure/manual/html_node/
 
-R = http://cran.r-project.org/doc/manuals
+R = https://cran.r-project.org/doc/manuals
  R-intro        mono    ${R}/R-intro.html
  R-lang         mono    ${R}/R-lang.html
  R-exts         mono    ${R}/R-exts.html
@@ -656,7 +667,7 @@ xboard		node	${GS}/xboard/manual/html_node/
 # emacs-page
 # Free TeX-related Texinfo manuals on tug.org.
 
-T = http://tug.org/texinfohtml
+T = https://tug.org/texinfohtml
 
 dvipng          mono    ${T}/dvipng.html
 dvips           mono    ${T}/dvips.html