Add Changes entry for previous merge commit, plus other minor tidy-ups

5 files changed, 26 insertions, 16 deletions

diff --git a/Changes b/Changes
index 4c45615..86b00d1 100644
--- a/Changes
+++ b/Changes
@@ -2,14 +2,24 @@ Revision history for Perl distribution libnet
 
 3.07 Development
 
+    - Net::FTP, Net::NNTP, Net::POP3 and Net::SMTP can now restrict domain to
+      IPv4 even if IPv6 is available by using the new Domain or Family argument.
+
+      Net::NNTP now supports the LocalPort argument in addition to LocalAddr.
+
+      Net::POP3 now supports the LocalAddr and LocalPort arguments in addition
+      to ResvPort (which is retained for backwards compatibility).
+
+      [Steffen Ullrich, PR#18]
+
     - Fixed a bug in Net::Cmd::datasend() which caused octets in [\x80-\xFF]
       stored in a "binary string" to be replaced with their UTF-8 encodings if
       the string happened to be stored internally in an "upgraded" state (i.e.
-      with the UTF-8 flag on). (As noted below, strings passed to datasend()
+      with the UTF-8 flag on).  (As noted below, strings passed to datasend()
       should always be encoded first, and therefore not stored in such a state
       anyway, but it is all too easy for perl to change this internal state
       unless the encodeing is done at the very last minute before calling
-      datasend(), so it helps if datasend() plays more nicely in this case. In
+      datasend(), so it helps if datasend() plays more nicely in this case.  In
       particular, it was wrong of datasend() to treat upgraded and downgraded
       strings differently when their contents were identical at the Perl level.)
 
@@ -19,12 +29,12 @@ Revision history for Perl distribution libnet
       datasend(), but callers of datasend() should not have been relying on this
       behaviour anyway: In general, datasend() has no idea what encoding is
       required for output so callers should always encode the data to be output
-      to whatever encoding is required first. This has now been clarified in the
-      documentation.
+      to whatever encoding is required first.  This has now been clarified in
+      the documentation.
 
       Finally, a text string with characters >= U+0100 will now cause a "Wide
       character in print" warning from datasend() since such characters cannot
-      be output as bytes and datasend() no longer encodes to UTF-8. In this
+      be output as bytes and datasend() no longer encodes to UTF-8.  In this
       case, UTF-8 bytes will still be output as before since that happens to be
       the internal representation of such characters, but the warning is new.
       Callers should heed this warning and encode such strings to whatever
diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm
index 2a820aa..9f235a6 100644
--- a/lib/Net/FTP.pm
+++ b/lib/Net/FTP.pm
@@ -2,7 +2,7 @@
 #
 # Versions up to 2.77_2 Copyright (c) 1995-2004 Graham Barr <gbarr@pobox.com>.
 # All rights reserved.
-# Changes in Version 2.77_3 onwards Copyright (C) 2013-2014 Steve Hay.  All
+# Changes in Version 2.77_3 onwards Copyright (C) 2013-2015 Steve Hay.  All
 # rights reserved.
 # This module is free software; you can redistribute it and/or modify it under
 # the same terms as Perl itself, i.e. under the terms of either the GNU General
@@ -2035,7 +2035,7 @@ Roderick Schertler <roderick@gate.net> - for various inputs
 =head1 COPYRIGHT
 
 Versions up to 2.77_2 Copyright (c) 1995-2004 Graham Barr. All rights reserved.
-Changes in Version 2.77_3 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
+Changes in Version 2.77_3 onwards Copyright (C) 2013-2015 Steve Hay.  All rights
 reserved.
 
 This module is free software; you can redistribute it and/or modify it under the
diff --git a/lib/Net/NNTP.pm b/lib/Net/NNTP.pm
index 8fb2d64..7499204 100644
--- a/lib/Net/NNTP.pm
+++ b/lib/Net/NNTP.pm
@@ -806,7 +806,7 @@ in RFC977 and RFC4642.
 With L<IO::Socket::SSL> installed it also provides support for implicit and
 explicit TLS encryption, i.e. NNTPS or NNTP+STARTTLS.
 
-The Net::NNTP class is a subclass of Net::Cmd and IO::Socket::INET.
+The Net::NNTP class is a subclass of Net::Cmd and (depending on avaibility) of
 IO::Socket::IP, IO::Socket::INET6 or IO::Socket::INET.
 
 =head1 CONSTRUCTOR
@@ -851,7 +851,7 @@ with a value of zero, then this command will not be sent and the
 connection will be left talking to nnrpd.
 
 B<LocalAddr> and B<LocalPort> - These parameters are passed directly
-to IO::Socket to allow binding the socket to a a specific local addr and port.
+to IO::Socket to allow binding the socket to a specific local address and port.
 
 B<Domain> - This parameter is passed directly to IO::Socket and makes it
 possible to enforce IPv4 connections even if L<IO::Socket::IP> is used as super
@@ -1292,7 +1292,7 @@ Steve Hay E<lt>F<shay@cpan.org>E<gt> is now maintaining libnet as of version
 =head1 COPYRIGHT
 
 Versions up to 2.24_1 Copyright (c) 1995-1997 Graham Barr. All rights reserved.
-Changes in Version 2.25 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
+Changes in Version 2.25 onwards Copyright (C) 2013-2015 Steve Hay.  All rights
 reserved.
 
 This module is free software; you can redistribute it and/or modify it under the
diff --git a/lib/Net/POP3.pm b/lib/Net/POP3.pm
index b523348..791b1d2 100644
--- a/lib/Net/POP3.pm
+++ b/lib/Net/POP3.pm
@@ -2,7 +2,7 @@
 #
 # Versions up to 2.29 Copyright (c) 1995-2004 Graham Barr <gbarr@pobox.com>.
 # All rights reserved.
-# Changes in Version 2.29_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
+# Changes in Version 2.29_01 onwards Copyright (C) 2013-2015 Steve Hay.  All
 # rights reserved.
 # This module is free software; you can redistribute it and/or modify it under
 # the same terms as Perl itself, i.e. under the terms of either the GNU General
@@ -628,7 +628,7 @@ This module implements a client interface to the POP3 protocol, enabling
 a perl5 application to talk to POP3 servers. This documentation assumes
 that you are familiar with the POP3 protocol described in RFC1939.
 With L<IO::Socket::SSL> installed it also provides support for implicit and
-explicit TLS encryption, i.e. POP3S or POP3+STLS.
+explicit TLS encryption, i.e. POP3S or POP3+STARTTLS.
 
 A new Net::POP3 object must be created with the I<new> method. Once
 this has been done, all POP3 commands are accessed via method calls
@@ -668,7 +668,7 @@ You can use SSL arguments as documented in L<IO::Socket::SSL>, but it will
 usually use the right arguments already.
 
 B<LocalAddr> and B<LocalPort> - These parameters are passed directly
-to IO::Socket to allow binding the socket to a a specific local addr and port.
+to IO::Socket to allow binding the socket to a specific local address and port.
 For compatibility with older versions B<ResvPort> can be used instead of
 B<LocalPort>.
 
@@ -853,7 +853,7 @@ Steve Hay E<lt>F<shay@cpan.org>E<gt> is now maintaining libnet as of version
 =head1 COPYRIGHT
 
 Versions up to 2.29 Copyright (c) 1995-2004 Graham Barr. All rights reserved.
-Changes in Version 2.29_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
+Changes in Version 2.29_01 onwards Copyright (C) 2013-2015 Steve Hay.  All
 rights reserved.
 
 This module is free software; you can redistribute it and/or modify it under the
diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm
index f1b2ce1..7a703d9 100644
--- a/lib/Net/SMTP.pm
+++ b/lib/Net/SMTP.pm
@@ -737,7 +737,7 @@ You can use SSL arguments as documented in L<IO::Socket::SSL>, but it will
 usually use the right arguments already.
 
 B<LocalAddr> and B<LocalPort> - These parameters are passed directly
-to IO::Socket to allow binding the socket to a a specific local addr and port.
+to IO::Socket to allow binding the socket to a specific local address and port.
 
 B<Domain> - This parameter is passed directly to IO::Socket and makes it
 possible to enforce IPv4 connections even if L<IO::Socket::IP> is used as super
@@ -1028,7 +1028,7 @@ Steve Hay E<lt>F<shay@cpan.org>E<gt> is now maintaining libnet as of version
 =head1 COPYRIGHT
 
 Versions up to 2.31_1 Copyright (c) 1995-2004 Graham Barr. All rights reserved.
-Changes in Version 2.31_2 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
+Changes in Version 2.31_2 onwards Copyright (C) 2013-2015 Steve Hay.  All rights
 reserved.
 
 This module is free software; you can redistribute it and/or modify it under the