rebase Manual.md patch

1 files changed, 30 insertions, 20 deletions

diff --git a/debian/patches/0001-Debianize-doc-Manual.md.patch b/debian/patches/0001-Debianize-doc-Manual.md.patch
index 1bd45f2..3736c50 100644
--- a/debian/patches/0001-Debianize-doc-Manual.md.patch
+++ b/debian/patches/0001-Debianize-doc-Manual.md.patch
@@ -3,18 +3,25 @@ Date: Wed, 14 Dec 2016 16:27:55 +0100
 Subject: Debianize doc/Manual.md
 
 ---
- doc/Manual.md | 45 +--------------------------------------------
- 1 file changed, 1 insertion(+), 44 deletions(-)
+ doc/Manual.md | 56 +-------------------------------------------------------
+ 1 file changed, 1 insertion(+), 55 deletions(-)
 
 diff --git a/doc/Manual.md b/doc/Manual.md
-index 2a16a90..c121a35 100644
+index 6036400..58eff40 100644
 --- a/doc/Manual.md
 +++ b/doc/Manual.md
-@@ -1,50 +1,7 @@
- Thanks for using restic. This document will give you an overview of the basic
+@@ -1,60 +1,6 @@
+-nhanks for using restic. This document will give you an overview of the basic
++Thanks for using restic. This document will give you an overview of the basic
  functionality provided by restic.
  
--# Building/installing restic
+-# Installing restic
+-
+-## from pre-compiled binary
+-
+-You can download the latest pre-compiled binary from the [restic release page](https://github.com/restic/restic/releases/latest).
+-
+-## Mac OS X
 -
 -If you are using Mac OS X, you can install restic using the
 -[homebrew](http://brew.sh/) packet manager:
@@ -24,25 +31,19 @@ index 2a16a90..c121a35 100644
 -$ brew install restic
 -```
 -
+-## archlinux
+-
 -On archlinux, there is a package called `restic-git` which can be installed from AUR, e.g. with `pacaur`:
 -
 -```console
 -$ pacaur -S restic-git
 -```
 -
--At debian stable you can install 'go' directly from the repositories (as root):
--
--```console
--$ apt-get install golang-go
--```
--
--after installation of 'go' go straight forward to 'git clone [...]'
+-# Building restic
 -
--If you are using Linux, BSD or Windows, the only way to install restic on your
--system right now is to compile it from source. restic is written in the Go
--programming language and you need at least Go version 1.6. Building restic may
--also work with older versions of Go, but that's not supported. See the [Getting
--started](https://golang.org/doc/install) guide of the Go project for
+-restic is written in the Go programming language and you need at least Go version 1.7.
+-Building restic may also work with older versions of Go, but that's not supported.
+-See the [Getting started](https://golang.org/doc/install) guide of the Go project for
 -instructions how to install Go.
 -
 -In order to build restic from source, execute the following steps:
@@ -56,9 +57,18 @@ index 2a16a90..c121a35 100644
 -$ go run build.go
 -```
 -
+-You can easily cross-compile restic for all supported platforms, just supply
+-the target OS and platform via the command-line options like this (for Windows
+-and FreeBSD respectively):
+-
+-    $ go run build.go --goos windows --goarch amd64
+-
+-    $ go run build.go --goos freebsd --goarch 386
+-
+-The resulting binary is statically linked and does not require any libraries.
+-
 -At the moment, the only tested compiler for restic is the official Go compiler.
 -Building restic with gccgo may work, but is not supported.
-+# Basic usage
  
- Usage help is available:
+ # Usage help