diff --git a/README-zh.md b/README-zh.md index d747228..4890498 100644 --- a/README-zh.md +++ b/README-zh.md @@ -105,7 +105,7 @@ sudo sh vpnsetup_centos.sh ## 重要提示 -**Windows 用户** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。另外如果遇到`Error 628`，请打开 VPN 连接属性的"安全"选项卡，启用 `CHAP` 选项并禁用 `MS-CHAP v2`。 +**Windows 用户** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。另外如果遇到`Error 628`，请打开 VPN 连接属性的"安全"选项卡，启用 `CHAP` 选项并禁用 `MS-CHAP v2`。 **Android 6 (Marshmallow) 用户** 请参见此文档中的注释： 配置 IPsec/L2TP VPN 客户端。 @@ -119,7 +119,7 @@ sudo sh vpnsetup_centos.sh ## 关于升级Libreswan -提供两个额外的脚本 vpnupgrade_Libreswan.sh 和 vpnupgrade_Libreswan_centos.sh ，可用于将已安装的 Libreswan 不定期升级至最新版本。请关注官方网站，并在运行前根据需要更新 `SWAN_VER` 变量。 +提供两个额外的脚本 vpnupgrade_Libreswan.sh 和 vpnupgrade_Libreswan_centos.sh ，可用于将已安装的 Libreswan 不定期升级至最新版本。请关注官方网站，并在运行前根据需要更新 `swan_ver` 变量。 ## 问题和反馈 diff --git a/README.md b/README.md index 8b30665..2d04e52 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,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). In case you see `Error 628`, go to the "Security" tab of VPN connection properties, enable `CHAP` and disable `MS-CHAP v2`. +For **Windows users**, a one-time registry change is required if the VPN server and/or client is behind NAT (e.g. home router). Also, if you see `Error 628`, go to the "Security" tab of VPN connection properties, enable `CHAP` and disable `MS-CHAP v2`. **Android 6 (Marshmallow) users**： Please see notes in Configure IPsec/L2TP VPN Clients. @@ -119,7 +119,7 @@ The scripts will backup existing config files before making changes, with `.old- ## Upgrading Libreswan -The additional scripts vpnupgrade_Libreswan.sh and vpnupgrade_Libreswan_centos.sh can be used to periodically upgrade Libreswan to the latest version. Check the official website and update the `SWAN_VER` variable as necessary. +The additional scripts vpnupgrade_Libreswan.sh and vpnupgrade_Libreswan_centos.sh can be used to periodically upgrade Libreswan to the latest version. Check the official website and update the `swan_ver` variable as necessary. ## Bugs & Questions diff --git a/docs/clients-xauth-zh.md b/docs/clients-xauth-zh.md index 44ad3fe..01797b9 100644 --- a/docs/clients-xauth-zh.md +++ b/docs/clients-xauth-zh.md @@ -34,7 +34,6 @@ VPN 连接成功后，会在 VPN Connect 状态窗口中显示 **tunnel enabled** 字样。最后你可以到这里检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。 - **注：** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。请参照链接文章中的说明，或者打开提升权限命令提示符并运行以下命令。完成后必须重新启动计算机。 - 适用于 Windows Vista 及以上版本 ```console diff --git a/docs/clients-xauth.md b/docs/clients-xauth.md index ed9c068..0852c67 100644 --- a/docs/clients-xauth.md +++ b/docs/clients-xauth.md @@ -34,7 +34,6 @@ Note: You may also connect using [IPsec/L2TP mode](clients.md). No additional so 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`". - **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. - For Windows Vista and newer ```console diff --git a/docs/clients-zh.md b/docs/clients-zh.md index a1d27db..1dac4c4 100644 --- a/docs/clients-zh.md +++ b/docs/clients-zh.md @@ -40,7 +40,6 @@ 要连接到 VPN，只需在系统托盘中的无线/网络图标上单击右键，选择新的 VPN 连接，然后单击 **连接**。最后你可以到这里检测你的 IP 地址，应该显示为`你的 VPN 服务器 IP`。 - **注：** 在首次连接之前需要修改一次注册表，以解决 VPN 服务器和客户端与 NAT （比如家用路由器）的兼容问题。请参照链接文章中的说明，或者打开提升权限命令提示符并运行以下命令。完成后必须重新启动计算机。 - 适用于 Windows Vista 及以上版本 ```console diff --git a/docs/clients.md b/docs/clients.md index d5f4acf..50024cc 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -40,7 +40,6 @@ After settin To connect to the VPN, simply right-click on the wireless/network icon in your system tray, select the new VPN connection, and click **Connect**. 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`". - **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. - For Windows Vista and newer ```console