diff mbox series

[for-4.13] docs: update all URLs in man pages

Message ID EABA07C5-13F3-4D78-BDB9-21A4B5C5772E@citrix.com (mailing list archive)
State New, archived
Headers show
Series [for-4.13] docs: update all URLs in man pages | expand

Commit Message

Lars Kurth Oct. 3, 2019, 4:12 p.m. UTC
Specifically
* xen.org to xenproject.org
* http to https
* Replaced pages where page has moved
  (including on xen pages as well as external pages)
* Removed some URLs (e.g. downloads for Linux PV drivers)

Tested-by: Lars Kurth <lars.kurth@citrix.com>
Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
---
 docs/man/xen-pci-device-reservations.7.pod |  2 +-
 docs/man/xen-pv-channel.7.pod              |  2 +-
 docs/man/xen-vtpm.7.pod                    |  2 +-
 docs/man/xenstore-chmod.1.pod              |  4 ++--
 docs/man/xenstore-ls.1.pod                 |  4 ++--
 docs/man/xenstore-read.1.pod               |  4 ++--
 docs/man/xenstore-write.1.pod              |  4 ++--
 docs/man/xenstore.1.pod                    |  4 ++--
 docs/man/xentop.1.pod                      |  2 +-
 docs/man/xl-disk-configuration.5.pod       |  4 ++--
 docs/man/xl-network-configuration.5.pod    |  8 ++++----
 docs/man/xl-numa-placement.7.pod           |  4 ++--
 docs/man/xl.1.pod.in                       | 22 +++++++++++-----------
 docs/man/xl.cfg.5.pod.in                   | 20 ++++++++++----------
 docs/man/xl.conf.5.pod                     |  4 ++--
 docs/man/xlcpupool.cfg.5.pod               |  4 ++--
 16 files changed, 47 insertions(+), 47 deletions(-)

Comments

Jürgen Groß Oct. 4, 2019, 4:52 a.m. UTC | #1
On 03.10.19 18:12, Lars Kurth wrote:
> Specifically
> * xen.org to xenproject.org
> * http to https
> * Replaced pages where page has moved
>    (including on xen pages as well as external pages)
> * Removed some URLs (e.g. downloads for Linux PV drivers)
> 
> Tested-by: Lars Kurth <lars.kurth@citrix.com>
> Signed-off-by: Lars Kurth <lars.kurth@citrix.com>

Thanks for doing this!

Release-acked-by: Juergen Gross <jgross@suse.com>


Juergen
Andrew Cooper Oct. 4, 2019, 8:03 a.m. UTC | #2
On 03/10/2019 17:12, Lars Kurth wrote:
> Specifically
> * xen.org to xenproject.org
> * http to https
> * Replaced pages where page has moved
>   (including on xen pages as well as external pages)
> * Removed some URLs (e.g. downloads for Linux PV drivers)
>
> Tested-by: Lars Kurth <lars.kurth@citrix.com>
> Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
> ---
>  docs/man/xen-pci-device-reservations.7.pod |  2 +-
>  docs/man/xen-pv-channel.7.pod              |  2 +-
>  docs/man/xen-vtpm.7.pod                    |  2 +-
>  docs/man/xenstore-chmod.1.pod              |  4 ++--
>  docs/man/xenstore-ls.1.pod                 |  4 ++--
>  docs/man/xenstore-read.1.pod               |  4 ++--
>  docs/man/xenstore-write.1.pod              |  4 ++--
>  docs/man/xenstore.1.pod                    |  4 ++--
>  docs/man/xentop.1.pod                      |  2 +-
>  docs/man/xl-disk-configuration.5.pod       |  4 ++--
>  docs/man/xl-network-configuration.5.pod    |  8 ++++----
>  docs/man/xl-numa-placement.7.pod           |  4 ++--
>  docs/man/xl.1.pod.in                       | 22 +++++++++++-----------
>  docs/man/xl.cfg.5.pod.in                   | 20 ++++++++++----------
>  docs/man/xl.conf.5.pod                     |  4 ++--
>  docs/man/xlcpupool.cfg.5.pod               |  4 ++--
>  16 files changed, 47 insertions(+), 47 deletions(-)
>
> diff --git a/docs/man/xen-pci-device-reservations.7.pod b/docs/man/xen-pci-device-reservations.7.pod
> index 0df41bcd29..bc7398409c 100644
> --- a/docs/man/xen-pci-device-reservations.7.pod
> +++ b/docs/man/xen-pci-device-reservations.7.pod
> @@ -29,7 +29,7 @@ multiple Xen vendors using conflicting IDs.
>  
>  =item 3. The vendor is responsible for allocations within the range and should
>           try to record specific device IDs in PCI ID databases such as
> -         http://pciids.sourceforge.net and http//www.pcidatabase.com
> +         http://pci-ids.ucw.cz and https://devicehunt.com

