Merge remote-tracking branch 'upstream/master'

README.md

@@ -7,30 +7,30 @@ Shadowsocks for Windows
 
 1. System proxy configuration
 2. PAC mode and global mode
-3. GFWList and user rules
+3. [GFWList] and user rules
 4. Supports HTTP proxy
 5. Supports server auto switching
 6. Supports UDP relay (see Usage)
 
 #### Download
 
-Download a [latest release].
+Download the [latest release].
 
 #### Basic
 
 1. Find Shadowsocks icon in the notification tray
 2. You can add multiple servers in servers menu
-3. Select Enable System Proxy menu to enable system proxy. Please disable other
+3. Select `Enable System Proxy` menu to enable system proxy. Please disable other
 proxy addons in your browser, or set them to use system proxy
 4. You can also configure your browser proxy manually if you don't want to enable
 system proxy. Set Socks5 or HTTP proxy to 127.0.0.1:1080. You can change this
-port in Server -> Edit Servers
+port in `Servers -> Edit Servers`
 
 #### PAC
 
 1. You can change PAC rules by editing the PAC file. When you save the PAC file
 with any editor, Shadowsocks will notify browsers about the change automatically
-2. You can also update PAC file from GFWList (maintained by 3rd party)
+2. You can also update PAC file from [GFWList] (maintained by 3rd party)
 3. You can also use online PAC URL
 
 #### Server Auto Switching
@@ -44,7 +44,7 @@ with any editor, Shadowsocks will notify browsers about the change automatically
 #### UDP
 
 For UDP, you need to use SocksCap or ProxyCap to force programs you want
-to proxy to tunnel over Shadowsocks
+to be proxied to tunnel over Shadowsocks
 
 #### Develop
 
@@ -58,3 +58,4 @@ GPLv3
 [Appveyor]:       https://ci.appveyor.com/project/clowwindy/shadowsocks-csharp
 [Build Status]:   https://ci.appveyor.com/api/projects/status/gknc8l1lxy423ehv/branch/master
 [latest release]: https://github.com/shadowsocks/shadowsocks-csharp/releases
+[GFWList]:        https://github.com/gfwlist/gfwlist