From bb61197b4f7eccdd23eddcee33f64003c46a9980 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Mon, 4 Jul 2016 23:26:28 -0500 Subject: [PATCH] Minor corrections to docs [ci skip] --- README-zh.md | 6 +++--- README.md | 4 ++-- docs/clients-xauth-zh.md | 4 ++-- docs/clients-xauth.md | 6 +++--- docs/clients-zh.md | 4 ++-- docs/clients.md | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README-zh.md b/README-zh.md index ddbed48..458e0da 100644 --- a/README-zh.md +++ b/README-zh.md @@ -45,7 +45,7 @@ **-或者-** -一个专用服务器，或者任何基于 KVM/Xen 的虚拟专用服务器 (VPS)，全新安装以上系统之一。另外也可用 Debian 7 (Wheezy)，但是必须首先运行 另一个脚本。 OpenVZ VPS 用户请使用其它的 VPN 软件，比如 Shadowsocks ( libev | rss )。 +一个专用服务器，或者任何基于 KVM/Xen 的虚拟专用服务器 (VPS)，全新安装以上系统之一。另外也可用 Debian 7 (Wheezy)，但是必须首先运行 另一个脚本。 OpenVZ VPS 用户可以尝试使用 Shadowsocks ( libev | rss ) 或者 OpenVPN。 **» 我想建立并使用自己的 VPN ，但是没有可用的服务器** @@ -104,7 +104,7 @@ VPN_PASSWORD='你的VPN密码' sh vpnsetup.sh ## 重要提示 -**Windows 用户** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。另外如果在连接过程中遇到错误，请参见 故障排除。 +**Windows 用户** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器 和/或 客户端与 NAT （比如家用路由器）的兼容问题。如果在连接过程中遇到错误，请参见 故障排除。 **Android 6 (Marshmallow) 用户** 请参考此文档中的注释： 配置 IPsec/L2TP VPN 客户端。 @@ -116,7 +116,7 @@ VPN_PASSWORD='你的VPN密码' sh vpnsetup.sh 对于有外部防火墙的服务器（比如 EC2/GCE），请打开 UDP 端口 500 和 4500，以及 TCP 端口 22 （用于 SSH）。 -如果你为服务器配置了自定义 SSH 端口（不是 22）或其他服务，请在使用前编辑脚本中的 IPTables 防火墙规则。 +如果你的服务器配置了自定义 SSH 端口（不是 22）或运行其他服务，请在使用前编辑脚本中的 IPTables 防火墙规则。或者在安装后编辑以下文件并重启： `/etc/iptables.rules`, `/etc/iptables/rules.v4` 和/或 `/etc/sysconfig/iptables`。 这些脚本在更改现有的配置文件之前会先做备份，使用 `.old-日期-时间` 为文件名后缀。 diff --git a/README.md b/README.md index 38f70f0..d2b2aa5 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ Enjoy your very own VPN! :sparkles::tada::rocket::sparkles: ## Important Notes -For **Windows users**, a one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). If you encountered an error when connecting, see Troubleshooting. +For **Windows users**, a one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). If you get an error when trying to connect, see Troubleshooting. **Android 6 (Marshmallow) users**: Please see notes in Configure IPsec/L2TP VPN Clients. @@ -116,7 +116,7 @@ When connecting via `IPsec/L2TP`, the VPN server has IP `192.168.42.1` within th For servers with an external firewall (e.g. EC2/GCE), open UDP ports 500 & 4500, and TCP port 22 (for SSH). -If your server has a custom SSH port (not 22) or other services, edit IPTables rules in the script before using. +If your server uses a custom SSH port (not 22) or runs other services, edit IPTables rules in the scripts before using. Or edit these files after install and reboot: `/etc/iptables.rules`, `/etc/iptables/rules.v4` and/or `/etc/sysconfig/iptables`. The scripts will backup existing config files before making changes, with `.old-date-time` suffix. diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index dc89975..2630875 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -37,13 +37,13 @@ VPN 连接成功后，会在 VPN Connect 状态窗口中显示 **tunnel enabled* 如果在连接过程中遇到错误，请参见 故障排除。 -**注：** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。请参照链接文章中的说明，或者打开提升权限命令提示符并运行以下命令。完成后必须重新启动计算机。 +**注：** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器 和/或 客户端与 NAT （比如家用路由器）的兼容问题。请参照链接网页中的说明，或者打开提升权限命令提示符并运行以下命令。完成后必须重启计算机。 - 适用于 Windows Vista, 7, 8 和 10 ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\PolicyAgent /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ``` -- 仅限 Windows XP +- 仅适用于 Windows XP ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\IPSec /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ``` diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index 3e756c0..595d2da 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -35,15 +35,15 @@ After settin Once connected, you will see **tunnel enabled** in the VPN Connect status window. You can verify that your traffic is being routed properly by looking up your IP address on Google. It should say "Your public IP address is `Your VPN Server IP`". -If you encountered an error when connecting, see Troubleshooting. +If you get an error when trying to connect, see Troubleshooting. -**Note:** A one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Please refer to the linked page, or run the following from an elevated command prompt. You must reboot your computer when done. +**Note:** This one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Refer to the linked web page, or run the following from an elevated command prompt. You must reboot your computer when finished. - For Windows Vista, 7, 8 and 10 ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\PolicyAgent /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ``` -- For Windows XP only +- For Windows XP ONLY ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\IPSec /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ``` diff --git a/docs/clients-zh.md b/docs/clients-zh.md index 1e61648..119ef96 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -67,13 +67,13 @@ 如果在连接过程中遇到错误，请参见 故障排除。 -**注：** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。请参照链接文章中的说明，或者打开提升权限命令提示符并运行以下命令。完成后必须重新启动计算机。 +**注：** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器 和/或 客户端与 NAT （比如家用路由器）的兼容问题。请参照链接网页中的说明，或者打开提升权限命令提示符并运行以下命令。完成后必须重启计算机。 - 适用于 Windows Vista, 7, 8 和 10 ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\PolicyAgent /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ``` -- 仅限 Windows XP +- 仅适用于 Windows XP ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\IPSec /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ``` diff --git a/docs/clients.md b/docs/clients.md index 92620a7..0fb5baf 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -65,15 +65,15 @@ After settin To connect to the VPN: Click on the wireless/network icon in your system tray, select the new VPN entry, and click **Connect**. If prompted, enter `Your VPN Username` and `Password`, then click **OK**. You can verify that your traffic is being routed properly by looking up your IP address on Google. It should say "Your public IP address is `Your VPN Server IP`". -If you encountered an error when connecting, see Troubleshooting. +If you get an error when trying to connect, see Troubleshooting. -**Note:** A one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Please refer to the linked page, or run the following from an elevated command prompt. You must reboot your computer when done. +**Note:** This one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Refer to the linked web page, or run the following from an elevated command prompt. You must reboot your computer when finished. - For Windows Vista, 7, 8 and 10 ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\PolicyAgent /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ``` -- For Windows XP only +- For Windows XP ONLY ```console REG ADD HKLM\SYSTEM\CurrentControlSet\Services\IPSec /v AssumeUDPEncapsulationContextOnSendRule /t REG_DWORD /d 0x2 /f ```