Merge remote-tracking branch 'origin/master' into staging.

With resolved conflicts in:
	gnu/packages/ibus.scm
	gnu/packages/image.scm
	gnu/packages/lisp.scm
	gnu/packages/virtualization.scm

1 files changed, 2 insertions, 2 deletions

diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 75e7dc1c8e2..00efff03878 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -117,7 +117,7 @@ textfiles to roff for terminal display, and also to HTML for the web.")
                (base32
                 "15xpx7kbzkn63ab8mkghv7jkzji8pdbsyxm7ygjji19rvkkvkyv0"))))
     (build-system gnu-build-system)
-    (home-page "http://libpipeline.nongnu.org/")
+    (home-page "https://libpipeline.nongnu.org/")
     (synopsis "C library for manipulating pipelines of subprocesses")
     (description
      "libpipeline is a C library for manipulating pipelines of subprocesses in
@@ -211,7 +211,7 @@ a flexible and convenient way.")
      (list (search-path-specification
             (variable "MANPATH")
             (files '("share/man")))))
-    (home-page "http://man-db.nongnu.org/")
+    (home-page "https://man-db.nongnu.org/")
     (synopsis "Standard Unix documentation system")
     (description
      "Man-db is an implementation of the standard Unix documentation system