summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-03-03 10:19:45 +0100
committeralalazo <massimiliano.culpo@googlemail.com>2016-03-03 10:19:45 +0100
commit7f4a69319aebb29f89994e5fa19834db5949d122 (patch)
treef1820122bb1493e0ab4df29ea74743925461c922 /README.md
parent5ef36215569e1151164ecb630011de425387732a (diff)
parent6701977f1a9c2d27ea97681558d7455108b796c5 (diff)
downloadspack-7f4a69319aebb29f89994e5fa19834db5949d122.tar.gz
spack-7f4a69319aebb29f89994e5fa19834db5949d122.tar.bz2
spack-7f4a69319aebb29f89994e5fa19834db5949d122.tar.xz
spack-7f4a69319aebb29f89994e5fa19834db5949d122.zip
Merge branch 'develop' of https://github.com/LLNL/spack into refactoring/stage
Conflicts: lib/spack/spack/package.py
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: