Merge pull request #1382 from gravitational/ev/docs

Made installation procedure consistent in the docs
gravitational · Oct 10, 2017 · 54e708c · 54e708c
2 parents 2a75652 + 05ced56
commit 54e708c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/docs/2.0/admin-guide.md b/docs/2.0/admin-guide.md
@@ -6,16 +6,30 @@ of Linux administration.
 
 ## Installing
 
-Gravitational Teleport is written in Go language. It requires Golang v1.7 or newer. 
-If you have Go already installed, type:
+To install Teleport using the official binaries from [Github releases](https://github.com/gravitational/teleport/releases) 
+simply download the tarball and run:
 
-```bash
-$ go get github.com/gravitational/teleport
-$ cd $GOPATH/src/github.com/gravitational/teleport
-$ make release
 ```
+$ tar -xzf teleport-binary-release.tar.gz
+$ sudo make install
+```
+
+### Installing from Source
+
+Gravitational Teleport is written in Go language. It requires Golang v1.8.3 or
+newer. 
 
-You can also download binaries from [Github releases](https://github.com/gravitational/teleport/releases) or you can [build it from source](https://github.com/gravitational/teleport).
+```bash
+# get the source & build:
+$ mkdir -p $GOPATH/src/github.com/gravitational
+$ cd $GOPATH/src/github.com/gravitational
+$ git clone https://github.com/gravitational/teleport.git
+$ cd teleport
+$ make full
+
+# create the default data directory before starting:
+$ sudo mkdir -p /var/lib/teleport
+```
 
 ## Definitions
 

diff --git a/docs/2.3/admin-guide.md b/docs/2.3/admin-guide.md
@@ -6,18 +6,30 @@ of Linux administration.
 
 ## Installing
 
-Gravitational Teleport is written in Go language. It requires Golang v1.7 or newer. 
-If you have Go 1.8+ already installed:
+To install Teleport using the official binaries from [Github releases](https://github.com/gravitational/teleport/releases) 
+simply download the tarball and run:
+
+```
+$ tar -xzf teleport-binary-release.tar.gz
+$ sudo make install
+```
+
+### Installing from Source
+
+Gravitational Teleport is written in Go language. It requires Golang v1.8.3 or
+newer. 
 
 ```bash
+# get the source & build:
+$ mkdir -p $GOPATH/src/github.com/gravitational
 $ cd $GOPATH/src/github.com/gravitational
-$ git clone https://github.com/gravitational/teleport.git 
+$ git clone https://github.com/gravitational/teleport.git
 $ cd teleport
-$ make release
-```
+$ make full
 
-You can also download binaries from [Github releases](https://github.com/gravitational/teleport/releases) 
-or you can [build it from source](https://github.com/gravitational/teleport).
+# create the default data directory before starting:
+$ sudo mkdir -p /var/lib/teleport
+```
 
 ## Definitions