Merge remote-tracking branch 'refs/remotes/origin/devel'

man/3proxy.8

@@ -1,4 +1,4 @@
-.TH 3proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH 3proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B 3proxy
 \- 3[APA3A] tiny proxy server, or trivial proxy server, or free proxy
@@ -147,7 +147,5 @@ http://3proxy.ru/
 .SH TRIVIA
 3APA3A is pronounced as \`\`zaraza\'\'.
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/3proxy.cfg.3

@@ -1,4 +1,4 @@
-.TH 3proxy.cfg "3" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH 3proxy.cfg "3" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B 3proxy.cfg
 \- 3proxy configuration file
@@ -913,7 +913,5 @@ http://3proxy.ru/
 .SH TRIVIA
 3APA3A is pronounced as \`\`zaraza\'\'.
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/ftppr.8

@@ -1,4 +1,4 @@
-.TH ftppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH ftppr "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B ftppr
 \- FTP proxy gateway service
@@ -79,7 +79,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/icqpr.8

@@ -1,4 +1,4 @@
-.TH icqpr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH icqpr "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B icqpr
 \- ICQ (AOL OSCAR) proxy
@@ -72,7 +72,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/pop3p.8

@@ -1,4 +1,4 @@
-.TH pop3p "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH pop3p "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B pop3p
 \- POP3 proxy gateway service
@@ -75,7 +75,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/proxy.8

@@ -1,4 +1,4 @@
-.TH proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B proxy
 \- HTTP proxy gateway service
@@ -70,7 +70,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/smtpp.8

@@ -1,4 +1,4 @@
-.TH smtpp "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH smtpp "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B smtpp
 \- SMTP proxy gateway service
@@ -76,7 +76,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/socks.8

@@ -1,4 +1,4 @@
-.TH socks "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH socks "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B socks
 \- SOCKS 4/4.5/5 gateway service
@@ -71,7 +71,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/tcppm.8

@@ -1,4 +1,4 @@
-.TH tcppm "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH tcppm "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B tcppm
 \- TCP port mapper
@@ -65,7 +65,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

man/udppm.8

@@ -1,4 +1,4 @@
-.TH udppm "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH udppm "8" "January 2016" "3proxy 0.8" "Universal proxy server"
 .SH NAME
 .B udppm
 \- UDP port mapper
@@ -71,7 +71,5 @@ Report all bugs to
 .br
 http://3proxy.ru/
 .SH AUTHORS
-3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
-Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+3proxy is designed by Vladimir 3APA3A Dubrovin
+.RI ( 3proxy@3proxy.ru )

src/version.h

@@ -1,2 +1,2 @@
 #define VERSION "3proxy-0.8-pre"
-#define BUILDDATE "160113004120"
+#define BUILDDATE "160113020317"