https ?

Otherwise, LGTM.  Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Wei Liu Oct. 4, 2019, 8:12 a.m. UTC | #3
On Thu, Oct 03, 2019 at 04:12:30PM +0000, Lars Kurth wrote:
> Specifically
> * xen.org to xenproject.org
> * http to https
> * Replaced pages where page has moved
>   (including on xen pages as well as external pages)
> * Removed some URLs (e.g. downloads for Linux PV drivers)
> 
> Tested-by: Lars Kurth <lars.kurth@citrix.com>
> Signed-off-by: Lars Kurth <lars.kurth@citrix.com>

Acked-by: Wei Liu <wl@xen.org>


> ---
>  docs/man/xen-pci-device-reservations.7.pod |  2 +-
>  docs/man/xen-pv-channel.7.pod              |  2 +-
>  docs/man/xen-vtpm.7.pod                    |  2 +-
>  docs/man/xenstore-chmod.1.pod              |  4 ++--
>  docs/man/xenstore-ls.1.pod                 |  4 ++--
>  docs/man/xenstore-read.1.pod               |  4 ++--
>  docs/man/xenstore-write.1.pod              |  4 ++--
>  docs/man/xenstore.1.pod                    |  4 ++--
>  docs/man/xentop.1.pod                      |  2 +-
>  docs/man/xl-disk-configuration.5.pod       |  4 ++--
>  docs/man/xl-network-configuration.5.pod    |  8 ++++----
>  docs/man/xl-numa-placement.7.pod           |  4 ++--
>  docs/man/xl.1.pod.in                       | 22 +++++++++++-----------
>  docs/man/xl.cfg.5.pod.in                   | 20 ++++++++++----------
>  docs/man/xl.conf.5.pod                     |  4 ++--
>  docs/man/xlcpupool.cfg.5.pod               |  4 ++--
>  16 files changed, 47 insertions(+), 47 deletions(-)
> 
> diff --git a/docs/man/xen-pci-device-reservations.7.pod b/docs/man/xen-pci-device-reservations.7.pod
> index 0df41bcd29..bc7398409c 100644
> --- a/docs/man/xen-pci-device-reservations.7.pod
> +++ b/docs/man/xen-pci-device-reservations.7.pod
> @@ -29,7 +29,7 @@ multiple Xen vendors using conflicting IDs.
>  
>  =item 3. The vendor is responsible for allocations within the range and should
>           try to record specific device IDs in PCI ID databases such as
> -         http://pciids.sourceforge.net and http//www.pcidatabase.com
> +         http://pci-ids.ucw.cz and https://devicehunt.com

The first can be changed to use https too. I can do that when I commit
this patch.

Wei.
Wei Liu Oct. 4, 2019, 8:57 a.m. UTC | #4
On Thu, Oct 03, 2019 at 04:12:30PM +0000, Lars Kurth wrote:
> Specifically
> * xen.org to xenproject.org
> * http to https
> * Replaced pages where page has moved
>   (including on xen pages as well as external pages)
> * Removed some URLs (e.g. downloads for Linux PV drivers)
> 
> Tested-by: Lars Kurth <lars.kurth@citrix.com>
> Signed-off-by: Lars Kurth <lars.kurth@citrix.com>

Do you have a branch for this patch?

Wei.
Lars Kurth Oct. 7, 2019, 8:13 a.m. UTC | #5
On 04/10/2019, 09:57, "Wei Liu" <wl@xen.org> wrote:

    On Thu, Oct 03, 2019 at 04:12:30PM +0000, Lars Kurth wrote:
    > Specifically
    > * xen.org to xenproject.org
    > * http to https
    > * Replaced pages where page has moved
    >   (including on xen pages as well as external pages)
    > * Removed some URLs (e.g. downloads for Linux PV drivers)
    > 
    > Tested-by: Lars Kurth <lars.kurth@citrix.com>
    > Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
    
    Do you have a branch for this patch?
    
