summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorLuigi Calori <luigi.calori@gmail.com>2016-03-03 12:43:38 +0100
committerLuigi Calori <luigi.calori@gmail.com>2016-03-03 12:43:38 +0100
commitf5cc63156cd2486a79cfe73d69728305be3ce517 (patch)
treecaf42f3c2217e2ccb1a40698aa63ec2b2b95e050 /README.md
parent8f3ac9ac8b7b1d16672e7a52f691966de1f8483f (diff)
parent6701977f1a9c2d27ea97681558d7455108b796c5 (diff)
downloadspack-f5cc63156cd2486a79cfe73d69728305be3ce517.tar.gz
spack-f5cc63156cd2486a79cfe73d69728305be3ce517.tar.bz2
spack-f5cc63156cd2486a79cfe73d69728305be3ce517.tar.xz
spack-f5cc63156cd2486a79cfe73d69728305be3ce517.zip
Merge branch 'develop' of https://github.com/RemoteConnectionManager/spack into paraview_fix
merge upstream develop
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index bdce345764..8664953c0c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ written in pure Python, and specs allow package authors to write a
single build script for many different builds of the same package.
See the
-[Feature Overview](http://llnl.github.io/spack/features.html)
+[Feature Overview](http://software.llnl.gov/spack/features.html)
for examples and highlights.
To install spack and install your first package:
@@ -31,7 +31,7 @@ To install spack and install your first package:
Documentation
----------------
-[**Full documentation**](http://llnl.github.io/spack) for Spack is
+[**Full documentation**](http://software.llnl.gov/spack) for Spack is
the first place to look.
See also: