Fix merge conflicts

doc/toxic.conf.5.asc

@@ -72,6 +72,9 @@ OPTIONS
     *show_welcome_msg*;;
         Show welcome message on startup. true or false
 
+    *show_connection_msg*;;
+        Enable friend connection change notifications. true or false
+
     *history_size*;;
         Maximum lines for chat window history. Integer value. (for example: 700)
 
@@ -126,6 +129,10 @@ OPTIONS
     *chatlogs_path*;;
         Default path for chatlogs. String value. Absolute path for chatlog files.
 
+    *password_eval*;;
+        Replace password prompt by running this command and using its output as
+	the password.
+
 *sounds*::
     Configuration related to notification sounds.
     Special value "silent" can be used to disable a specific notification. +
@@ -197,6 +204,9 @@ OPTIONS
     *toggle_peerlist*;;
         Toggle the peer list on and off.
 
+    *toggle_paste_mode*;;
+        Toggle treating linebreaks as enter key press.
+
 
 FILES
 -----
@@ -214,7 +224,7 @@ SEE ALSO
 
 RESOURCES
 ---------
-Project page: <https://github.com/Tox/toxic>
+Project page: <https://github.com/JFreegman/toxic>
 
 IRC channel:  chat.freenode.net#tox