Merge branch 'patch-1' of https://github.com/stqism/ToxCore

Author: irungentoo

INSTALL.md

@@ -45,17 +45,18 @@ pkg install autoconf automake gcc-47
 On FreeBSD 10+:
 
 ```tcsh
-pkg install automake autoconf
+pkg install net-im/tox
 ```
+Note, if you install from ports select NaCl for performance, and sodium if you want it to be portable.
 
 You should get and install [libsodium](https://github.com/jedisct1/libsodium):
 ```bash
 git clone git://github.com/jedisct1/libsodium.git
 cd libsodium
-git checkout tags/0.4.2
+git checkout tags/0.5.0
 ./autogen.sh
 ./configure && make check
-sudo checkinstall --install --pkgname libsodium --pkgversion 0.4.2 --nodoc
+sudo checkinstall --install --pkgname libsodium --pkgversion 0.5.0 --nodoc
 sudo ldconfig
 cd ..
 ```
@@ -67,7 +68,7 @@ this will install the libs to /usr/local/lib and the headers to /usr/local/inclu
 ```bash
 git clone git://github.com/jedisct1/libsodium.git
 cd libsodium
-git checkout tags/0.4.2
+git checkout tags/0.5.0
 ./autogen.sh
 ./configure
 make check
@@ -183,10 +184,10 @@ MinGW will install an "MinGW shell" (you should get a shortcut for it), make
 sure to perform all operations (i.e., generating/running configure script, compiling, etc.) from the MinGW shell.
 
 First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it.
-Assuming that you got the libsodium-0.4.2.tar.gz release:
+Assuming that you got the libsodium-0.5.0.tar.gz release:
 ```cmd
-tar -zxvf libsodium-0.4.2.tar.gz
-cd libsodium-0.4.2
+tar -zxvf libsodium-0.5.0.tar.gz
+cd libsodium-0.5.0
 ./configure
 make
 make install

README.md

@@ -1,21 +1,21 @@
-![Project Tox](https://raw.github.com/irungentoo/ProjectTox-Core/master/other/tox.png "Project Tox")
+![Project Tox](https://raw.github.com/irungentoo/toxcore/master/other/tox.png "Project Tox")
 ***
 
 With the rise of governmental monitoring programs, Tox, a FOSS initiative, aims to be an easy to use, all-in-one communication platform that ensures their users full privacy and secure message delivery.<br /> <br />
 
-[**Website**](https://tox.im) **|** [**Wiki**](http://wiki.tox.im/) **|** [**Blog**](https://blog.libtoxcore.so/) **|** [**FAQ**](http://wiki.tox.im/FAQ) **|** [**Binaries**](http://download.tox.im/) **|** [**Clients**](http://wiki.tox.im/Client) **|** [**Compiling**](http://wiki.tox.im/Installing) **|** [**API**](http://api.libtoxcore.so/) **|** [**Qt-GUI**](https://github.com/nurupo/ProjectTox-Qt-GUI) **|** **IRC:** #tox@freenode
+[**Website**](https://tox.im) **|** [**Wiki**](https://wiki.tox.im/) **|** [**Blog**](https://blog.libtoxcore.so/) **|** [**FAQ**](http://wiki.tox.im/FAQ) **|** [**Binaries**](https://wiki.tox.im/Binaries) **|** [**Clients**](https://wiki.tox.im/Client) **|** [**Compiling**](https://wiki.tox.im/Installing) **|** [**API**](https://libtoxcore.so/)  **|** **IRC:** #tox@freenode
 
 
 ## The Complex Stuff:
 ### UDP vs. TCP
-Tox must use UDP simply because [hole punching](http://en.wikipedia.org/wiki/UDP_hole_punching) with TCP is not as reliable.
+Tox must use UDP simply because [hole punching](https://en.wikipedia.org/wiki/UDP_hole_punching) with TCP is not as reliable.
 However, Tox does use [TCP relays](https://github.com/irungentoo/ProjectTox-Core/blob/master/docs/TCP_Network.txt) as a fallback if it encounters a firewall that prevents UDP hole punching.
 
 ### Connecting & Communicating
-Every peer is represented as a [byte string][String] (the public key [Tox ID] of the peer). By using torrent-style DHT, peers can find the IP of other peers by using their Tox ID. Once the IP is obtained, peers can initiate a [secure](https://github.com/irungentoo/ProjectTox-Core/wiki/Crypto) connection with each other. Once the connection is made, peers can exchange messages, send files, start video chats, etc. using encrypted communications.
+Every peer is represented as a [byte string][String] (the public key [Tox ID] of the peer). By using torrent-style DHT, peers can find the IP of other peers by using their Tox ID. Once the IP is obtained, peers can initiate a [secure](https://github.com/irungentoo/toxcore/wiki/Crypto) connection with each other. Once the connection is made, peers can exchange messages, send files, start video chats, etc. using encrypted communications.
 
 
-**Current build status:** [![Build Status](https://travis-ci.org/irungentoo/ProjectTox-Core.png?branch=master)](https://travis-ci.org/irungentoo/ProjectTox-Core)
+**Current build status:** [![Build Status](https://travis-ci.org/irungentoo/toxcore.png?branch=master)](https://travis-ci.org/irungentoo/toxcore)
 
 
 ## Q&A:
@@ -34,9 +34,9 @@ The goal of this project is to create a configuration-free P2P Skype replacement
 ## Documentation:
 
 - [Installation](/INSTALL.md)
-- [DHT Protocol](http://wiki.tox.im/index.php/DHT)<br />
-- [Lossless UDP Protocol](http://wiki.tox.im/index.php/Lossless_UDP)<br />
-- [Crypto](http://wiki.tox.im/index.php/Crypto)<br />
-- [Ideas](http://wiki.tox.im/index.php/Ideas)
+- [DHT Protocol](https://wiki.tox.im/index.php/DHT)<br />
+- [Lossless UDP Protocol](https://wiki.tox.im/index.php/Lossless_UDP)<br />
+- [Crypto](https://wiki.tox.im/index.php/Crypto)<br />
+- [Ideas](https://wiki.tox.im/index.php/Ideas)
 
 [String]: https://en.wikipedia.org/wiki/String_(computer_science)