From 683d7b7179587872a921e39f30bbd8a4d6929267 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Tue, 12 Sep 2017 12:47:41 -0400
Subject: [PATCH] update docs

---
 doc/building-debian8.5.md |  6 ++---
 doc/building.md           | 46 +++++----------------------------------
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/doc/building-debian8.5.md b/doc/building-debian8.5.md
index 7efa08c..41a35d3 100644
--- a/doc/building-debian8.5.md
+++ b/doc/building-debian8.5.md
@@ -1,4 +1,4 @@
-#How to install nntpchan on Debian 8.5 Jessie
+# How to install nntpchan on Debian stable
 
 Install the initial dependencies:
 
@@ -7,7 +7,7 @@ apt-get -y --no-install-recommends install imagemagick sox git ca-certificates \
 ffmpeg build-essential tcl8.5 postgresql postgresql-contrib
 ```
 
-##Configure postgresql
+## Configure postgresql
 
 ```
 su - postgres -c "createuser --pwprompt --encrypted srnd"
@@ -36,6 +36,6 @@ cd nntpchan
 make
 ```
 
-Now you can proceed with [setting up NNTPChan](setting-up.md). When you get to the "set paths to external programs" step, you should change the ffmpeg path to `/usr/bin/avconv`.
+Now you can proceed with [setting up NNTPChan](setting-up.md). When you get to the "set paths to external programs" step.
 
 Run `./srndv2 setup` and follow the instructions [here](setting-up.md).
diff --git a/doc/building.md b/doc/building.md
index 12f7285..d3db0d4 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -8,7 +8,6 @@ This document will help you build the NNTPChan software from the source code.
 NNTPChan can run on the following operating systems:
 
 * Linux
-    * Instructions are available for Debian and [Trisquel](#trisquel-instructions-wip).
 * FreeBSD
 
 Dependancies:
@@ -16,7 +15,7 @@ Dependancies:
 * imagemagick
 * ffmpeg
 * sox
-* go _1.6_ or higher
+* go 1.9
 * GNU make
 
 ## Debian instructions
@@ -32,6 +31,11 @@ Install the Go programming language version _1.9_ from the [Go website](https://
     sudo apt-get update
     sudo apt-get --no-install-recommends install imagemagick ffmpeg sox build-essential git ca-certificates postgresql postgresql-client
 
+#### Configure PostgreSQL:
+
+    # su - postgres -c "createuser --pwprompt --encrypted srnd"
+    # su - postgres -c "createdb srnd"
+
 ### Get the NNTPChan source
 
     git clone https://github.com/majestrate/nntpchan --depth=1
@@ -43,41 +47,3 @@ Run `make`:
 
     make
 
-
-## Trisquel instructions (WIP)
-
-These are installation instructions for Trisquel.
-
-### Install Go
-
-Run this to install Go.
-
-    sudo apt-get update
-    sudo apt-get install golang-1.6
-
-### Installing dependancies (standard)
-
-    sudo apt-get --no-install-recommends install imagemagick sox build-essential git ca-certificates postgresql postgresql-client
-
-### Installing dependancies (`ffmpeg` is not available in Trisquel repos - there must be compiled)
-
-This will install `ffmpeg` to `/usr/local/bin/ffmpeg`:
-
-    git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg --depth=1
-    cd ffmpeg
-    ./configure --disable-yasm
-    make
-    sudo make install
-    cd ..
-    rm -rf ffmpeg
-
-### Get the NNTPChan source
-
-    git clone https://github.com/majestrate/nntpchan --depth=1
-    cd nntpchan
-
-### Now compile!
-
-run `make`
-
-    make