Merge pull request #151 from camathieu/1.2-rc1

rebase 1.2 rc1 on 1.1.1
root-gg · Feb 11, 2016 · f68c80c · f68c80c
2 parents 25204a1 + 55b6acd
commit f68c80c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -28,9 +28,9 @@ Plik is an simple and powerful file uploading system written in golang.
 ##### From release
 To run plik, it's very simple :
 ```sh
-$ wget https://github.com/root-gg/plik/releases/download/1.1/plik-1.1.tar.gz
-$ tar xvf plik-1.1.tar.gz
-$ cd plik-1.1/server
+$ wget https://github.com/root-gg/plik/releases/download/1.1.1/plik-1.1.1.tar.gz
+$ tar xvf plik-1.1.1.tar.gz
+$ cd plik-1.1.1/server
 $ ./plikd
 ```
 Et voilà ! You now have a fully functional instance of plik running on http://127.0.0.1:8080.  

diff --git a/client/plik.go b/client/plik.go
@@ -99,7 +99,7 @@ Options:
   --archive MODE            Archive upload using specified archive backend : tar|zip
   --compress MODE           [tar] Compression codec : gzip|bzip2|xz|lzip|lzma|lzop|compress|no
   --archive-options OPTIONS [tar|zip] Additional command line options
-  -s                        Encrypt upload usnig default encrypt params ( see ~/.plikrc )
+  -s                        Encrypt upload using default encrypt params ( see ~/.plikrc )
   --secure MODE             Archive upload using specified archive backend : openssl|pgp
   --cipher CIPHER           [openssl] Openssl cipher to use ( see openssl help )
   --passphrase PASSPHRASE   [openssl] Passphrase or '-' to be prompted for a passphrase