diff --git a/DISCLAIMER b/DISCLAIMER
index 530b9c20a860de73a51595fcd67b4ee7be5ae855..cd27e2782780a20998a15cea30a60a6653504b37 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -110,7 +110,7 @@ Anne-Marie Wunderlin (Bull)
CODE-OCEC-09-009. All rights reserved.
This file is part of SLURM, a resource management program.
-For details, see .
+For details, see .
Please also read the supplied file: DISCLAIMER.
SLURM is free software; you can redistribute it and/or modify it under
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 074039edc6bae40083baa586b7179c874347c3b0..e3e4cfaaf6c29448f4e53aa3eba7f440e05c0bcb 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -73,7 +73,7 @@ COMMAND CHANGES (see man pages for details)
limited to the compute nodes associated with the reservation.
* The dependency option of "expand" has been added. This option identifies a
job whose resource allocation is intended to be used to expand the allocation
- of another job. See https://computing.llnl.gov/linux/slurm//faq.html#job_size
+ of another job. See http://www.schedmd.com/slurmdocs//faq.html#job_size
for a description of it's use.
* Added --switches option to salloc, sbatch and srun commands to control the
desired number of switches allocated to a job and the maximum delay before
diff --git a/contribs/cray/opt_modulefiles_slurm b/contribs/cray/opt_modulefiles_slurm
index c6b14948f0418e983f57e8a573317c1e1fdb41d1..675cbb7afa8a6e6711e519b7cb8813ebdfb44161 100644
--- a/contribs/cray/opt_modulefiles_slurm
+++ b/contribs/cray/opt_modulefiles_slurm
@@ -6,7 +6,7 @@
# SUBROUTINES
proc ModulesHelp { } {
puts stderr "\tThis is slurm $::version.\n"
- puts stderr "\tPlease consult https://computing.llnl.gov/linux/slurm/cray.html"
+ puts stderr "\tPlease consult http://www.schedmd.com/slurmdocs/cray.html"
}
# CONFIGURATION
diff --git a/contribs/cray/srun.pl b/contribs/cray/srun.pl
index 582e925b7f3059df1743d2da4542a5a06366c599..61dbb68d045e5fe267c5d0e227647a476b4fb924 100755
--- a/contribs/cray/srun.pl
+++ b/contribs/cray/srun.pl
@@ -13,7 +13,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/env_cache_builder.c b/contribs/env_cache_builder.c
index 176b06bb05644317fc411d13e324c1c573abc1b9..9baf52f7062722b0e6bec4cf19e65337b5306941 100644
--- a/contribs/env_cache_builder.c
+++ b/contribs/env_cache_builder.c
@@ -30,7 +30,7 @@
* CODE-OCEC-09-009. All rights reserved.
*
* This file is part of SLURM, a resource management program.
- * For details, see .
+ * For details, see .
* Please also read the included file: DISCLAIMER.
*
* SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/perlapi/libslurmdb/perl/Slurmdb.pm b/contribs/perlapi/libslurmdb/perl/Slurmdb.pm
index 7adc001c9f20627cb80da2aa910a171cddcc97ac..52975591f4699e5a9e810e31f491904a7c797aa9 100644
--- a/contribs/perlapi/libslurmdb/perl/Slurmdb.pm
+++ b/contribs/perlapi/libslurmdb/perl/Slurmdb.pm
@@ -135,7 +135,7 @@ None by default.
=head1 SEE ALSO
-https://computing.llnl.gov/linux/slurm/accounting.html
+http://www.schedmd.com/slurmdocs/accounting.html
=head1 AUTHOR
@@ -148,7 +148,7 @@ Don Lipari, lipari@llnl.gov
CODE-OCEC-09-009. All rights reserved.
This file is part of SLURM, a resource management program. For
- details, see . Please also
+ details, see . Please also
read the included file: DISCLAIMER.
SLURM is free software; you can redistribute it and/or modify it
diff --git a/contribs/sjstat b/contribs/sjstat
index f6df8b096a858225c563b62284af603da32b1f19..6fee05efb65a4e9d6b4efaea746fdfed0101782b 100755
--- a/contribs/sjstat
+++ b/contribs/sjstat
@@ -11,7 +11,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/time_login.c b/contribs/time_login.c
index 4c532179328c2a422d13c38e6b9bf3794b126511..b63c86e8aeffff1ca19d142eb634796b2e224915 100644
--- a/contribs/time_login.c
+++ b/contribs/time_login.c
@@ -17,7 +17,7 @@
* CODE-OCEC-09-009. All rights reserved.
*
* This file is part of SLURM, a resource management program.
- * For details, see .
+ * For details, see .
* Please also read the included file: DISCLAIMER.
*
* SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/torque/mpiexec.pl b/contribs/torque/mpiexec.pl
index 9724a5316ddc49d97bac5d8f1d7b8820c13e5d78..9f6791b5348e0974c94e54b6cd1d68f5c2500dcd 100755
--- a/contribs/torque/mpiexec.pl
+++ b/contribs/torque/mpiexec.pl
@@ -11,7 +11,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/torque/pbsnodes.pl b/contribs/torque/pbsnodes.pl
index 7c958a265625442d17ae94392cfbf2308bbc8171..98b242cbc76a894409ed2c4dc97585a40649ae32 100755
--- a/contribs/torque/pbsnodes.pl
+++ b/contribs/torque/pbsnodes.pl
@@ -11,7 +11,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/torque/qdel.pl b/contribs/torque/qdel.pl
index 27167d839f420e95902155b6deca31e0cce353ca..410ac48e15ee7e5328326c884905c370eeab32d6 100755
--- a/contribs/torque/qdel.pl
+++ b/contribs/torque/qdel.pl
@@ -11,7 +11,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/torque/qhold.pl b/contribs/torque/qhold.pl
index 41c61dc945e317001ee7e454c18346409fa5ae36..4edb55edfd7c9050420efa8349b1160c1ac7f944 100755
--- a/contribs/torque/qhold.pl
+++ b/contribs/torque/qhold.pl
@@ -12,7 +12,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/torque/qrls.pl b/contribs/torque/qrls.pl
index 851df7013ea45fa8506a237fa01673fd5da57f6d..9f2e32780aa500886c94d16526c4a49d28ea599e 100755
--- a/contribs/torque/qrls.pl
+++ b/contribs/torque/qrls.pl
@@ -11,7 +11,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/torque/qstat.pl b/contribs/torque/qstat.pl
index 2a62d86f02316e92eb0ba561b6da56d5aa3f133c..9c1c4733e479b134f5614abc8c95488ef1b6d98e 100755
--- a/contribs/torque/qstat.pl
+++ b/contribs/torque/qstat.pl
@@ -11,7 +11,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/torque/qsub.pl b/contribs/torque/qsub.pl
index 8e5939bcada5e8adafc487741b8cd70eb600e902..366b3928ada9654d67c64c5f87b7d905efb1e248 100755
--- a/contribs/torque/qsub.pl
+++ b/contribs/torque/qsub.pl
@@ -11,7 +11,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/contribs/web_apps/chart_stats.cgi b/contribs/web_apps/chart_stats.cgi
index 496e0c87ae956157a5744d6a758d10593f4a9d86..22ffbf99fcdb38a45a9a225bcda6825ebf126148 100755
--- a/contribs/web_apps/chart_stats.cgi
+++ b/contribs/web_apps/chart_stats.cgi
@@ -15,7 +15,7 @@
# CODE-OCEC-09-009. All rights reserved.
#
# This file is part of SLURM, a resource management program.
-# For details, see .
+# For details, see .
# Please also read the included file: DISCLAIMER.
#
# SLURM is free software; you can redistribute it and/or modify it under
diff --git a/doc/html/configurator.html.in b/doc/html/configurator.html.in
index f7891024f7a56fce55e295d323cacad18b96b60c..bb7cbaeb927ed33b4702d2c9169cc3e7eef53db8 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 and Danny Auble
This file is part of SLURM, a resource management program.
-For details, see .
+For details, see .
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/html/download.shtml b/doc/html/download.shtml
index f8c79c2fc47ae04d8c6398dade1be7aa58a030ce..5b06b50d3e8f92d529b1384159fa4d95b6dfaccf 100644
--- a/doc/html/download.shtml
+++ b/doc/html/download.shtml
@@ -81,7 +81,7 @@ Download it from http://www.openssl.org/.<
is an implementation of Open Grid Forum
DRMAA 1.0 (Distributed Resource Management Application API)
specification for submission
-and control of jobs to SLURM.
+and control of jobs to SLURM.
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.
diff --git a/doc/html/slurm_ug_2010/agenda.htm b/doc/html/slurm_ug_2010/agenda.htm
index bcf45092c69f1398834a39e3a9167902db343f87..c899e4b3cb9dffb9eed98977085496791a2d1faa 100644
--- a/doc/html/slurm_ug_2010/agenda.htm
+++ b/doc/html/slurm_ug_2010/agenda.htm
@@ -129,7 +129,7 @@
13 September 2010