Unfortunately, not: I never created a personal copy of xen.git on xenbits
Really should do this
Lars
Wei Liu Oct. 7, 2019, 9:01 a.m. UTC | #6
On Mon, 7 Oct 2019 at 09:13, Lars Kurth <lars.kurth@citrix.com> wrote:
>
>
>
> On 04/10/2019, 09:57, "Wei Liu" <wl@xen.org> wrote:
>
>     On Thu, Oct 03, 2019 at 04:12:30PM +0000, Lars Kurth wrote:
>     > Specifically
>     > * xen.org to xenproject.org
>     > * http to https
>     > * Replaced pages where page has moved
>     >   (including on xen pages as well as external pages)
>     > * Removed some URLs (e.g. downloads for Linux PV drivers)
>     >
>     > Tested-by: Lars Kurth <lars.kurth@citrix.com>
>     > Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
>
>     Do you have a branch for this patch?
>
> Unfortunately, not: I never created a personal copy of xen.git on xenbits
> Really should do this

Please do. I couldn't reply this patch cleanly. Not sure why git
wasn't happy about it.

Wei.

> Lars
>
>
>
Lars Kurth Oct. 7, 2019, 11:07 a.m. UTC | #7
On 07/10/2019, 10:01, "Wei Liu" <wl@xen.org> wrote:

    On Mon, 7 Oct 2019 at 09:13, Lars Kurth <lars.kurth@citrix.com> wrote:
    >
    >
    >
    > On 04/10/2019, 09:57, "Wei Liu" <wl@xen.org> wrote:
    >
    >     On Thu, Oct 03, 2019 at 04:12:30PM +0000, Lars Kurth wrote:
    >     > Specifically
    >     > * xen.org to xenproject.org
    >     > * http to https
    >     > * Replaced pages where page has moved
    >     >   (including on xen pages as well as external pages)
    >     > * Removed some URLs (e.g. downloads for Linux PV drivers)
    >     >
    >     > Tested-by: Lars Kurth <lars.kurth@citrix.com>
    >     > Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
    >
    >     Do you have a branch for this patch?
    >
    > Unfortunately, not: I never created a personal copy of xen.git on xenbits
    > Really should do this
    
    Please do. I couldn't reply this patch cleanly. Not sure why git
    wasn't happy about it.
    
    Wei.
    
Hi Wei,

I fixed the missing http link and rebased to staging
See http://xenbits.xen.org/gitweb/?p=people/larsk/xen.git;a=commit;h=088c2781795c5924cd1fc7f11f3d31154d866799 & http://xenbits.xen.org/gitweb/?p=people/larsk/xen.git;a=shortlog;h=refs/heads/docs-changes-4.13-v2 

When rebasing there was no conflict, so not sure why it didn't apply for you

Regards
Lars
Jürgen Groß Oct. 7, 2019, 11:10 a.m. UTC | #8
On 07.10.19 13:07, Lars Kurth wrote:
> 
> 
> On 07/10/2019, 10:01, "Wei Liu" <wl@xen.org> wrote:
> 
>      On Mon, 7 Oct 2019 at 09:13, Lars Kurth <lars.kurth@citrix.com> wrote:
>      >
>      >
>      >
>      > On 04/10/2019, 09:57, "Wei Liu" <wl@xen.org> wrote:
>      >
>      >     On Thu, Oct 03, 2019 at 04:12:30PM +0000, Lars Kurth wrote:
>      >     > Specifically
>      >     > * xen.org to xenproject.org
>      >     > * http to https
>      >     > * Replaced pages where page has moved
>      >     >   (including on xen pages as well as external pages)
>      >     > * Removed some URLs (e.g. downloads for Linux PV drivers)
>      >     >
>      >     > Tested-by: Lars Kurth <lars.kurth@citrix.com>
>      >     > Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
>      >
>      >     Do you have a branch for this patch?
>      >
>      > Unfortunately, not: I never created a personal copy of xen.git on xenbits
>      > Really should do this
>      
>      Please do. I couldn't reply this patch cleanly. Not sure why git
>      wasn't happy about it.
>      
>      Wei.
>      
> Hi Wei,
> 
> I fixed the missing http link and rebased to staging
> See http://xenbits.xen.org/gitweb/?p=people/larsk/xen.git;a=commit;h=088c2781795c5924cd1fc7f11f3d31154d866799 & http://xenbits.xen.org/gitweb/?p=people/larsk/xen.git;a=shortlog;h=refs/heads/docs-changes-4.13-v2
> 
> When rebasing there was no conflict, so not sure why it didn't apply for you

