merged changes from RC_1_0

include/libtorrent/extensions.hpp

@@ -357,7 +357,7 @@ namespace libtorrent
 		// can add entries to the extension handshake
 		// this is not called for web seeds
 		virtual void add_handshake(entry&) {}
-		
+
 		// called when the peer is being disconnected.
 		virtual void on_disconnect(error_code const& /*ec*/) {}
 
@@ -369,13 +369,13 @@ namespace libtorrent
 
 		// throwing an exception from any of the handlers (except add_handshake)
 		// closes the connection
-		
+
 		// this is called when the initial BT handshake is received. Returning false
 		// means that the other end doesn't support this extension and will remove
 		// it from the list of plugins.
 		// this is not called for web seeds
 		virtual bool on_handshake(char const* /*reserved_bits*/) { return true; }
-		
+
 		// called when the extension handshake from the other end is received
 		// if this returns false, it means that this extension isn't
 		// supported by this peer. It will result in this peer_plugin

include/libtorrent/session.hpp

@@ -165,13 +165,13 @@ namespace libtorrent
 	{
 	public:
 
-		// If the fingerprint in the first overload is omited, the client will
-		// get a default fingerprint stating the version of libtorrent. The
+		// If the fingerprint in the first overload is omited, the client will get
+		// a default fingerprint stating the version of libtorrent. The
 		// fingerprint is a short string that will be used in the peer-id to
 		// identify the client and the client's version. For more details see the
 		// fingerprint class.
 		// 
-		// The flags paramater can be used to start default features (upnp &
+		// The flags parameter can be used to start default features (upnp &
 		// nat-pmp) and default plugins (ut_metadata, ut_pex and smart_ban). The
 		// default is to start those features. If you do not want them to start,
 		// pass 0 as the flags parameter.