summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorEirik Nygaard <eirik@yahoo-inc.com>2016-06-22 13:27:57 +0200
committerEirik Nygaard <eirik@yahoo-inc.com>2016-06-22 13:27:57 +0200
commit38b437f12521ff781776c255ea7949aca502ec76 (patch)
treec4ae0dd7e6f96db5e867fc1a9521720d9a90b82a /README.md
parent515625757ad4ab4e815212509bd0ab2e114dd9ea (diff)
parent9740540b7cf4b29015ebb043194e4e884edad62f (diff)
Merge branch 'eirik/allow-full-bootstrap-and-optimize' into eirik/fill-out-build-instructions
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index 11a2e6145c4..722041c294d 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,11 @@ Vespa is an engine for low-latency computation over large data sets.
It stores and indexes your data such that queries, selection and processing over the
data can be performed at serving time.
-This README describes how to build and develop the Vespa engine.
-For user documentation see TODO: Github pages link
+This README describes how to build and develop the Vespa engine. If you want to use Vespa
+you can go to the
+[quick start guide](http://yahoo.github.io/vespa/vespa-quick-start.html), or take a
+look at our
+[user documentation](http://yahoo.github.io/vespa/vespatoc.html).
## Getting started developing
@@ -14,7 +17,6 @@ For user documentation see TODO: Github pages link
git config --global user.name "John Doe"
git config --global user.email johndoe@host.com
-
### Setting up build environment
C++ building is supported on CentOS 7.
@@ -42,8 +44,7 @@ Java modules can be built on any environment having Java and Maven:
### Building C++ modules
source /opt/rh/devtoolset-4/enable
- sh bootstrap.sh
- mvn install -DskipTests -Dmaven.javadoc.skip=true
+ sh bootstrap.sh full
cmake .
make
make test
@@ -57,7 +58,6 @@ Java modules can be built on any environment having Java and Maven:
* OS X : See [node-admin/README_MAC.md](node-admin/README_MAC.md)
* Linux : See [node-admin/README_LINUX.md](node-admin/README_LINUX.md)
-
Code licensed under the Apache 2.0 license. See LICENSE file for terms.
## Documenting your features