diff --git a/doc/html/configurator.easy.html.in b/doc/html/configurator.easy.html.in
index 162a86f02a261963bf1c5ec06206f5474d900ef3..0f9982c91051f02a1cdb6af96eedab3822c97e13 100644
--- a/doc/html/configurator.easy.html.in
+++ b/doc/html/configurator.easy.html.in
@@ -5,7 +5,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 Written by Morris Jette <jette1@llnl.gov> and Danny Auble <da@llnl.gov>
 
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -240,7 +240,7 @@ file. It will appear on your web browser. Save the file in text format
 as <I>slurm.conf</I> for use by SLURM.
 
 <P>For more information about SLURM, see
-<A HREF="http://www.schedmd.com/slurmdocs/slurm.html">http://www.schedmd.com/slurmdocs/slurm.html</A>
+<A HREF="http://slurm.schedmd.com/slurm.html">http://slurm.schedmd.com/slurm.html</A>
 
 <H2>Control Machines</H2>
 Define the hostname of the computer on which the SLURM controller and
diff --git a/doc/html/configurator.html.in b/doc/html/configurator.html.in
index 9dd3bd15b72a27dc9424cca78347bd328f3a49b1..a61647be938234c54bb8d35fe7718be551bee0b2 100644
--- a/doc/html/configurator.html.in
+++ b/doc/html/configurator.html.in
@@ -5,7 +5,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 Written by Morris Jette <jette1@llnl.gov> and Danny Auble <da@llnl.gov>
 
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -348,7 +348,7 @@ file. It will appear on your web browser. Save the file in text format
 as <I>slurm.conf</I> for use by SLURM.
 
 <P>For more information about SLURM, see
-<A HREF="http://www.schedmd.com/slurmdocs/slurm.html">http://www.schedmd.com/slurmdocs/slurm.html</A>
+<A HREF="http://slurm.schedmd.com/slurm.html">http://slurm.schedmd.com/slurm.html</A>
 
 <H2>Control Machines</H2>
 Define the hostname of the computer on which the SLURM controller and
diff --git a/doc/html/download.shtml b/doc/html/download.shtml
index 258a21a3f4ca8f0647aa648695045846e0d8a90c..6c74362bee88d300484c037d8f03b8da625e6991 100644
--- a/doc/html/download.shtml
+++ b/doc/html/download.shtml
@@ -81,7 +81,7 @@ Download it from <a href="http://www.openssl.org/">http://www.openssl.org/</a>.<
 is an implementation of <a href="http://www.gridforum.org/">Open Grid Forum</a>
 <a href="http://www.drmaa.org/">DRMAA 1.0</a> (Distributed Resource Management Application API)
 <a href="http://www.ogf.org/documents/GFD.133.pdf">specification</a> for submission
-and control of jobs to <href="http://www.schedmd.com/slurmdocs/">SLURM</a>.
+and control of jobs to <href="http://slurm.schedmd.com">SLURM</a>.
 Using DRMAA, grid applications builders, portal developers and ISVs can use 
 the same high-level API to link their software with different cluster/resource
 management systems.</li><br>
diff --git a/doc/html/slurm_ug_cfp.shtml b/doc/html/slurm_ug_cfp.shtml
index 45212c8ebeeb843f8c7944f9956bb505ac46af26..3692fcc3119ba6faf2327e71efe8f472847ebe82 100644
--- a/doc/html/slurm_ug_cfp.shtml
+++ b/doc/html/slurm_ug_cfp.shtml
@@ -12,7 +12,7 @@ will be held in Phoenix, Arizona, USA on September 22 and 23, 2011.</p>
 
 <p>This international event is opened to everyone who wants to:
 <ul>
-<li>Learn more about <a href="http://www.schedmd.com/slurmdocs/">
+<li>Learn more about <a href="http://slurm.schedmd.com/">
 SLURM</a>, a highly scalable Resource Manager and Job Scheduler</li>
 <li>Share their knowledge and experience with other users and administrators</li>
 <li>Get detailed informations about the latest features and developments</li>
diff --git a/doc/man/man1/sacct.1 b/doc/man/man1/sacct.1
index 926f12802d7e9d884b1a2962a41df91bf0682656..952de08874bbed3e429ef5b23355ef11ff737d9a 100644
--- a/doc/man/man1/sacct.1
+++ b/doc/man/man1/sacct.1
@@ -817,7 +817,7 @@ Copyright (C) 2008\-2009 Lawrence Livermore National Security. Produced at Lawre
 DISCLAIMER). CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index abb24b495662a27a7a3cd29ad65081fe641fa5b8..12d31914477a0a8fa5fe856570b0153e84cb01e2 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -1795,7 +1795,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 058a825babe1cc7b70b7a56c4ab4e5afaa74b4e8..ed2cecaf6ee309426ba5e6399d82e8eaf054801e 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -24,7 +24,7 @@ user's default shell.
 The following document describes the the influence of various options on the
 allocation of cpus to jobs and tasks.
 .br
-http://www.schedmd.com/slurmdocs/cpu_management.html
+http://slurm.schedmd.com/cpu_management.html
 
 NOTE: The salloc logic includes support to save and restore the terminal line
 settings and is designed to be executed in the foreground. If you need to
@@ -522,7 +522,7 @@ nodes. The optional second distribution method (after the ":")
 controls the distribution of resources across sockets within a node.
 Note that with select/cons_res, the number of cpus allocated on each
 socket and node may be different. Refer to
-http://www.schedmd.com/slurmdocs/mc_support.html
+http://slurm.schedmd.com/mc_support.html
 for more information on resource allocation, assignment of tasks to
 nodes, and binding of tasks to CPUs.
 .RS
@@ -559,11 +559,11 @@ followed by an optional specification of the task distribution scheme
 within a block of tasks and between the blocks of tasks.  For more
 details (including examples and diagrams), please see
 .br
-http://www.schedmd.com/slurmdocs/mc_support.html
+http://slurm.schedmd.com/mc_support.html
 .br
 and
 .br
-http://www.schedmd.com/slurmdocs/dist_plane.html
+http://slurm.schedmd.com/dist_plane.html
 .TP
 .B arbitrary
 The arbitrary method of distribution will allocate processes in\-order
@@ -1356,7 +1356,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sattach.1 b/doc/man/man1/sattach.1
index 17508a34448082416059917ec9fd7c332bdf1f31..67d3a8f39c5240313189bc7594c8e2a7d468b2d0 100644
--- a/doc/man/man1/sattach.1
+++ b/doc/man/man1/sattach.1
@@ -96,7 +96,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index a5a93b349b93f0c21ae77ea98304e28c41a3bff6..435e203b76ea78f5e9e47a29d709c3864a59a79d 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -28,7 +28,7 @@ allocated nodes.
 The following document describes the the influence of various options on the 
 allocation of cpus to jobs and tasks. 
 .br
-http://www.schedmd.com/slurmdocs/cpu_management.html
+http://slurm.schedmd.com/cpu_management.html
 
 .SH "OPTIONS"
 .LP
@@ -580,7 +580,7 @@ nodes. The optional second distribution method (after the ":")
 controls the distribution of resources across sockets within a node.
 Note that with select/cons_res, the number of cpus allocated on each
 socket and node may be different. Refer to
-http://www.schedmd.com/slurmdocs/mc_support.html
+http://slurm.schedmd.com/mc_support.html
 for more information on resource allocation, assignment of tasks to
 nodes, and binding of tasks to CPUs.
 .RS
@@ -617,11 +617,11 @@ followed by an optional specification of the task distribution scheme
 within a block of tasks and between the blocks of tasks.  For more
 details (including examples and diagrams), please see
 .br
-http://www.schedmd.com/slurmdocs/mc_support.html
+http://slurm.schedmd.com/mc_support.html
 .br
 and
 .br
-http://www.schedmd.com/slurmdocs/dist_plane.html
+http://slurm.schedmd.com/dist_plane.html
 .TP
 .B arbitrary
 The arbitrary method of distribution will allocate processes in\-order
@@ -1533,7 +1533,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sbcast.1 b/doc/man/man1/sbcast.1
index e38d6f93a97eca9e53328a5358d5c0b2480802b5..0d0f1f257d4352ed2c826cfc82b6714f3288b1ab 100644
--- a/doc/man/man1/sbcast.1
+++ b/doc/man/man1/sbcast.1
@@ -109,7 +109,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/scancel.1 b/doc/man/man1/scancel.1
index 9bac0d7de3e4f092c597ef454489dac1ac14d6ca..ab6023567af31e99eb7f1dee289934b20636084a 100644
--- a/doc/man/man1/scancel.1
+++ b/doc/man/man1/scancel.1
@@ -231,7 +231,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1
index 6db0770b1263f9fefc7d7ddbecadf5dbed368790..2251fb30462a72df78144e7d9d19c09d57e3d801 100644
--- a/doc/man/man1/scontrol.1
+++ b/doc/man/man1/scontrol.1
@@ -1491,7 +1491,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sinfo.1 b/doc/man/man1/sinfo.1
index 460f8f30f443771ca574424d2258a314665b8587..f54a373c100f3f0f7e93ede8708944390d50bf6e 100644
--- a/doc/man/man1/sinfo.1
+++ b/doc/man/man1/sinfo.1
@@ -580,7 +580,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/slurm.1 b/doc/man/man1/slurm.1
index 7ba4eeef33824c69802e33175b6dcd5a5c92a809..d82b3054bb4f4c4835ce933af92dbc11cb0f871d 100644
--- a/doc/man/man1/slurm.1
+++ b/doc/man/man1/slurm.1
@@ -37,7 +37,7 @@ SLURM configuration is maintained in the \fBslurm.conf\fR file.
 Man pages are available for all SLURM commands, daemons, APIs, plus the
 \fBslurm.conf\fR file.
 Extensive documentation is also available on the internet at
-\fB<http://www.schedmd.com/slurmdocs/>\fR.
+\fB<http://slurm.schedmd.com/>\fR.
 
 .SH "COPYING"
 Copyright (C) 2005\-2007 The Regents of the University of California.
@@ -46,7 +46,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/smap.1 b/doc/man/man1/smap.1
index 2500b78e85ab82efeb36602ff672de43e9792642..3fd53ce06dedc53e479ae6eb28541c67d93863ed 100644
--- a/doc/man/man1/smap.1
+++ b/doc/man/man1/smap.1
@@ -500,7 +500,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sprio.1 b/doc/man/man1/sprio.1
index 1e4941fd31efb2b51e5891e6da9650524a71ec8b..45c4d2f0f00f37b580dd5cabd5c51341e0692b06 100644
--- a/doc/man/man1/sprio.1
+++ b/doc/man/man1/sprio.1
@@ -222,7 +222,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/squeue.1 b/doc/man/man1/squeue.1
index 6cd03effadb2a03447d2a35ef816b0d99647aac4..2acd8ac780e151ab3639c83e3ca3956c04ff416f 100644
--- a/doc/man/man1/squeue.1
+++ b/doc/man/man1/squeue.1
@@ -631,7 +631,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sreport.1 b/doc/man/man1/sreport.1
index 87ec15709848006046777ea6c2260995866373e2..55b5bfd58848d00e891170a0f2fdeb9b132b7dcd 100644
--- a/doc/man/man1/sreport.1
+++ b/doc/man/man1/sreport.1
@@ -432,7 +432,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 8570b3b370b4f2cb407c51fda4dc1fcbb932e3aa..5a2b8bc6909e58e2d004ffd7265a8a7433abdeec 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -13,7 +13,7 @@ first create a resource allocation in which to run the parallel job.
 The following document describes the the influence of various options on the
 allocation of cpus to jobs and tasks.
 .br
-http://www.schedmd.com/slurmdocs/cpu_management.html
+http://slurm.schedmd.com/cpu_management.html
 
 .SH "OPTIONS"
 .LP
@@ -634,7 +634,7 @@ nodes. The optional second distribution method (after the ":")
 controls the distribution of resources across sockets within a node.
 Note that with select/cons_res, the number of cpus allocated on each
 socket and node may be different. Refer to
-http://www.schedmd.com/slurmdocs/mc_support.html
+http://slurm.schedmd.com/mc_support.html
 for more information on resource allocation, assignment of tasks to
 nodes, and binding of tasks to CPUs.
 .RS
@@ -670,11 +670,11 @@ followed by an optional specification of the task distribution scheme
 within a block of tasks and between the blocks of tasks.  For more
 details (including examples and diagrams), please see
 .br
-http://www.schedmd.com/slurmdocs/mc_support.html
+http://slurm.schedmd.com/mc_support.html
 .br
 and
 .br
-http://www.schedmd.com/slurmdocs/dist_plane.html
+http://slurm.schedmd.com/dist_plane.html
 .TP
 .B arbitrary
 The arbitrary method of distribution will allocate processes in\-order
@@ -2039,7 +2039,7 @@ These tasks initiated outside of SLURM's monitoring
 or control. SLURM's epilog should be configured to purge
 these tasks when the job's allocation is relinquished.
 