My Release-acked-by: still stands.


Juergen
Wei Liu Oct. 7, 2019, 11:25 a.m. UTC | #9
On Mon, Oct 07, 2019 at 11:07:03AM +0000, Lars Kurth wrote:
> 
> 
> On 07/10/2019, 10:01, "Wei Liu" <wl@xen.org> wrote:
> 
>     On Mon, 7 Oct 2019 at 09:13, Lars Kurth <lars.kurth@citrix.com> wrote:
>     >
>     >
>     >
>     > On 04/10/2019, 09:57, "Wei Liu" <wl@xen.org> wrote:
>     >
>     >     On Thu, Oct 03, 2019 at 04:12:30PM +0000, Lars Kurth wrote:
>     >     > Specifically
>     >     > * xen.org to xenproject.org
>     >     > * http to https
>     >     > * Replaced pages where page has moved
>     >     >   (including on xen pages as well as external pages)
>     >     > * Removed some URLs (e.g. downloads for Linux PV drivers)
>     >     >
>     >     > Tested-by: Lars Kurth <lars.kurth@citrix.com>
>     >     > Signed-off-by: Lars Kurth <lars.kurth@citrix.com>
>     >
>     >     Do you have a branch for this patch?
>     >
>     > Unfortunately, not: I never created a personal copy of xen.git on xenbits
>     > Really should do this
>     
>     Please do. I couldn't reply this patch cleanly. Not sure why git
>     wasn't happy about it.
>     
>     Wei.
>     
> Hi Wei,
> 
> I fixed the missing http link and rebased to staging
> See http://xenbits.xen.org/gitweb/?p=people/larsk/xen.git;a=commit;h=088c2781795c5924cd1fc7f11f3d31154d866799 & http://xenbits.xen.org/gitweb/?p=people/larsk/xen.git;a=shortlog;h=refs/heads/docs-changes-4.13-v2 

Thanks. I have pushed your patch.

> 
> When rebasing there was no conflict, so not sure why it didn't apply for you
> 

I found that git sometimes doesn't handle our doc changes well. Not sure
why. Never got to the bottom of it.

Wei.

> Regards
> Lars
>
diff mbox series

Patch

diff --git a/docs/man/xen-pci-device-reservations.7.pod b/docs/man/xen-pci-device-reservations.7.pod
index 0df41bcd29..bc7398409c 100644
--- a/docs/man/xen-pci-device-reservations.7.pod
+++ b/docs/man/xen-pci-device-reservations.7.pod
@@ -29,7 +29,7 @@  multiple Xen vendors using conflicting IDs.
 
 =item 3. The vendor is responsible for allocations within the range and should
          try to record specific device IDs in PCI ID databases such as
-         http://pciids.sourceforge.net and http//www.pcidatabase.com
+         http://pci-ids.ucw.cz and https://devicehunt.com
 
 =back
 
diff --git a/docs/man/xen-pv-channel.7.pod b/docs/man/xen-pv-channel.7.pod
index 07898f6dde..ab4577d1da 100644
--- a/docs/man/xen-pv-channel.7.pod
+++ b/docs/man/xen-pv-channel.7.pod
@@ -186,4 +186,4 @@  that no-one's name clashes with yours, please add yours to this list.
     N: org.xenproject.guest.clipboard.0.1
     C: David Scott <dave.scott@citrix.com>
     D: Share clipboard data via an in-guest agent. See:
-       http://wiki.xenproject.org/wiki/Clipboard_sharing_protocol
+       https://wiki.xenproject.org/wiki/Clipboard_sharing_protocol
diff --git a/docs/man/xen-vtpm.7.pod b/docs/man/xen-vtpm.7.pod
index 1d8185616a..d033072584 100644
--- a/docs/man/xen-vtpm.7.pod
+++ b/docs/man/xen-vtpm.7.pod
@@ -380,4 +380,4 @@  C<hwinitpcrs=5,12-16> will copy pcrs 5, 12, 13, 14, 15, and 16.
 
 =head1 REFERENCES
 
-Berlios TPM Emulator: L<http://tpm-emulator.berlios.de/>
+Berlios TPM Emulator: L<https://github.com/PeterHuewe/tpm-emulator>
diff --git a/docs/man/xenstore-chmod.1.pod b/docs/man/xenstore-chmod.1.pod
index cb1dc2ef82..d76f34723d 100644
--- a/docs/man/xenstore-chmod.1.pod
+++ b/docs/man/xenstore-chmod.1.pod
@@ -58,5 +58,5 @@  Apply the permissions to the key and all its I<parents>.
 
 =head1 BUGS
 
