Merge 51dbaad50d into 23241717bf

docs/installation.html

@@ -79,6 +79,17 @@ distribution directory structure:</p>
 would be replaced by <tt>core.so</tt>.
 </p>
 
+<p>
+Alternatively, you can build and install LuaSocket using vcpkg dependency manager:
+
+<pre class=example>
+./vcpkg install luasocket
+</pre>
+
+The luasocket port in vcpkg is kept up to date by microsoft team members and community contributors.
+If the version is out of date, please create an issue or pull request on the vcpkg repository.
+
+</p>
 <h3>Using LuaSocket</h3>
 
 <p> With the above setup, and an interpreter with shared library support,

docs/ltn12.html

@@ -40,7 +40,7 @@ Pump, Support, Library">
 <h2 id="ltn12">LTN12</h2>
 
 <p> The <tt>ltn12</tt> namespace implements the ideas described in
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">
 LTN012, Filters sources and sinks</a>. This manual simply describes the
 functions. Please refer to the LTN for a deeper explanation of the
 functionality provided by this module.

docs/socket.html

@@ -164,6 +164,9 @@ Creates and returns a <em>clean</em>
 <a href="#try"><tt>try</tt></a>
 function that allows for cleanup before the exception
 is  raised.
+This implements the ideas described in
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn013.md">
+LTN012, Using finalized exceptions</a>.
 </p>
 
 <p class="parameters">
@@ -207,6 +210,9 @@ Converts a function that throws exceptions into a safe function. This
 function only catches exceptions thrown by the <a href="#try"><tt>try</tt></a>
 and <a href="#newtry"><tt>newtry</tt></a> functions. It does not catch normal
 Lua errors.
+This implements the ideas described in
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn013.md">
+LTN012, Using finalized exceptions</a>.
 </p>
 
 <p class="parameters">
@@ -425,6 +431,9 @@ socket.<b>try(</b>ret<sub>1</sub> [, ret<sub>2</sub> ... ret<sub>N</sub>]<b>)</b
 Throws an exception in case <tt>ret<sub>1</sub></tt> is falsy, using
 <tt>ret<sub>2</sub></tt> as the error message. The exception is supposed to be caught
 by a <a href="#protect"><tt>protect</tt></a>ed function only.
+This implements the ideas described in
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn013.md">
+LTN012, Using finalized exceptions</a>.
 </p>
 
 <p class="parameters">