-See \fIhttp://www.schedmd.com/slurmdocs/mpi_guide.html\fR
+See \fIhttp://slurm.schedmd.com/mpi_guide.html\fR
 for more information on use of these various MPI implementation
 with SLURM.
 
@@ -2247,7 +2247,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/srun_cr.1 b/doc/man/man1/srun_cr.1
index 77322298bcc123712cb9c5d898ce6dc693ef5ea0..b0dd6f6bbf963eb1865894d97169c0ae1b4202d5 100644
--- a/doc/man/man1/srun_cr.1
+++ b/doc/man/man1/srun_cr.1
@@ -57,7 +57,7 @@ Produced at National University of Defense Technology, China (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sshare.1 b/doc/man/man1/sshare.1
index 3d078852c097f58f5d62c469ab9ad8d73c7365b6..4d455ed8d336ad49d4a818d91792fbd467b5d4de 100644
--- a/doc/man/man1/sshare.1
+++ b/doc/man/man1/sshare.1
@@ -132,7 +132,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sstat.1 b/doc/man/man1/sstat.1
index 52c1abde43964f6579db33bcfb4888531723f401..c0bda8b6d7933d7a4cdbd9fc9aacbfe7fbc3d244 100644
--- a/doc/man/man1/sstat.1
+++ b/doc/man/man1/sstat.1
@@ -210,7 +210,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/strigger.1 b/doc/man/man1/strigger.1
index b5a77d3e374f79222119a4084eb56cf888b2f6be..30ec9c077328d5714bbb0b7510e448f08f62e797 100644
--- a/doc/man/man1/strigger.1
+++ b/doc/man/man1/strigger.1
@@ -366,7 +366,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man1/sview.1 b/doc/man/man1/sview.1
index cf6d408fbc9672e3217955a93efdefa7bda38c1d..c083e545b74f296718c712053d71d8a66c8842e0 100644
--- a/doc/man/man1/sview.1
+++ b/doc/man/man1/sview.1
@@ -50,7 +50,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man2html.py b/doc/man/man2html.py
index e1dfb3e4d57225f3d12a4ef5f65879ff245d5ced..a049c616abbb111ef5fe2557b64c8962e2328c4e 100755
--- a/doc/man/man2html.py
+++ b/doc/man/man2html.py
@@ -49,42 +49,42 @@ def llnl_references(line):
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '<A HREF="http://www.schedmd.com/slurmdocs/mc_support.html">http://www.schedmd.com/slurmdocs/mc_support.html</A>'
+        manStr = '<A HREF="http://slurm.schedmd.com/mc_support.html">http://slurm.schedmd.com/mc_support.html</A>'
         htmlStr = 'the <a href="mc_support.html">mc_support</a> document'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '<A HREF="http://www.schedmd.com/slurmdocs/dist_plane.html.">http://www.schedmd.com/slurmdocs/dist_plane.html.</A>'
+        manStr = '<A HREF="http://slurm.schedmd.com/dist_plane.html.">http://slurm.schedmd.com/dist_plane.html.</A>'
         htmlStr = 'the <a href="dist_plane.html">dist_plane</a> document'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '&lt;<A HREF="http://www.schedmd.com/slurmdocs/mpi_guide.html">http://www.schedmd.com/slurmdocs/mpi_guide.html</A>&gt;'
+        manStr = '&lt;<A HREF="http://slurm.schedmd.com/mpi_guide.html">http://slurm.schedmd.com/mpi_guide.html</A>&gt;'
         htmlStr = '<a href="mpi_guide.html">mpi_guide</a>'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '(<A HREF="http://www.schedmd.com/slurmdocs/power_save.html).">http://www.schedmd.com/slurmdocs/power_save.html).</A>'
+        manStr = '(<A HREF="http://slurm.schedmd.com/power_save.html).">http://slurm.schedmd.com/power_save.html).</A>'
         htmlStr = '<a href="power_save.html">power_save</a>'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '<A HREF="http://www.schedmd.com/slurmdocs/cons_res.html">http://www.schedmd.com/slurmdocs/cons_res.html</A>'
+        manStr = '<A HREF="http://slurm.schedmd.com/cons_res.html">http://slurm.schedmd.com/cons_res.html</A>'
         htmlStr = '<a href="cons_res.html">cons_res</a>'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '<A HREF="http://www.schedmd.com/slurmdocs/cons_res_share.html">http://www.schedmd.com/slurmdocs/cons_res_share.html</A>'
+        manStr = '<A HREF="http://slurm.schedmd.com/cons_res_share.html">http://slurm.schedmd.com/cons_res_share.html</A>'
         htmlStr = '<a href="cons_res_share.html">cons_res_share</a>'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '<A HREF="http://www.schedmd.com/slurmdocs/gang_scheduling.html">http://www.schedmd.com/slurmdocs/gang_scheduling.html</A>'
+        manStr = '<A HREF="http://slurm.schedmd.com/gang_scheduling.html">http://slurm.schedmd.com/gang_scheduling.html</A>'
         htmlStr = '<a href="gang_scheduling.html">gang_scheduling</a>'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
             return lineFix
-        manStr = '<A HREF="http://www.schedmd.com/slurmdocs/preempt.html">http://www.schedmd.com/slurmdocs/preempt.html</A>'
+        manStr = '<A HREF="http://slurm.schedmd.com/preempt.html">http://slurm.schedmd.com/preempt.html</A>'
         htmlStr = '<a href="preempt.html">preempt</a>'
         lineFix = line.replace(manStr,htmlStr)
         if lineFix != line:
diff --git a/doc/man/man3/slurm_allocate_resources.3 b/doc/man/man3/slurm_allocate_resources.3
index 28b7086365a297cc628effbf4e15839b3831d80c..a9869984bcddccb2f6705cc20ab873e476348ece 100644
--- a/doc/man/man3/slurm_allocate_resources.3
+++ b/doc/man/man3/slurm_allocate_resources.3
@@ -423,7 +423,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_checkpoint_error.3 b/doc/man/man3/slurm_checkpoint_error.3
index 2fe18996c1a7518090fb9510025cc7b8b70a5500..f31bf77c02596c942f53a6f8cefb2fecd795441a 100644
--- a/doc/man/man3/slurm_checkpoint_error.3
+++ b/doc/man/man3/slurm_checkpoint_error.3
@@ -263,7 +263,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_clear_trigger.3 b/doc/man/man3/slurm_clear_trigger.3
index e84b1028ef45427a54b77fb6d6175b869b40081b..ff9aa40a03ec4e224cf279d40d8fad117e1791ed 100644
--- a/doc/man/man3/slurm_clear_trigger.3
+++ b/doc/man/man3/slurm_clear_trigger.3
@@ -103,7 +103,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_complete_job.3 b/doc/man/man3/slurm_complete_job.3
index 4f96ddb95613f670846ddfe1466b3bf890b9c55e..f7999379511d9fcf2e3cbeb2cd14792db95a820a 100644
--- a/doc/man/man3/slurm_complete_job.3
+++ b/doc/man/man3/slurm_complete_job.3
@@ -59,7 +59,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_free_ctl_conf.3 b/doc/man/man3/slurm_free_ctl_conf.3
index d1c198a59a31816a0c043d1f97a59ecad7cd799d..60b35873483677d7183d19e8a22ac3398a9dd729 100644
--- a/doc/man/man3/slurm_free_ctl_conf.3
+++ b/doc/man/man3/slurm_free_ctl_conf.3
@@ -153,7 +153,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_free_front_end_info_msg.3 b/doc/man/man3/slurm_free_front_end_info_msg.3
index 6c1132942abd32118369bf9d6cbab0f6b314756d..17ddb2ebf9bbc84e8d71c098354f237802cd87ef 100644
--- a/doc/man/man3/slurm_free_front_end_info_msg.3
+++ b/doc/man/man3/slurm_free_front_end_info_msg.3
@@ -195,7 +195,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_free_job_info_msg.3 b/doc/man/man3/slurm_free_job_info_msg.3
index a1caaa9475f0357a9e13fdde03827a55066ffe97..79bc71c7a443915b72877aedc38cf72d7555d14c 100644
--- a/doc/man/man3/slurm_free_job_info_msg.3
+++ b/doc/man/man3/slurm_free_job_info_msg.3
@@ -410,7 +410,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_free_job_step_info_response_msg.3 b/doc/man/man3/slurm_free_job_step_info_response_msg.3
index a891eed861d26b96be16cf834c4544c9fb4b3540..5064a07aede10c600fb3db8450498813cf0b8487 100644
--- a/doc/man/man3/slurm_free_job_step_info_response_msg.3
+++ b/doc/man/man3/slurm_free_job_step_info_response_msg.3
@@ -209,7 +209,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_free_node_info.3 b/doc/man/man3/slurm_free_node_info.3
index 81ad1e318d4ec9a5f9e4e2a1cead0bc7fba1efd1..981909fe348471c332489c8ce3fa4580496f059f 100644
--- a/doc/man/man3/slurm_free_node_info.3
+++ b/doc/man/man3/slurm_free_node_info.3
@@ -260,7 +260,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_free_partition_info.3 b/doc/man/man3/slurm_free_partition_info.3
index cee2f32c2552ed736ef03894d3ce4ec6700b498c..2fcd692cfe6aa01c0a96cfb435623afa1c5ec105 100644
--- a/doc/man/man3/slurm_free_partition_info.3
+++ b/doc/man/man3/slurm_free_partition_info.3
@@ -194,7 +194,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_get_errno.3 b/doc/man/man3/slurm_get_errno.3
index 8aab64865e3cc35f988c7d84c39813d4e93918ae..94d8412f9ced7917a443bc0c91b0027c1f4a2874 100644
--- a/doc/man/man3/slurm_get_errno.3
+++ b/doc/man/man3/slurm_get_errno.3
@@ -77,7 +77,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_hostlist_create.3 b/doc/man/man3/slurm_hostlist_create.3
index 9625409c6d3a842a72ea65441a8e94e3b4d062ed..1ac92b543de846196bbf2db178db334f1484037c 100644
--- a/doc/man/man3/slurm_hostlist_create.3
+++ b/doc/man/man3/slurm_hostlist_create.3
@@ -111,7 +111,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_job_step_create.3 b/doc/man/man3/slurm_job_step_create.3
index c67cfd33b094909de249dd8b3f85ba6f543727f7..0d9844fc51972a7e84e75c4e0d9069ad06f38934 100644
--- a/doc/man/man3/slurm_job_step_create.3
+++ b/doc/man/man3/slurm_job_step_create.3
@@ -78,7 +78,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_kill_job.3 b/doc/man/man3/slurm_kill_job.3
index 952e421725819586b1da6f976dab340eb7c49fda..0344add2ebae52b3c4313fdaf983ec08d4df2355 100644
--- a/doc/man/man3/slurm_kill_job.3
+++ b/doc/man/man3/slurm_kill_job.3
@@ -128,7 +128,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_load_reservations.3 b/doc/man/man3/slurm_load_reservations.3
index da6835af3d712949f4d7db8954848ee9a288f472..3f09852f46ec40b31fee9baa722918542947696d 100644
--- a/doc/man/man3/slurm_load_reservations.3
+++ b/doc/man/man3/slurm_load_reservations.3
@@ -194,7 +194,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_reconfigure.3 b/doc/man/man3/slurm_reconfigure.3
index 0b17674011e74b31647a239cb5db3cd43bd14152..d8bc4fdde5dcff6eec6c5ea6eb7cfa219bd1750d 100644
--- a/doc/man/man3/slurm_reconfigure.3
+++ b/doc/man/man3/slurm_reconfigure.3
@@ -396,7 +396,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_resume.3 b/doc/man/man3/slurm_resume.3
index 35544b63b4483476079244691c0ad023e90d6597..120689190d86bbc21ca76db1d1af612a9589f461 100644
--- a/doc/man/man3/slurm_resume.3
+++ b/doc/man/man3/slurm_resume.3
@@ -78,7 +78,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_slurmd_status.3 b/doc/man/man3/slurm_slurmd_status.3
index 285a243b299864f5e4820a29a36ab104311170d9..96104b05ccc2da13903194ca224bbc37cec98e57 100644
--- a/doc/man/man3/slurm_slurmd_status.3
+++ b/doc/man/man3/slurm_slurmd_status.3
@@ -55,7 +55,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_step_ctx_create.3 b/doc/man/man3/slurm_step_ctx_create.3
index 0b6f88e2910f44148e777570ebfa8db185051888..e080c55d7d9a48673bc926203c033201e07f3c0f 100644
--- a/doc/man/man3/slurm_step_ctx_create.3
+++ b/doc/man/man3/slurm_step_ctx_create.3
@@ -239,7 +239,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_step_launch.3 b/doc/man/man3/slurm_step_launch.3
index 54bb61f0415752f56ca26e36252f48ddae9a0dfa..351db72211002de3b3356671d42de232f339f7fc 100644
--- a/doc/man/man3/slurm_step_launch.3
+++ b/doc/man/man3/slurm_step_launch.3
@@ -233,7 +233,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man3/slurm_update_job.3 b/doc/man/man3/slurm_update_job.3
index 7c5ae7c6e70b05442ae3937980711650e9e3ae28..c8cff8356fa1b8d232867b7907c41347ffed4159 100644
--- a/doc/man/man3/slurm_update_job.3
+++ b/doc/man/man3/slurm_update_job.3
@@ -137,7 +137,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/bluegene.conf.5 b/doc/man/man5/bluegene.conf.5
index 87a0ae2f5f21b95148b73c008ab8bcd435d50a52..bdab471d2d8b96a39448bbee3fb4329417b2fc35 100644
--- a/doc/man/man5/bluegene.conf.5
+++ b/doc/man/man5/bluegene.conf.5
@@ -338,7 +338,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/cgroup.conf.5 b/doc/man/man5/cgroup.conf.5
index 974320e68b074964a0fc8b8f88ff768ff908c01c..bb6415ac50b06db72e172920a4384bd167648759 100644
--- a/doc/man/man5/cgroup.conf.5
+++ b/doc/man/man5/cgroup.conf.5
@@ -22,7 +22,7 @@ of the command "scontrol reconfigure" unless otherwise noted.
 
 .LP
 For general Slurm Cgroups information, see the Cgroups Guide at
-<http://www.schedmd.com/slurmdocs/cgroups.html>.
+<http://slurm.schedmd.com/cgroups.html>.
 
 .LP
 The following cgroup.conf parameters are defined to control the general behavior
@@ -164,7 +164,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/cray.conf.5 b/doc/man/man5/cray.conf.5
index 4f28b8a113eb1d5388ef6cf99696e8223c17eccd..e4a251d944621d8186917e85ffe49d1bfa0ef150 100644
--- a/doc/man/man5/cray.conf.5
+++ b/doc/man/man5/cray.conf.5
@@ -94,7 +94,7 @@ Produced at SchedMD LLC (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/gres.conf.5 b/doc/man/man5/gres.conf.5
index d3ef65fc534a87a7dad7a71b06837ab3559316c8..960e70963f1ee986159198d395c14f2540e4c585 100644
--- a/doc/man/man5/gres.conf.5
+++ b/doc/man/man5/gres.conf.5
@@ -110,7 +110,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 6c35872807c7056750844b418be4e6fbab35e109..4c5d8c38b25a139f431a65c32b8d2e618c55de8a 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -917,7 +917,7 @@ Currently supported versions include:
 \fBopenmpi\fR.
 \fBpmi2\fR,
 More information about MPI use is available here
-<http://www.schedmd.com/slurmdocs/mpi_guide.html>.
+<http://slurm.schedmd.com/mpi_guide.html>.
 
 .TP
 \fBMpiParams\fR
@@ -1422,7 +1422,7 @@ Related configuration options include \fBResumeTimeout\fR, \fBResumeRate\fR,
 \fBSuspendRate\fR, \fBSuspendTime\fR, \fBSuspendTimeout\fR, \fBSuspendProgram\fR,
 \fBSuspendExcNodes\fR, and \fBSuspendExcParts\fR.
 More information is available at the SLURM web site
-( http://www.schedmd.com/slurmdocs/power_save.html ).
+( http://slurm.schedmd.com/power_save.html ).
 
 .TP
 \fBResumeRate\fR
@@ -1448,7 +1448,7 @@ Related configuration options include \fBResumeProgram\fR, \fBResumeRate\fR,
 \fBSuspendRate\fR, \fBSuspendTime\fR, \fBSuspendTimeout\fR, \fBSuspendProgram\fR,
 \fBSuspendExcNodes\fR and \fBSuspendExcParts\fR.
 More information is available at the SLURM web site
-( http://www.schedmd.com/slurmdocs/power_save.html ).
+( http://slurm.schedmd.com/power_save.html ).
 
 .TP
 \fBResvOverRun\fR
@@ -2070,7 +2070,7 @@ Related configuration options include \fBResumeProgram\fR, \fBResumeRate\fR,
 \fBResumeTimeout\fR, \fBSuspendRate\fR, \fBSuspendTime\fR, \fBSuspendProgram\fR,
 \fBSuspendExcNodes\fR and \fBSuspendExcParts\fR.
 More information is available at the SLURM web site
-( http://www.schedmd.com/slurmdocs/power_save.html ).
+( http://slurm.schedmd.com/power_save.html ).
 
 .TP
 \fBSwitchType\fR
@@ -3030,13 +3030,13 @@ The default value is "NO".
 For more information see the following web pages:
 .br
 .na
-\fIhttp://www.schedmd.com/slurmdocs/cons_res.html\fR,
+\fIhttp://slurm.schedmd.com/cons_res.html\fR,
 .br
-\fIhttp://www.schedmd.com/slurmdocs/cons_res_share.html\fR,
+\fIhttp://slurm.schedmd.com/cons_res_share.html\fR,
 .br
-\fIhttp://www.schedmd.com/slurmdocs/gang_scheduling.html\fR, and
+\fIhttp://slurm.schedmd.com/gang_scheduling.html\fR, and
 .br
-\fIhttp://www.schedmd.com/slurmdocs/preempt.html\fR.
+\fIhttp://slurm.schedmd.com/preempt.html\fR.
 .ad
 
 .RS
@@ -3203,7 +3203,7 @@ SLURM is able to optimize job allocations to minimize network contention.
 Special SLURM logic is used to optimize allocations on systems with a
 three\-dimensional interconnect (BlueGene, Sun Constellation, etc.)
 and information about configuring those systems are available on
-web pages available here: <http://www.schedmd.com/slurmdocs/>.
+web pages available here: <http://slurm.schedmd.com/>.
 For a hierarchical network, SLURM needs to have detailed information
 about how nodes are configured on the network switches.
 .LP
@@ -3555,7 +3555,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/slurmdbd.conf.5 b/doc/man/man5/slurmdbd.conf.5
index 63dfc4f2ad9005c11242c69b32a3619676204a32..6f37d595ee15a0a2e27204059c3010a45ec69c08 100644
--- a/doc/man/man5/slurmdbd.conf.5
+++ b/doc/man/man5/slurmdbd.conf.5
@@ -418,7 +418,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/topology.conf.5 b/doc/man/man5/topology.conf.5
index 55a1a8e85919d2325e60f04911a28285abeb65bd..112e3fcba6443ae51a5d14d1c226acdbe0b5d29c 100644
--- a/doc/man/man5/topology.conf.5
+++ b/doc/man/man5/topology.conf.5
@@ -75,7 +75,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man5/wiki.conf.5 b/doc/man/man5/wiki.conf.5
index d94f255f3a1da9d6f992c6e95c824a1b76e029ac..b700ee485988cc34fff6c392db3f85ed05303428 100644
--- a/doc/man/man5/wiki.conf.5
+++ b/doc/man/man5/wiki.conf.5
@@ -188,7 +188,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man8/slurmctld.8 b/doc/man/man8/slurmctld.8
index 4fd3cc07f5d32891ce0976b2f0a9c528aa97922f..b54530eb16ad3f9467139c13ed724594fdfdf60d 100644
--- a/doc/man/man8/slurmctld.8
+++ b/doc/man/man8/slurmctld.8
@@ -99,7 +99,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man8/slurmd.8 b/doc/man/man8/slurmd.8
index c0259303be89c4a54fc3ac0b81b97aeb7014a6b3..88dfe77c6bf8c631123f3342a2322d6aaa7e2229 100644
--- a/doc/man/man8/slurmd.8
+++ b/doc/man/man8/slurmd.8
@@ -99,7 +99,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man8/slurmdbd.8 b/doc/man/man8/slurmdbd.8
index 2dabcb923104c5e375703c5769be415e802b1456..e78e0de9b6ce8b33d59620156571ca99075b7d59 100644
--- a/doc/man/man8/slurmdbd.8
+++ b/doc/man/man8/slurmdbd.8
@@ -52,7 +52,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man8/slurmstepd.8 b/doc/man/man8/slurmstepd.8
index 3ad55a12462b40b66942f46a31fdbd55eaa08909..cbe761443d69ff6bb77736806d805a0ae25b8454 100644
--- a/doc/man/man8/slurmstepd.8
+++ b/doc/man/man8/slurmstepd.8
@@ -16,7 +16,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
diff --git a/doc/man/man8/spank.8 b/doc/man/man8/spank.8
index b1caf23958377b8bff3df081584d1dbab310f504..2f8eaf32b615bc33219244847f0d24ebc51603ee 100644
--- a/doc/man/man8/spank.8
+++ b/doc/man/man8/spank.8
@@ -607,7 +607,7 @@ Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 CODE\-OCEC\-09\-009. All rights reserved.
 .LP
 This file is part of SLURM, a resource management program.
-For details, see <http://www.schedmd.com/slurmdocs/>.
+For details, see <http://slurm.schedmd.com/>.
 .LP
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free