-Send bugs to xen-devel@lists.xen.org, see
-http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports.
+Send bugs to xen-devel@lists.xenproject.org, see
+https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project on how to send bug reports.
diff --git a/docs/man/xenstore-ls.1.pod b/docs/man/xenstore-ls.1.pod
index e04a509fa7..8dac931e94 100644
--- a/docs/man/xenstore-ls.1.pod
+++ b/docs/man/xenstore-ls.1.pod
@@ -58,5 +58,5 @@  Connect to the Xenstore daemon using a local socket only.
 
 =head1 BUGS
 
-Send bugs to xen-devel@lists.xen.org, see
-http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports.
+Send bugs to xen-devel@lists.xenproject.org, see
+https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project on how to send bug reports.
diff --git a/docs/man/xenstore-read.1.pod b/docs/man/xenstore-read.1.pod
index 5496de17a8..f5a7bb7e46 100644
--- a/docs/man/xenstore-read.1.pod
+++ b/docs/man/xenstore-read.1.pod
@@ -28,5 +28,5 @@  Read raw value, skip escaping non-printable characters (\x..).
 
 =head1 BUGS
 
-Send bugs to xen-devel@lists.xen.org, see
-http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports.
+Send bugs to xen-devel@lists.xenproject.org, see
+https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project on how to send bug reports.
diff --git a/docs/man/xenstore-write.1.pod b/docs/man/xenstore-write.1.pod
index 78cbbe1a69..d1b011236a 100644
--- a/docs/man/xenstore-write.1.pod
+++ b/docs/man/xenstore-write.1.pod
@@ -25,5 +25,5 @@  Write raw value, skip parsing escaped characters (\x..).
 
 =head1 BUGS
 
-Send bugs to xen-devel@lists.xen.org, see
-http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports.
+Send bugs to xen-devel@lists.xenproject.org, see
+https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project on how to send bug reports.
diff --git a/docs/man/xenstore.1.pod b/docs/man/xenstore.1.pod
index dd8f80647d..ab9fb4a79c 100644
--- a/docs/man/xenstore.1.pod
+++ b/docs/man/xenstore.1.pod
@@ -48,5 +48,5 @@  Add or modify keys and values.
 
 =head1 BUGS
 
-Send bugs to xen-devel@lists.xen.org, see
-http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports.
+Send bugs to xen-devel@lists.xenproject.org, see
+https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project on how to send bug reports.
diff --git a/docs/man/xentop.1.pod b/docs/man/xentop.1.pod
index 1d0eb504f6..126f43d2f3 100644
--- a/docs/man/xentop.1.pod
+++ b/docs/man/xentop.1.pod
@@ -101,7 +101,7 @@  Written by Judy Fischbach, David Hendricks, and Josh Triplett
 
 =head1 REPORTING BUGS
 
-Report bugs to <xen-devel@lists.xen.org>.
+Report bugs to <xen-devel@lists.xenproject.org>.
 
 =head1 COPYRIGHT
 
diff --git a/docs/man/xl-disk-configuration.5.pod b/docs/man/xl-disk-configuration.5.pod
index 7965d5dd73..46feedb95e 100644
--- a/docs/man/xl-disk-configuration.5.pod
+++ b/docs/man/xl-disk-configuration.5.pod
@@ -292,7 +292,7 @@  networking subsystem.  This can cause crashes when using certain
 backends with certain underlying storage.
 
 See:
- L<http://lists.xen.org/archives/html/xen-devel/2012-12/msg01154.html>
+ L<https://lists.xenproject.org/archives/html/xen-devel/2012-12/msg01154.html>
 
 For this reason, (this version of) the Xen libxl toolstack disables
 O_DIRECT when using the qemu-based Xen PV backend (C<qdisk>).
@@ -354,7 +354,7 @@  file.
 =item B<colo>
 
 Enable COLO HA for disk. For better understanding block replication on
-QEMU, please refer to: L<http://wiki.qemu.org/Features/BlockReplication>
+QEMU, please refer to: L<https://wiki.qemu.org/Features/BlockReplication>
 Note that the COLO configuration settings should be considered unstable.
 They may change incompatibly in future versions of Xen.
 
