docs: moving some sections

Improved docs by renaming and moving some sections

docs/020-environment.md

@@ -12,7 +12,7 @@ This token should be added to the environment variables as `GITHUB_TOKEN`.
 Here is how to do it with Travis CI:
 [Defining Variables in Repository Settings](https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings).
 
-### dist folder
+### The dist folder
 
 By default, GoReleaser will create its artifacts in the `./dist` folder.
 If you must, you can change it by setting it in the `.goreleaser.yml` file:
@@ -22,3 +22,23 @@ If you must, you can change it by setting it in the `.goreleaser.yml` file:
 # .goreleaser.yml
 dist: another-folder-that-is-not-dist
 ```
+
+### Using the `main.version`
+
+GoReleaser always sets a `main.version` *ldflag*.
+You can use it in your `main.go` file:
+
+```go
+package main
+
+var version = "master"
+
+func main() {
+  println(version)
+}
+```
+
+`version` will be set to the current Git tag (the `v` prefix is stripped) or the name of
+the snapshot, if you're using the `--snapshot` flag.
+
+You can override this by changing the `ldflags` option in the `build` section.

docs/025-version.md

@@ -1,21 +0,0 @@
----
-title: main.version
----
-
-GoReleaser always sets a `main.version` *ldflag*.
-You can use it in your `main.go` file:
-
-```go
-package main
-
-var version = "master"
-
-func main() {
-  println(version)
-}
-```
-
-`version` will be set to the current Git tag (the `v` prefix is stripped) or the name of
-the snapshot, if you're using the `--snapshot` flag.
-
-You can override this by changing the `ldflags` option in the `build` section.

docs/100-fpm.md

@@ -1,5 +1,5 @@
 ---
-title: FPM Linux Packages
+title: FPM
 ---
 
 GoReleaser can be wired to [fpm](https://github.com/jordansissel/fpm) to

docs/110-snapcraft.md

@@ -1,5 +1,5 @@
 ---
-title: Snapcraft Linux Packages
+title: Snapcraft
 ---
 
 GoReleaser can generate `snap` packages. [Snaps](http://snapcraft.io/) are a