From e371b3bf41c6121749cacd6127bdf5faed572b00 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 13 Oct 2017 16:30:41 +0100 Subject: [PATCH] Use https:// links for most sites This adds a rule to require https links for the libvirt, qemu and kvm websites. Signed-off-by: Daniel P. Berrange --- cfg.mk | 17 ++++++ configure.ac | 2 +- daemon/libvirtd.conf | 2 +- daemon/libvirtd.init.in | 4 +- daemon/libvirtd.pod | 6 +- daemon/libvirtd.service.in | 2 +- daemon/virt-guest-shutdown.target | 2 +- docs/404.html.in | 2 +- docs/aclpolkit.html.in | 2 +- docs/api_extension.html.in | 2 +- docs/apps.html.in | 2 +- docs/bindings.html.in | 10 ++-- docs/csharp.html.in | 6 +- docs/devguide.html.in | 14 ++--- docs/devhelp/html.xsl | 4 +- docs/docs.html.in | 4 +- docs/downloads.html.in | 92 +++++++++++++++---------------- docs/drvlxc.html.in | 2 +- docs/drvqemu.html.in | 8 +-- docs/formatdomain.html.in | 2 +- docs/hacking.html.in | 2 +- docs/internals/eventloop.html.in | 4 +- docs/java.html.in | 12 ++-- docs/news-2005.html.in | 2 +- docs/news-2006.html.in | 2 +- docs/news-2007.html.in | 4 +- docs/news-2008.html.in | 2 +- docs/news-2009.html.in | 2 +- docs/news-2010.html.in | 2 +- docs/news-2011.html.in | 2 +- docs/news-2012.html.in | 2 +- docs/news-2013.html.in | 2 +- docs/news-2014.html.in | 2 +- docs/news-2015.html.in | 2 +- docs/news-2016.html.in | 2 +- docs/news-html.xsl | 2 +- docs/php.html.in | 6 +- docs/securityprocess.html.in | 2 +- docs/testapi.html.in | 4 +- docs/testsuites.html.in | 4 +- docs/testtck.html.in | 2 +- docs/virshcmdref.html.in | 24 ++++---- docs/windows.html.in | 2 +- src/access/genpolkit.pl | 2 +- src/libvirt.c | 6 +- src/locking/virtlockd.pod | 6 +- src/locking/virtlockd.service.in | 2 +- src/logging/virtlogd.pod | 6 +- src/logging/virtlogd.service.in | 2 +- src/qemu/qemu_command.c | 2 +- src/util/virstoragefile.c | 2 +- tests/virconfdata/libvirtd.conf | 2 +- tests/virconfdata/libvirtd.out | 2 +- tools/libvirt-guests.init.in | 4 +- tools/libvirt-guests.service.in | 2 +- tools/virsh.c | 2 +- tools/virsh.pod | 40 +++++++------- tools/virt-admin.c | 2 +- tools/virt-admin.pod | 8 +-- tools/virt-host-validate.pod | 4 +- tools/virt-login-shell.pod | 6 +- tools/virt-pki-validate.in | 10 ++-- tools/virt-pki-validate.pod | 6 +- tools/virt-sanlock-cleanup.pod | 6 +- tools/virt-xml-validate.pod | 6 +- tools/wireshark/README.md | 2 +- 66 files changed, 211 insertions(+), 194 deletions(-) diff --git a/cfg.mk b/cfg.mk index 0f4065b98a..8ad09e7da1 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1020,6 +1020,23 @@ sc_prohibit_obj_free_apis_in_virsh: halt='avoid using virDomain(Snapshot)Free in virsh, use virsh-prefixed wrappers instead' \ $(_sc_search_regexp) +https_sites = www.libvirt.org +https_sites += libvirt.org +https_sites += security.libvirt.org +https_sites += qemu.org +https_sites += www.qemu.org +https_sites += wiki.qemu.org +https_sites += linux-kvm.org +https_sites += www.linux-kvm.org + +https_re= ($(subst $(space),|,$(https_sites))) + +sc_prohibit_http_urls: + @prohibit='http://$(https_re)' \ + exclude="/schemas/" \ + halt='Links must use https:// protocol' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/configure.ac b/configure.ac index 4f420cf8d9..ebe3318e07 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl . -AC_INIT([libvirt], [3.9.0], [libvir-list@redhat.com], [], [http://libvirt.org]) +AC_INIT([libvirt], [3.9.0], [libvir-list@redhat.com], [], [https://libvirt.org]) AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 8a1b3a92db..8e0c0d96d2 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -1,6 +1,6 @@ # Master libvirt daemon configuration file # -# For further information consult http://libvirt.org/format.html +# For further information consult https://libvirt.org/format.html # # NOTE: the tests/daemon-conf regression test script requires # that each "PARAMETER = VALUE" line in this file have the parameter diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 164732905d..d81dca6f2e 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -14,7 +14,7 @@ # Short-Description: daemon for libvirt virtualization API # Description: This is a daemon for managing guest instances # and libvirt virtual networks -# See http://libvirt.org +# See https://libvirt.org ### END INIT INFO # the following is chkconfig init header @@ -24,7 +24,7 @@ # chkconfig: 345 97 03 # description: This is a daemon for managing guest instances \ # and libvirt virtual networks \ -# See http://libvirt.org +# See https://libvirt.org # # processname: libvirtd # pidfile: @localstatedir@/run/libvirtd.pid diff --git a/daemon/libvirtd.pod b/daemon/libvirtd.pod index 8d3fbd13d2..4721e0f4ec 100644 --- a/daemon/libvirtd.pod +++ b/daemon/libvirtd.pod @@ -166,7 +166,7 @@ Please report all bugs you discover. This should be done via either: =item a) the mailing list -L +L =item or, @@ -174,7 +174,7 @@ B<> =item b) the bug tracker -L +L =item Alternatively, you may report bugs to your software distributor / vendor. @@ -199,6 +199,6 @@ PURPOSE =head1 SEE ALSO L, L, L, L, -L, L +L, L =cut diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index fbaf02f3bf..c189f5e653 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -15,7 +15,7 @@ After=apparmor.service After=local-fs.target After=remote-fs.target Documentation=man:libvirtd(8) -Documentation=http://libvirt.org +Documentation=https://libvirt.org [Service] Type=notify diff --git a/daemon/virt-guest-shutdown.target b/daemon/virt-guest-shutdown.target index bf876527b5..25d4aaa267 100644 --- a/daemon/virt-guest-shutdown.target +++ b/daemon/virt-guest-shutdown.target @@ -1,3 +1,3 @@ [Unit] Description=Libvirt guests shutdown -Documentation=http://libvirt.org +Documentation=https://libvirt.org diff --git a/docs/404.html.in b/docs/404.html.in index bdffff601b..0ac76f125a 100644 --- a/docs/404.html.in +++ b/docs/404.html.in @@ -9,7 +9,7 @@ page you were looking for. You might want to try

    -
  • going back to the home page to find +
  • going back to the home page to find a collection of links to interesting pages on this site
  • using the search box at the top right corner of the screen to locate the content on this site or mailing list archives
    • diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 05e3b88150..0e3c8e971f 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -354,7 +354,7 @@ polkit.addRule(function(action, subject) {

    See - source code + source code for a more complex example.

    diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 3b37e7bec6..9beec07602 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -44,7 +44,7 @@

    - http://libvirt.org/downloads.html + https://libvirt.org/downloads.html

    diff --git a/docs/apps.html.in b/docs/apps.html.in index df473636ea..60edeb3af4 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -327,7 +327,7 @@ Allows using simple ruby objects to manipulate hypervisors, guests, storage, network etc. It is based on top of - the native ruby bindings. + the native ruby bindings. diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 203934b6aa..733c89bc20 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -24,7 +24,7 @@

  • OCaml: Richard Jones develops - OCaml bindings. + OCaml bindings.
  • Perl: Daniel Berrange develops @@ -33,7 +33,7 @@

  • PHP: Radek Hladik started developing - PHP bindings in 2010. + PHP bindings in 2010.

    In February 2011 the binding development has been moved to the libvirt.org website as @@ -43,13 +43,13 @@ The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information, including information on posting patches to libvirt-php, please refer - to the PHP bindings site. + to the PHP bindings site.

  • Python: Libvirt's python bindings are split to a - separate package + separate package since version 1.2.0, older versions came with direct support for the Python language.

    @@ -70,7 +70,7 @@
  • Ruby: Chris Lalancette develops - Ruby bindings. + Ruby bindings.
diff --git a/docs/csharp.html.in b/docs/csharp.html.in index 2f85fd2b7b..fcca255072 100644 --- a/docs/csharp.html.in +++ b/docs/csharp.html.in @@ -38,7 +38,7 @@ --> @@ -46,7 +46,7 @@

The C# bindings source code is maintained in a git repository available on - libvirt.org: + libvirt.org: 

@@ -58,7 +58,7 @@ git clone git://libvirt.org/libvirt-csharp.git
     

 
 
-http://libvirt.org/git/?p=libvirt-csharp.git;a=summary
+https://libvirt.org/git/?p=libvirt-csharp.git;a=summary
 

 
     
Usage

diff --git a/docs/devguide.html.in b/docs/devguide.html.in
index b949f04a16..f460f1dd58 100644
--- a/docs/devguide.html.in
+++ b/docs/devguide.html.in
@@ -12,10 +12,10 @@
     

 
     
 
     
Contributing content

@@ -29,13 +29,13 @@
 
     
 # C language
-$ git clone git://libvirt.org/libvirt-appdev-guide.git
+$ git clone git://libvirt.org/libvirt-appdev-guide.git
 
 # Python language
-$ git clone git://libvirt.org/libvirt-appdev-guide-python.git
+$ git clone git://libvirt.org/libvirt-appdev-guide-python.git
 
 # Publican Style/Theme
-$ git clone git://libvirt.org/libvirt-publican.git
+$ git clone git://libvirt.org/libvirt-publican.git
     

 
   
diff --git a/docs/devhelp/html.xsl b/docs/devhelp/html.xsl
index 5e063f3172..eb10e362bf 100644
--- a/docs/devhelp/html.xsl
+++ b/docs/devhelp/html.xsl
@@ -566,8 +566,8 @@ initially for the the online search
-engine hosted on libvirt.org
+the online search
+engine hosted on libvirt.org
 it indexes the project page, the APIs as well as the mailing-list archives. 

 	
       
diff --git a/docs/docs.html.in b/docs/docs.html.in
index f23809840c..931da85424 100644
--- a/docs/docs.html.in
+++ b/docs/docs.html.in
@@ -59,11 +59,11 @@
           c#,
           go,
           java,
-          ocaml.
+          ocaml.
           perl,
           python,
           php,
-          ruby
+          ruby
 
 
         
XML schemas

diff --git a/docs/downloads.html.in b/docs/downloads.html.in
index 94869c35c5..640b514803 100644
--- a/docs/downloads.html.in
+++ b/docs/downloads.html.in
@@ -28,11 +28,11 @@
           libvirt
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -50,11 +50,11 @@
           C#
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -66,11 +66,11 @@
           Go
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -84,11 +84,11 @@
           Java
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -100,11 +100,11 @@
           OCaml
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -118,7 +118,7 @@
             cpan
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -126,18 +126,18 @@
           
           
             api ref
-            changes
+            changes
           
         
         
           PHP
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -149,12 +149,12 @@
           Python
           
             ftp
-            http
+            http
             https
             pypi
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -166,11 +166,11 @@
           Ruby
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -182,11 +182,11 @@
           Rust
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -201,11 +201,11 @@
           GLib / GConfig / GObject
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -217,11 +217,11 @@
           Go XML
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -235,11 +235,11 @@
           Console Proxy
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -251,11 +251,11 @@
           CIM provider
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -267,11 +267,11 @@
           CIM utils
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -283,11 +283,11 @@
           SNMP
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -299,11 +299,11 @@
           Application Sandbox
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -318,11 +318,11 @@
           TCK
           
             ftp
-            http
+            http
             https
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -334,7 +334,7 @@
           Test API
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -346,7 +346,7 @@
           Jenkins Config
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -358,7 +358,7 @@
           CIM Test
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -373,7 +373,7 @@
           Publican Brand
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -385,7 +385,7 @@
           App Development Guide
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -397,7 +397,7 @@
           App Development Guide Python
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -409,7 +409,7 @@
           virsh Command Reference
           
           
-            libvirt
+            libvirt
           
           
             gitlab
@@ -431,7 +431,7 @@
 
     
 
@@ -447,7 +447,7 @@
 
     
 
     
Primary release schedule

@@ -529,7 +529,7 @@
 
     

       All modules maintained by the libvirt project have their primary
-      source available in the project GIT server.
+      source available in the project GIT server.
       Each module can be cloned anonymously using:
     

 
diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in
index 58a336ed30..94c6b82cfd 100644
--- a/docs/drvlxc.html.in
+++ b/docs/drvlxc.html.in
@@ -601,7 +601,7 @@ rather than creating new network namespace for the container. In this case privn
 ignored.
 

 
-<domain type='lxc' xmlns:lxc='http://libvirt.org/schemas/domain/lxc/1.0'>
+<domain type='lxc' xmlns:lxc='https://libvirt.org/schemas/domain/lxc/1.0'>
 ...
 <lxc:namespace>
   <lxc:sharenet type='netns' value='red'/>
diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index a775f29792..e2a0797cfb 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -15,11 +15,11 @@
 
     
    
       
  • 
-        The KVM Linux
+        The KVM Linux
         hypervisor
       
    • 
       
  • 
-        The QEMU emulator
+        The QEMU emulator
       
    • 
     

 
@@ -546,7 +546,7 @@ $ virsh domxml-to-native qemu-argv demo.xml
       (Since 0.8.3).  In order to use the
       XML additions, it is necessary to issue an XML namespace request
       (the special xmlns:name attribute) that
-      pulls in http://libvirt.org/schemas/domain/qemu/1.0;
+      pulls in https://libvirt.org/schemas/domain/qemu/1.0;
       typically, the namespace is given the name
       of qemu.  With the namespace in place, it is then
       possible to add an element <qemu:commandline>
@@ -566,7 +566,7 @@ $ virsh domxml-to-native qemu-argv demo.xml
           and optional value.
       
       
Example:
-<domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+<domain type='qemu' xmlns:qemu='https://libvirt.org/schemas/domain/qemu/1.0'>
   <name>QEmu-fedora-i686</name>
   <memory>219200</memory>
   <os>
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index c0e3c22213..b93ace7cba 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5224,7 +5224,7 @@ qemu-kvm -net nic,model=? /dev/null
       

         The optional queues attribute controls the number
         of queues to be used for either
-         Multiqueue
+         Multiqueue
         virtio-net or vhost-user network
         interfaces.  Use of multiple packet processing queues requires the
         interface having the <model type='virtio'/>
diff --git a/docs/hacking.html.in b/docs/hacking.html.in
index c33a27c232..6cadfb8343 100644
--- a/docs/hacking.html.in
+++ b/docs/hacking.html.in
@@ -17,7 +17,7 @@
         
Official upstream repository is kept in git
         (git://libvirt.org/libvirt.git) and is browsable
         along with other libvirt-related repositories
-        (e.g. libvirt-python) online.

+        (e.g. libvirt-python) online.

       
 
       
  • 
diff --git a/docs/internals/eventloop.html.in b/docs/internals/eventloop.html.in
index 2d99f59471..3e62d5ca53 100644
--- a/docs/internals/eventloop.html.in
+++ b/docs/internals/eventloop.html.in
@@ -29,7 +29,7 @@
     not waiting for direct user input and have no graphical
     interface. Such as Libvirt.
    
 
-    event loop
+    event loop
 
     
    In Libvirt this approach is used in combination with
     poll(2) as all the communication with its
@@ -70,7 +70,7 @@
     acceptable for Libvirt. Therefore we have came up with the
     following solution.
    
 
-    event loop
+    event loop
 
     
    The event loop does only necessary minimum and hand over
     message processing to another thread. In fact, there can be
diff --git a/docs/java.html.in b/docs/java.html.in
index 06cf7034f6..333583427c 100644
--- a/docs/java.html.in
+++ b/docs/java.html.in
@@ -16,17 +16,17 @@
 
 
    
 
 
    Maven
    
-
    A maven repository is located at http://www.libvirt.org/maven2/
+
    A maven repository is located at https://libvirt.org/maven2/
 which you can use to include this in your maven projects.
    
 
 
    GIT source repository
    
 
     The Java bindings code source is now maintained in a git repository available on
-libvirt.org:
+libvirt.org:
 
    
 
     git clone git://libvirt.org/libvirt-java.git
@@ -36,7 +36,7 @@ It can also be browsed at
 
    
 
     
-http://libvirt.org/git/?p=libvirt-java.git;a=summary
+https://libvirt.org/git/?p=libvirt-java.git;a=summary
 
    
 
 
    
@@ -120,7 +120,7 @@ lower case, for example the C functions:
    
       virDomain.setMaxMemory(long memory)
     
    
     
     There is of course some functions where the mapping is less direct
-and using extra classes to map complex arguments. The Javadoc is available online or as
+and using extra classes to map complex arguments. The Javadoc is available online or as
 part of a separate libvirt-java-javadoc package.
    
     
    So let's look at a simple example inspired from the
 test.java test found in src in the source tree:
    
@@ -164,7 +164,7 @@ from the C API, the only points to notice are:
    
   
    <repositories>
   <repository>
     <id>libvirt-org</id>
-    <url>http://libvirt.org/maven2</url>
+    <url>https://libvirt.org/maven2</url>
   </repository>
 </repositories>
    
 
diff --git a/docs/news-2005.html.in b/docs/news-2005.html.in
index 44d8c4cc47..8d6dc150d3 100644
--- a/docs/news-2005.html.in
+++ b/docs/news-2005.html.in
@@ -11,7 +11,7 @@
     
    It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
    
 
diff --git a/docs/news-2006.html.in b/docs/news-2006.html.in
index 6556d4fed0..7463d7bad3 100644
--- a/docs/news-2006.html.in
+++ b/docs/news-2006.html.in
@@ -12,7 +12,7 @@
     
    It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
    
 
diff --git a/docs/news-2007.html.in b/docs/news-2007.html.in
index c12449abf4..14099936fd 100644
--- a/docs/news-2007.html.in
+++ b/docs/news-2007.html.in
@@ -12,7 +12,7 @@
     
    It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
    
 
@@ -257,7 +257,7 @@
     
      
       
    • Features:
      
       Secure Remote support (Richard Jones).
-      See the remote page of the documentation
      
+      See the remote page of the documentation
      
       
      • 
 
       
    • Documentation:
      
diff --git a/docs/news-2008.html.in b/docs/news-2008.html.in
index aefbf3873f..28f3b98d82 100644
--- a/docs/news-2008.html.in
+++ b/docs/news-2008.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2009.html.in b/docs/news-2009.html.in
index 0824b0bbef..9c0df7a82f 100644
--- a/docs/news-2009.html.in
+++ b/docs/news-2009.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2010.html.in b/docs/news-2010.html.in
index 013ebaf56e..8d9ee1dea4 100644
--- a/docs/news-2010.html.in
+++ b/docs/news-2010.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2011.html.in b/docs/news-2011.html.in
index cea716556d..f59bb196cd 100644
--- a/docs/news-2011.html.in
+++ b/docs/news-2011.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2012.html.in b/docs/news-2012.html.in
index e419a2ef05..ede85c41c7 100644
--- a/docs/news-2012.html.in
+++ b/docs/news-2012.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2013.html.in b/docs/news-2013.html.in
index 50c200ebd3..6cc3bca2ff 100644
--- a/docs/news-2013.html.in
+++ b/docs/news-2013.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2014.html.in b/docs/news-2014.html.in
index 8dfca90120..91a4f2f26f 100644
--- a/docs/news-2014.html.in
+++ b/docs/news-2014.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2015.html.in b/docs/news-2015.html.in
index cd3b638a90..bb71af1c46 100644
--- a/docs/news-2015.html.in
+++ b/docs/news-2015.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-2016.html.in b/docs/news-2016.html.in
index 3b804fc1a9..a7be451a2e 100644
--- a/docs/news-2016.html.in
+++ b/docs/news-2016.html.in
@@ -12,7 +12,7 @@
     
      It is also possible to just use
     the GIT version or snapshot,
     contact the mailing list and check
-    the GIT log
+    the GIT log
     to gauge progress.
     
      
 
diff --git a/docs/news-html.xsl b/docs/news-html.xsl
index 5baabc695a..4d40798028 100644
--- a/docs/news-html.xsl
+++ b/docs/news-html.xsl
@@ -25,7 +25,7 @@
         
      This is the list of official releases for libvirt, along with an
         overview of the changes introduced by each of them.
      
         
      For a more fine-grained view, use the
-        git log.
+        git log.
         
      
         
         
      Older libvirt releases didn't have proper release notes,
diff --git a/docs/php.html.in b/docs/php.html.in
index b2a372d484..2939b4bd17 100644
--- a/docs/php.html.in
+++ b/docs/php.html.in
@@ -11,7 +11,7 @@
 
      Getting the source
      
 
       The PHP bindings code source is now maintained in a git repository available on
-libvirt.org:
+libvirt.org:
 
      
 
       git clone git://libvirt.org/libvirt-php.git
@@ -20,13 +20,13 @@ git clone git://libvirt.org/libvirt-php.git
 It can also be browsed at
 
      
 
      -http://libvirt.org/git/?p=libvirt-php.git;a=summary
+https://libvirt.org/git/?p=libvirt-php.git;a=summary
 
      
 
 
      
 
      Project pages
      
 
      Since February 2011 the project has its own pages hosted at libvirt.org. For more information on the project
-   please refer to http://libvirt.org/php.
+   please refer to https://libvirt.org/php.
 
 
      
 
diff --git a/docs/securityprocess.html.in b/docs/securityprocess.html.in
index 1cf51b005c..2bab07bf39 100644
--- a/docs/securityprocess.html.in
+++ b/docs/securityprocess.html.in
@@ -107,7 +107,7 @@
 
     
      
       When an embargo expires, security issues will be announced on both
-      the libvirt development and announcement mailing lists.
+      the libvirt development and announcement mailing lists.
     
      
   
 
diff --git a/docs/testapi.html.in b/docs/testapi.html.in
index 79ecd73ee0..dd0552c8fd 100644
--- a/docs/testapi.html.in
+++ b/docs/testapi.html.in
@@ -23,12 +23,12 @@
        or more test case to define a given test scenario.
      
     
      For more details you can look at:
      
     
     
       Libvirt-test-API is maintained using
-        a GIT
+        a GIT
         repository, and comment, patches and reviews are carried
         on the libvir-list development list.
      
   
diff --git a/docs/testsuites.html.in b/docs/testsuites.html.in
index eeb0e8e199..0bf4e38544 100644
--- a/docs/testsuites.html.in
+++ b/docs/testsuites.html.in
@@ -23,7 +23,7 @@
           download, as a
           package
           in Fedora distributions, but best is probably to get
-          the version
+          the version
           from GIT.
       
      • 
       
    • the libvirt-test-API is also a functional
@@ -32,7 +32,7 @@
           of libvirt. It is available separately as a
           download,
           or directly get
-          the version
+          the version
           from GIT.
       
      • 
     
    
diff --git a/docs/testtck.html.in b/docs/testtck.html.in
index 458dcb3a0a..021b56e665 100644
--- a/docs/testtck.html.in
+++ b/docs/testtck.html.in
@@ -33,7 +33,7 @@
            Fedora Feature.
    • 
     
     
     Libvirt-TCK is maintained using
-        a GIT
+        a GIT
         repository, and comment, patches and reviews are carried
         on the libvir-list development list.
    
   
diff --git a/docs/virshcmdref.html.in b/docs/virshcmdref.html.in
index 1ca689a3d7..731d809f3c 100644
--- a/docs/virshcmdref.html.in
+++ b/docs/virshcmdref.html.in
@@ -30,10 +30,10 @@
 
     
 
@@ -46,21 +46,21 @@
     
 
@@ -68,7 +68,7 @@
     
    
       The DocBook source is maintained in a git repository available on
-      libvirt.org:
+      libvirt.org:
     
    
 
 
    @@ -80,7 +80,7 @@ git clone git://libvirt.org/libvirt-virshcmdref.git
     
    
 
 
    -http://libvirt.org/git/?p=libvirt-virshcmdref.git
+https://libvirt.org/git/?p=libvirt-virshcmdref.git
 
    
 
   
diff --git a/docs/windows.html.in b/docs/windows.html.in
index 16c1aee615..df60940750 100644
--- a/docs/windows.html.in
+++ b/docs/windows.html.in
@@ -79,7 +79,7 @@
       online here:
    
     
    
 
-    http://libvirt.org/drvesx.html
+    https://libvirt.org/drvesx.html
 
     
    TLS Certificates
    
 
diff --git a/src/access/genpolkit.pl b/src/access/genpolkit.pl
index 6258fd3a1e..968cb8c55c 100755
--- a/src/access/genpolkit.pl
+++ b/src/access/genpolkit.pl
@@ -81,7 +81,7 @@ print <
 
   Libvirt Project
-  http://libvirt.org
+  https://libvirt.org
 EOF
 
 foreach my $object (sort { $a cmp $b } keys %perms) {
diff --git a/src/libvirt.c b/src/libvirt.c
index 6d66fa43ef..536d56f0a5 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1151,7 +1151,7 @@ virConnectOpenInternal(const char *name,
  * if not already running. This can be prevented by setting the
  * environment variable LIBVIRT_AUTOSTART=0
  *
- * URIs are documented at http://libvirt.org/uri.html
+ * URIs are documented at httsp://libvirt.org/uri.html
  *
  * virConnectClose should be used to release the resources after the connection
  * is no longer needed.
@@ -1190,7 +1190,7 @@ virConnectOpen(const char *name)
  * See virConnectOpen for notes about environment variables which can
  * have an effect on opening drivers and freeing the connection resources
  *
- * URIs are documented at http://libvirt.org/uri.html
+ * URIs are documented at https://libvirt.org/uri.html
  *
  * Returns a pointer to the hypervisor connection or NULL in case of error
  */
@@ -1228,7 +1228,7 @@ virConnectOpenReadOnly(const char *name)
  * See virConnectOpen for notes about environment variables which can
  * have an effect on opening drivers and freeing the connection resources
  *
- * URIs are documented at http://libvirt.org/uri.html
+ * URIs are documented at https://libvirt.org/uri.html
  *
  * Returns a pointer to the hypervisor connection or NULL in case of error
  */
diff --git a/src/locking/virtlockd.pod b/src/locking/virtlockd.pod
index 355d97404d..de0eb8ac18 100644
--- a/src/locking/virtlockd.pod
+++ b/src/locking/virtlockd.pod
@@ -128,7 +128,7 @@ Please report all bugs you discover.  This should be done via either:
 
 =item a) the mailing list
 
-L
+L
 
 =item or,
 
@@ -136,7 +136,7 @@ B<>
 
 =item b) the bug tracker
 
-L
+L
 
 =item Alternatively, you may report bugs to your software distributor / vendor.
 
@@ -160,6 +160,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-L,  L
+L,  L
 
 =cut
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index c369591267..928bf63fb2 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -3,7 +3,7 @@ Description=Virtual machine lock manager
 Requires=virtlockd.socket
 Before=libvirtd.service
 Documentation=man:virtlockd(8)
-Documentation=http://libvirt.org
+Documentation=https://libvirt.org
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/virtlockd
diff --git a/src/logging/virtlogd.pod b/src/logging/virtlogd.pod
index 9e7212cfbe..5e44f84a85 100644
--- a/src/logging/virtlogd.pod
+++ b/src/logging/virtlogd.pod
@@ -128,7 +128,7 @@ Please report all bugs you discover.  This should be done via either:
 
 =item a) the mailing list
 
-L
+L
 
 =item or,
 
@@ -136,7 +136,7 @@ B<>
 
 =item b) the bug tracker
 
-L
+L
 
 =item Alternatively, you may report bugs to your software distributor / vendor.
 
@@ -160,6 +160,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-L,  L
+L,  L
 
 =cut
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 8b67317cb1..ec7712bb9a 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -3,7 +3,7 @@ Description=Virtual machine log manager
 Requires=virtlogd.socket
 Before=libvirtd.service
 Documentation=man:virtlogd(8)
-Documentation=http://libvirt.org
+Documentation=https://libvirt.org
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/virtlogd
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 9c8bde49a8..46f0bdd18c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3809,7 +3809,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
              */
             virBufferAddLit(&buf, ",mq=on");
         } else {
-            /* As advised at http://www.linux-kvm.org/page/Multiqueue
+            /* As advised at https://www.linux-kvm.org/page/Multiqueue
              * we should add vectors=2*N+2 where N is the vhostfdSize
              */
             virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2);
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index dd44949403..de76719384 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -369,7 +369,7 @@ static struct FileTypeInfo const fileTypeInfo[] = {
         qcow2GetFeatures
     },
     [VIR_STORAGE_FILE_QED] = {
-        /* http://wiki.qemu.org/Features/QED */
+        /* https://wiki.qemu.org/Features/QED */
         0, "QED", NULL,
         LV_LITTLE_ENDIAN, -2, 0, {0},
         QED_HDR_IMAGE_SIZE, 8, 1, NULL, qedGetBackingStore, NULL
diff --git a/tests/virconfdata/libvirtd.conf b/tests/virconfdata/libvirtd.conf
index 5029c4c2e7..ee57593109 100644
--- a/tests/virconfdata/libvirtd.conf
+++ b/tests/virconfdata/libvirtd.conf
@@ -1,6 +1,6 @@
 # Master libvirt daemon configuration file
 #
-# For further information consult http://libvirt.org/format.html
+# For further information consult https://libvirt.org/format.html
 
 
 #################################################################
diff --git a/tests/virconfdata/libvirtd.out b/tests/virconfdata/libvirtd.out
index 4d7ed47a90..e0b6f0a606 100644
--- a/tests/virconfdata/libvirtd.out
+++ b/tests/virconfdata/libvirtd.out
@@ -1,6 +1,6 @@
 # Master libvirt daemon configuration file
 #
-# For further information consult http://libvirt.org/format.html
+# For further information consult https://libvirt.org/format.html
 #################################################################
 #
 # Network connectivitiy controls
diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in
index 7709df3b96..495d4c7d1d 100644
--- a/tools/libvirt-guests.init.in
+++ b/tools/libvirt-guests.init.in
@@ -14,7 +14,7 @@
 # Short-Description: suspend/resume libvirt guests on shutdown/boot
 # Description: This is a script for suspending active libvirt guests
 #              on shutdown and resuming them on next boot
-#              See http://libvirt.org
+#              See https://libvirt.org
 ### END INIT INFO
 
 # the following is chkconfig init header
@@ -24,7 +24,7 @@
 # chkconfig: 345 99 01
 # description:  This is a script for suspending active libvirt guests \
 #               on shutdown and resuming them on next boot \
-#               See http://libvirt.org
+#               See https://libvirt.org
 #
 
 exec @libexecdir@/libvirt-guests.sh "$@"
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
index 64a4c1129b..491ca62138 100644
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -7,7 +7,7 @@ After=time-sync.target
 After=libvirtd.service
 After=virt-guest-shutdown.target
 Documentation=man:libvirtd(8)
-Documentation=http://libvirt.org
+Documentation=https://libvirt.org
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/libvirt-guests
diff --git a/tools/virsh.c b/tools/virsh.c
index 527c1a4181..d1789f03ad 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -511,7 +511,7 @@ virshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
 {
     /* FIXME - list a copyright blurb, as in GNU programs?  */
     vshPrint(ctl, _("Virsh command line tool of libvirt %s\n"), VERSION);
-    vshPrint(ctl, _("See web site at %s\n\n"), "http://libvirt.org/");
+    vshPrint(ctl, _("See web site at %s\n\n"), "https://libvirt.org/");
 
     vshPrint(ctl, "%s", _("Compiled with support for:\n"));
     vshPrint(ctl, "%s", _(" Hypervisors:"));
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 9304ca5250..024d027699 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -249,7 +249,7 @@ Will print the current directory.
 is automatically run with the I parameter requested by the C<-c>
 option on the command line. The I parameter specifies how to
 connect to the hypervisor. The documentation page at
-L list the values supported, but the most
+L list the values supported, but the most
 common are:
 
 =over 4
@@ -275,7 +275,7 @@ connect to a local linux container
 To find the currently used URI, check the I command documented below.
 
 For remote access see the documentation page at
-L on how to make URIs.
+L on how to make URIs.
 The I<--readonly> option allows for read-only connection
 
 =item B
@@ -350,7 +350,7 @@ we are currently connected to. This includes a section on the host
 capabilities in terms of CPU and features, and a set of description
 for each kind of guest which can be virtualized. For a more complete
 description see:
-  L
+  L
 The XML also show the NUMA topology information if available.
 
 =item B [I] [I]
@@ -590,7 +590,7 @@ contain either host or guest CPU definition. The host CPU definition is the
  element and its contents as printed by B command. The
 guest CPU definition is the  element and its contents from domain XML
 definition. For more information on guest CPU definition see:
-L. If I<--error> is
+L. If I<--error> is
 specified, the command will return an error when the given CPU is
 incompatible with host CPU and a message providing more details about the
 incompatibility will be printed out.
@@ -813,7 +813,7 @@ inbound or outbound bandwidth. I is the same as
 in command I.  Values for I, I and I
 are expressed in kilobytes per second, while I is expressed in kilobytes
 in a single burst at I speed as described in the Network XML
-documentation at L.
+documentation at L.
 
 To clear inbound or outbound settings, use I<--inbound> or I<--outbound>
 respectfully with average value of zero.
@@ -1897,7 +1897,7 @@ order to comply with local firewall policies.
 
 =back
 
-See L for more details on
+See L for more details on
 migration URIs.
 
 Optional I overrides connection parameters used for automatically
@@ -2894,7 +2894,7 @@ is not available the processes will provide an exit code of 1.
 The following commands manipulate devices associated to domains.
 The I can be specified as a short integer, a name or a full UUID.
 To better understand the values allowed as options for the command
-reading the documentation at L on the
+reading the documentation at L on the
 format of the device sections to get the most accurate set of accepted values.
 
 =over 4
@@ -2905,7 +2905,7 @@ format of the device sections to get the most accurate set of accepted values.
 Attach a device to the domain, using a device definition in an XML
 file using a device definition element such as  or 
 as the top-level element.  See the documentation at
-L to learn about
+L to learn about
 libvirt XML format for a device.  If I<--config> is specified the
 command alters the persistent domain configuration with the device
 attach taking effect the next time libvirt starts the domain.
@@ -3049,7 +3049,7 @@ specified.  The other two I and I are optional, so
 are expressed in kilobytes per second, while I is expressed in
 kilobytes in a single burst at I speed as described in the
 Network XML documentation at
-L.
+L.
 
 B<--managed> is usable only for I type and tells libvirt
 that the interface should be managed, which means detached and reattached
@@ -3148,7 +3148,7 @@ Update the characteristics of a device associated with I,
 based on the device definition in an XML I.  The I<--force> option
 can be used to force device update, e.g., to eject a CD-ROM even if it is
 locked/mounted in the domain. See the documentation at
-L to learn about
+L to learn about
 libvirt XML format for a device.
 
 If I<--live> is specified, affect a running domain.
@@ -3214,7 +3214,7 @@ the host's hard disk controller where the guest's disk images live could
 cause the host system to lock up or reboot).
 
 For more information on node device definition see:
-L.
+L.
 
 Passthrough devices cannot be simultaneously used by the host and its
 guest domains, nor by multiple active guests at once.  If the
@@ -3317,7 +3317,7 @@ before the event.
 The following commands manipulate networks. Libvirt has the capability to
 define virtual networks which can then be used by domains and linked to
 actual network devices. For more detailed information about this feature
-see the documentation at L . Many
+see the documentation at L . Many
 of the commands for virtual networks are similar to the ones used for domains,
 but the way to name a virtual network is either by its name or UUID.
 
@@ -3332,7 +3332,7 @@ The I<--disable> option disable autostarting.
 
 Create a transient (temporary) virtual network from an
 XML I and instantiate (start) the network.
-See the documentation at L
+See the documentation at L
 to get a description of the XML network format used by libvirt.
 
 =item B I
@@ -3605,7 +3605,7 @@ capability to manage various storage solutions, including files, raw
 partitions, and domain-specific formats, used to provide the storage
 volumes visible as devices within virtual machines. For more detailed
 information about this feature, see the documentation at
-L . Many of the commands for
+L . Many of the commands for
 pools are similar to the ones used for domains.
 
 =over 4
@@ -4176,7 +4176,7 @@ The following commands manipulate "secrets" (e.g. passwords, passphrases and
 encryption keys).  Libvirt can store secrets independently from their use, and
 other objects (e.g. volumes or domains) can refer to the secrets for encryption
 or possibly other uses.  Secrets are identified using a UUID.  See
-L for documentation of the XML format
+L for documentation of the XML format
 used to represent properties of secrets.
 
 =over 4
@@ -4242,7 +4242,7 @@ disk, memory, and device state of a domain at a point-of-time, and save it
 for future use.  They have many uses, from saving a "clean" copy of an OS
 image to saving a domain's state before a potentially destructive operation.
 Snapshots are identified with a unique name.  See
-L for documentation of the XML format
+L for documentation of the XML format
 used to represent properties of snapshots.
 
 =over 4
@@ -4783,15 +4783,15 @@ Messages at level ERROR
 =back
 
 For further information about debugging options consult
-L
+L
 
 =back
 
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the mailing
-list L or bug tracker
-L.
+list L or bug tracker
+L.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 AUTHORS
@@ -4817,6 +4817,6 @@ PURPOSE
 =head1 SEE ALSO
 
 L, L, L, L,
-L
+L
 
 =cut
diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 6157ed2d7c..6b3426ef6f 100644
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -1231,7 +1231,7 @@ vshAdmShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
 {
     /* FIXME - list a copyright blurb, as in GNU programs?  */
     vshPrint(ctl, _("Virt-admin command line tool of libvirt %s\n"), VERSION);
-    vshPrint(ctl, _("See web site at %s\n\n"), "http://libvirt.org/");
+    vshPrint(ctl, _("See web site at %s\n\n"), "https://libvirt.org/");
 
     vshPrint(ctl, "%s", _("Compiled with support for:"));
 #ifdef WITH_LIBVIRTD
diff --git a/tools/virt-admin.pod b/tools/virt-admin.pod
index ef140824cb..3ddbbff934 100644
--- a/tools/virt-admin.pod
+++ b/tools/virt-admin.pod
@@ -456,15 +456,15 @@ Messages at level ERROR or above
 =back
 
 For further information about debugging options consult
-L
+L
 
 =back
 
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the mailing
-list L or bug tracker
-L.
+list L or bug tracker
+L.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 AUTHORS
@@ -488,6 +488,6 @@ PURPOSE
 =head1 SEE ALSO
 
 L, L, L,
-L
+L
 
 =cut
diff --git a/tools/virt-host-validate.pod b/tools/virt-host-validate.pod
index 9101141752..121bb7ed7a 100644
--- a/tools/virt-host-validate.pod
+++ b/tools/virt-host-validate.pod
@@ -46,8 +46,8 @@ Daniel P. Berrange
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list L or bug tracker
-L.
+mailing list L or bug tracker
+L.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
diff --git a/tools/virt-login-shell.pod b/tools/virt-login-shell.pod
index 9d61115417..1aaa1cfc7c 100644
--- a/tools/virt-login-shell.pod
+++ b/tools/virt-login-shell.pod
@@ -83,8 +83,8 @@ shell; for example, if libvirtd is not running.
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the mailing
-list L or bug tracker
-L.
+list L or bug tracker
+L.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 AUTHORS
@@ -107,6 +107,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-L, L
+L, L
 
 =cut
diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in
index 92df9ed379..206637abf0 100755
--- a/tools/virt-pki-validate.in
+++ b/tools/virt-pki-validate.in
@@ -2,7 +2,7 @@
 #
 # This shell script checks the TLS certificates and options needed
 # for the secure client/server support of libvirt as documented at
-# http://libvirt.org/remote.html#Remote_certificates
+# https://libvirt.org/remote.html#Remote_certificates
 #
 # Copyright (C) 2009-2013 Red Hat, Inc.
 #
@@ -166,7 +166,7 @@ if [ ! -f "$CA/cacert.pem" ]
 then
     echo the CA certificate $CA/cacert.pem is missing while it
     echo should be installed on both client and servers
-    echo "see http://libvirt.org/remote.html#Remote_TLS_CA"
+    echo "see https://libvirt.org/remote.html#Remote_TLS_CA"
     echo on how to install it
     exit 1
 fi
@@ -186,7 +186,7 @@ if [ "$ORG" = "" ]
 then
     echo the CA certificate $CA/cacert.pem does not define the organization
     echo it should probably regenerated
-    echo "see http://libvirt.org/remote.html#Remote_TLS_CA"
+    echo "see https://libvirt.org/remote.html#Remote_TLS_CA"
     echo on how to regenerate it
     exit 1
 fi
@@ -234,7 +234,7 @@ then
 else
     echo Did not find "$LIBVIRT/clientcert.pem" client certificate
     echo The machine cannot act as a client
-    echo "see http://libvirt.org/remote.html#Remote_TLS_client_certificates"
+    echo "see https://libvirt.org/remote.html#Remote_TLS_client_certificates"
     echo on how to regenerate it
     CLIENT=0
 fi
@@ -287,7 +287,7 @@ then
 else
     echo Did not find $LIBVIRT/servercert.pem server certificate
     echo The machine cannot act as a server
-    echo "see http://libvirt.org/remote.html#Remote_TLS_server_certificates"
+    echo "see https://libvirt.org/remote.html#Remote_TLS_server_certificates"
     echo on how to regenerate it
     SERVER=0
 fi
diff --git a/tools/virt-pki-validate.pod b/tools/virt-pki-validate.pod
index 5f04318f04..5d44973fdc 100644
--- a/tools/virt-pki-validate.pod
+++ b/tools/virt-pki-validate.pod
@@ -39,8 +39,8 @@ Richard Jones
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list L or bug tracker
-L.
+mailing list L or bug tracker
+L.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
@@ -56,6 +56,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-L, online PKI setup instructions L
+L, online PKI setup instructions L
 
 =cut
diff --git a/tools/virt-sanlock-cleanup.pod b/tools/virt-sanlock-cleanup.pod
index f80a2818da..41012566a1 100644
--- a/tools/virt-sanlock-cleanup.pod
+++ b/tools/virt-sanlock-cleanup.pod
@@ -27,8 +27,8 @@ Daniel Berrange
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list L or bug tracker
-L.
+mailing list L or bug tracker
+L.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
@@ -44,6 +44,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-L, online instructions L
+L, online instructions L
 
 =cut
diff --git a/tools/virt-xml-validate.pod b/tools/virt-xml-validate.pod
index 0a5b7db6e6..f8e67503fd 100644
--- a/tools/virt-xml-validate.pod
+++ b/tools/virt-xml-validate.pod
@@ -88,8 +88,8 @@ Daniel P.Berrange
 =head1 BUGS
 
 Report any bugs discovered to the libvirt community via the
-mailing list L or bug tracker
-L.
+mailing list L or bug tracker
+L.
 Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
@@ -106,6 +106,6 @@ PURPOSE
 
 =head1 SEE ALSO
 
-L, online XML format descriptions L
+L, online XML format descriptions L
 
 =cut
diff --git a/tools/wireshark/README.md b/tools/wireshark/README.md
index 9f4c9b6876..b7f40d0954 100644
--- a/tools/wireshark/README.md
+++ b/tools/wireshark/README.md
@@ -9,7 +9,7 @@ specification.
 
 See also:
 - http://www.google-melange.com/gsoc/project/google/gsoc2013/kawamuray/7001
-- http://wiki.qemu.org/Features/LibvirtWiresharkDissector
+- https://wiki.qemu.org/Features/LibvirtWiresharkDissector
 
 Installation
 =============