diff --git a/docs/man/xl-network-configuration.5.pod b/docs/man/xl-network-configuration.5.pod
index e9ac3c5b9e..0ac24c4a18 100644
--- a/docs/man/xl-network-configuration.5.pod
+++ b/docs/man/xl-network-configuration.5.pod
@@ -43,7 +43,7 @@  six groups of two hexadecimal digits, separated by colons (:).
 
 The default if this keyword is not specified is to be automatically
 generate a MAC address inside the space assigned to Xen's
-L<Organizationally Unique Identifier|http://en.wikipedia.org/wiki/Organizationally_Unique_Identifier> (00:16:3e).
+L<Organizationally Unique Identifier|https://en.wikipedia.org/wiki/Organizationally_Unique_Identifier> (00:16:3e).
 
 If you are choosing a MAC address then it is strongly recommend to
 follow one of the following strategies:
@@ -57,7 +57,7 @@  bit (bit 2 of the first byte) and clear the multicast bit (bit 1
 of the first byte). In other words the first byte should have the
 bit pattern xxxxxx10 (where x is a randomly generated bit) and the
 remaining 5 bytes are randomly generated See
-[http://en.wikipedia.org/wiki/MAC_address] for more details the
+[https://en.wikipedia.org/wiki/MAC_address] for more details the
 structure of a MAC address.
 
 
@@ -87,7 +87,7 @@  bits of randomness than using the Xen OUI.
 
 Specifies the name of the network bridge which this VIF should be
 added to. The default is C<xenbr0>. The bridge must be configured using
-your distribution's network configuration tools. See the L<wiki|http://wiki.xen.org/wiki/HostConfiguration/Networking>
+your distribution's network configuration tools. See the L<wiki|https://wiki.xenproject.org/wiki/Network_Configuration_Examples_(Xen_4.1%2B)>
 for guidance and examples.
 
 
@@ -95,7 +95,7 @@  for guidance and examples.
 
 Specifies the name of the network interface which has an IP and which
 is in the network the VIF should communicate with. This is used in the host
-by the vif-route hotplug script. See L<wiki|http://wiki.xen.org/wiki/Vif-route> for guidance and
+by the vif-route hotplug script. See L<wiki|https://wiki.xenproject.org/wiki/Vif-route> for guidance and
 examples.
 
 NOTE: netdev is a deprecated alias of this option.
diff --git a/docs/man/xl-numa-placement.7.pod b/docs/man/xl-numa-placement.7.pod
index ae8330207e..802f33060b 100644
--- a/docs/man/xl-numa-placement.7.pod
+++ b/docs/man/xl-numa-placement.7.pod
@@ -23,7 +23,7 @@  running memory-intensive workloads on a shared host. In fact, the cost
 of accessing non node-local memory locations is very high, and the
 performance degradation is likely to be noticeable.
 
-For more information, have a look at the L<Xen NUMA Introduction|http://wiki.xen.org/wiki/Xen_NUMA_Introduction>
+For more information, have a look at the L<Xen NUMA Introduction|https://wiki.xenproject.org/wiki/Xen_on_NUMA_Machines>
 page on the Wiki.
 
 
@@ -58,7 +58,7 @@  also goes under the name of vCPU pinning, and can be done through the
 "cpus=" option in the config file (more about this below). Another option
 is to pool together the pCPUs spanning the node and put the domain in
 such a I<cpupool> with the "pool=" config option (as documented in our
-L<Wiki|http://wiki.xen.org/wiki/Cpupools_Howto>).
+L<Wiki|https://wiki.xenproject.org/wiki/Cpupools_Howto>).
 
 In both the above cases, the domain will not be able to execute outside
 the specified set of pCPUs for any reasons, even if all those pCPUs are
diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
index 2f7375ed0a..838ee0582f 100644
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
@@ -879,7 +879,7 @@  Clears Xen's message buffer.
 
 Print information about the Xen host in I<name : value> format.  When
 reporting a Xen bug, please provide this information as part of the
-bug report. See I<http://wiki.xen.org/xenwiki/ReportingBugs> on how to
+bug report. See I<https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project> on how to
 report Xen bugs.
 
 Sample output looks as follows:
@@ -1721,7 +1721,7 @@  permitted. Some example of what you can do using XSM/FLASK:
    domains.
 
 You can find more details on how to use FLASK and an example security
-policy here: L<http://xenbits.xen.org/docs/unstable/misc/xsm-flask.txt>
+policy here: L<https://xenbits.xenproject.org/docs/unstable/misc/xsm-flask.txt>
 
 =over 4
 
@@ -1749,7 +1749,7 @@  Intel Haswell and later server platforms offer shared resource monitoring
 and control technologies. The availability of these technologies and the
 hardware capabilities can be shown with B<psr-hwinfo>.
 
-See L<http://xenbits.xen.org/docs/unstable/misc/xl-psr.html> for more
+See L<https://xenbits.xenproject.org/docs/unstable/misc/xl-psr.html> for more
 information.
 
 =over 4
@@ -1834,7 +1834,7 @@  and data) are mutually exclusive. There is no CDP support on L2 so far.
 =item B<psr-cat-set> [I<OPTIONS>] I<domain-id> I<cbm>
 
 Set cache capacity bitmasks(CBM) for a domain. For how to specify I<cbm>
-please refer to L<http://xenbits.xen.org/docs/unstable/misc/xl-psr.html>.
+please refer to L<https://xenbits.xenproject.org/docs/unstable/misc/xl-psr.html>.
 
 B<OPTIONS>
 
@@ -1890,7 +1890,7 @@  throttling value (THRTL) for the domain.
 =item B<psr-mba-set> [I<OPTIONS>] I<domain-id> I<thrtl>
 
 Set throttling value (THRTL) for a domain. For how to specify I<thrtl>
-please refer to L<http://xenbits.xen.org/docs/unstable/misc/xl-psr.html>.
+please refer to L<https://xenbits.xenproject.org/docs/unstable/misc/xl-psr.html>.
 
 B<OPTIONS>
 
@@ -1940,16 +1940,16 @@  The following man pages:
 L<xl.cfg(5)>, L<xlcpupool.cfg(5)>, L<xentop(1)>, L<xl-disk-configuration(5)>
 L<xl-network-configuration(5)>
 
-And the following documents on the xen.org website:
+And the following documents on the xenproject.org website:
 
-L<http://xenbits.xen.org/docs/unstable/misc/xsm-flask.txt>
-L<http://xenbits.xen.org/docs/unstable/misc/xl-psr.html>
+L<https://xenbits.xenproject.org/docs/unstable/misc/xsm-flask.txt>
+L<https://xenbits.xenproject.org/docs/unstable/misc/xl-psr.html>
 
 For systems that don't automatically bring the CPU online:
 
-L<http://wiki.xen.org/wiki/Paravirt_Linux_CPU_Hotplug>
+L<https://wiki.xenproject.org/wiki/Paravirt_Linux_CPU_Hotplug>
 
 =head1 BUGS
 
-Send bugs to xen-devel@lists.xen.org, see
-http://wiki.xen.org/xenwiki/ReportingBugs on how to send bug reports.
+Send bugs to xen-devel@lists.xenproject.org, see
+https://wiki.xenproject.org/wiki/Reporting_Bugs_against_Xen_Project on how to send bug reports.
diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in
index e71b3b411d..f1a2d41286 100644
--- a/docs/man/xl.cfg.5.pod.in
+++ b/docs/man/xl.cfg.5.pod.in
@@ -691,7 +691,7 @@  Specify the backend domain name or id, defaults to dom0.
 Creates a Xen pvcalls connection to handle pvcalls requests from
 frontend to backend. It can be used as an alternative networking model.
 For more information about the protocol, see
-https://xenbits.xen.org/docs/unstable/misc/pvcalls.html.
+https://xenbits.xenproject.org/docs/unstable/misc/pvcalls.html.
 
 =item B<vfb=[ "VFB_SPEC_STRING", "VFB_SPEC_STRING", ...]>
 
@@ -1139,7 +1139,7 @@  to initialize the graphics card.
 
 Most graphics adapters require vendor specific tweaks for properly
 working graphics passthrough. See the XenVGAPassthroughTestedAdapters
-L<http://wiki.xen.org/wiki/XenVGAPassthroughTestedAdapters> wiki page
+L<https://wiki.xenproject.org/wiki/XenVGAPassthroughTestedAdapters> wiki page
 for graphics cards currently supported by B<gfx_passthru>.
 
 B<gfx_passthru> is currently supported both with the qemu-xen-traditional
@@ -1182,7 +1182,7 @@  graphics card, and VNC output is available from the QEMU-emulated
 primary adapter.
 
 More information about the Xen B<gfx_passthru> feature is available
-on the XenVGAPassthrough L<http://wiki.xen.org/wiki/XenVGAPassthrough>
+on the XenVGAPassthrough L<https://wiki.xenproject.org/wiki/XenVGAPassthrough>
 wiki page.
 
 =item B<rdm_mem_boundary=MBYTES>
@@ -1565,7 +1565,7 @@  concurrently use it. This requires a virtualization-aware OP-TEE for
 this to work.
 
 You can refer to
-L<OP-TEE documentation|https://optee.readthedocs.io/architecture/virtualization.html>
+L<OP-TEE documentation|https://optee.readthedocs.io/en/latest/architecture/virtualization.html>
 for more information about how to enable and configure virtualization support
 in OP-TEE.
 
@@ -1951,7 +1951,7 @@  xend: [ "1:ecx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0,edx=xx0xxxxxxxxxxxxxxxxxxxxxxxxx
 libxl: "host,tm=0,sse3=0"
 
 More info about the CPUID instruction can be found in the processor manuals,
-and on Wikipedia: L<http://en.wikipedia.org/wiki/CPUID>
+and on Wikipedia: L<https://en.wikipedia.org/wiki/CPUID>
 
 =item B<acpi_firmware="STRING">
 
@@ -2000,7 +2000,7 @@  Do not provide a VM generation ID.
 =back
 
 See also "Virtual Machine Generation ID" by Microsoft:
-L<http://www.microsoft.com/en-us/download/details.aspx?id=30707>
+L<https://docs.microsoft.com/en-us/windows/win32/hyperv_v2/virtual-machine-generation-identifier>
 
 =back 
 
@@ -2134,8 +2134,8 @@  availability of suitable drivers) to make use of paravirtualisation
 features such as disk and network devices etc. Enabling these drivers
 improves performance and is strongly recommended when available. PV
 drivers are available for various Operating Systems including HVM
-Linux L<http://wiki.xen.org/wiki/XenLinuxPVonHVMdrivers> and Microsoft
-Windows L<http://wiki.xen.org/wiki/XenWindowsGplPv>.
+Linux (out-of-the-box) and Microsoft
+Windows L<https://xenproject.org/windows-pv-drivers/>.
 
 Setting B<xen_platform_pci=0> with the default device_model "qemu-xen"
 requires at least QEMU 1.6.
@@ -2800,7 +2800,7 @@  F<@XEN_DUMP_DIR@/NAME>
 
 This document may contain items which require further
 documentation. Patches to improve incomplete items (or any other item)
-are gratefully received on the xen-devel@lists.xen.org mailing
-list. Please see L<http://wiki.xen.org/wiki/SubmittingXenPatches> for
+are gratefully received on the xen-devel@lists.xenproject.org mailing
+list. Please see L<https://wiki.xenproject.org/wiki/Submitting_Xen_Project_Patches> for
 information on how to submit a patch to Xen.
 
diff --git a/docs/man/xl.conf.5.pod b/docs/man/xl.conf.5.pod
index b1bde7d657..4cc05d8607 100644
--- a/docs/man/xl.conf.5.pod
+++ b/docs/man/xl.conf.5.pod
@@ -133,7 +133,7 @@  Default: C</etc/xen/scripts/colo-proxy-setup>
 
 Configures the default output format used by xl when printing "machine
 readable" information. The default is to use the C<JSON>
-L<http://www.json.org/> syntax. However for compatibility with the
+L<https://www.json.org/> syntax. However for compatibility with the
 previous C<xm> toolstack this can be configured to use the old C<SXP>
 (S-Expression-like) syntax instead.
 
@@ -212,6 +212,6 @@  check that the required affinity has taken effect.
 
 =item L<xl.cfg(5)>
 
-=item http://www.json.org/
+=item https://www.json.org/
 
 =back
diff --git a/docs/man/xlcpupool.cfg.5.pod b/docs/man/xlcpupool.cfg.5.pod
index 792cf4f425..3c9ddf7958 100644
--- a/docs/man/xlcpupool.cfg.5.pod
+++ b/docs/man/xlcpupool.cfg.5.pod
@@ -127,7 +127,7 @@  XXX).  However all options are included here whether or not they are
 fully documented.
 
 Patches to improve incomplete items (or any other item) would be
-gratefully received on the xen-devel@lists.xen.org mailing
-list. Please see L<http://wiki.xen.org/wiki/SubmittingXenPatches> for
+gratefully received on the xen-devel@lists.xenproject.org mailing
+list. Please see L<https://wiki.xenproject.org/wiki/Submitting_Xen_Project_Patches> for
 information on how to submit a patch to Xen.