merged documentation fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-04-24 16:25:58 +00:00
parent b5cf2e8439
commit 865e689fc3
1 changed files with 10 additions and 2 deletions

View File

@ -7302,8 +7302,16 @@ resume file was rejected.
peer_blocked_alert
------------------
This alert is generated when a peer is blocked by the IP filter. The ``ip`` member is the
address that was blocked.
This alert is posted when an incoming peer connection, or a peer that's about to be added
to our peer list, is blocked for some reason. This could be any of:
* the IP filter
* i2p mixed mode restrictions (a normal peer is not allowed on an i2p swarm)
* the port filter
* the peer has a low port and ``no_connect_privileged_ports`` is enabled
* the protocol of the peer is blocked (uTP/TCP blocking)
The ``ip`` member is the address that was blocked.
::