summaryrefslogtreecommitdiff
path: root/deps/uv/docs
diff options
context:
space:
mode:
authorSaúl Ibarra Corretgé <saghul@gmail.com>2014-11-21 15:43:12 +0100
committerTrevor Norris <trev.norris@gmail.com>2014-11-26 12:08:36 -0800
commit9d9ed61c5a97562b93a2326f33922783ed509d47 (patch)
tree702c9dcc3a54bcc7bad26b9b756ddada54795c02 /deps/uv/docs
parent2d17193f20930bfe594d7008fe5c08f813f03c7b (diff)
downloadandroid-node-v8-9d9ed61c5a97562b93a2326f33922783ed509d47.tar.gz
android-node-v8-9d9ed61c5a97562b93a2326f33922783ed509d47.tar.bz2
android-node-v8-9d9ed61c5a97562b93a2326f33922783ed509d47.zip
deps: update libuv to 1.0.0
PR-URL: https://github.com/joyent/node/pull/8762 Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/uv/docs')
-rw-r--r--deps/uv/docs/src/fs.rst2
-rw-r--r--deps/uv/docs/src/index.rst5
-rw-r--r--deps/uv/docs/src/misc.rst2
-rw-r--r--deps/uv/docs/src/threading.rst3
4 files changed, 6 insertions, 6 deletions
diff --git a/deps/uv/docs/src/fs.rst b/deps/uv/docs/src/fs.rst
index cc8f5525b9..27d92d0b45 100644
--- a/deps/uv/docs/src/fs.rst
+++ b/deps/uv/docs/src/fs.rst
@@ -229,7 +229,7 @@ API
Limited equivalent to ``sendfile(2)``.
-.. c:function:: int uv_fs_access(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags, uv_fs_cb cb)
+.. c:function:: int uv_fs_access(uv_loop_t* loop, uv_fs_t* req, const char* path, int mode, uv_fs_cb cb)
Equivalent to ``access(2)`` on Unix. Windows uses ``GetFileAttributesW()``.
diff --git a/deps/uv/docs/src/index.rst b/deps/uv/docs/src/index.rst
index ce30cf9651..a8f00dab38 100644
--- a/deps/uv/docs/src/index.rst
+++ b/deps/uv/docs/src/index.rst
@@ -6,15 +6,14 @@ Overview
--------
libuv is a multi-platform support library with a focus on asynchronous I/O. It
-was primarily developed for use by `Node.js`_, but it's also used by Mozilla's
-`Rust language`_, `Luvit`_, `Julia`_, `pyuv`_, and `others`_.
+was primarily developed for use by `Node.js`_, but it's also used by `Luvit`_,
+`Julia`_, `pyuv`_, and `others`_.
.. note::
In case you find errors in this documentation you can help by sending
`pull requests <https://github.com/joyent/libuv>`_!
.. _Node.js: http://nodejs.org
-.. _Rust language: http://www.rust-lang.org
.. _Luvit: http://luvit.io
.. _Julia: http://julialang.org
.. _pyuv: https://github.com/saghul/pyuv
diff --git a/deps/uv/docs/src/misc.rst b/deps/uv/docs/src/misc.rst
index b313159dba..1e1125ad6b 100644
--- a/deps/uv/docs/src/misc.rst
+++ b/deps/uv/docs/src/misc.rst
@@ -171,7 +171,7 @@ API
.. c:function:: void uv_loadavg(double avg[3])
- Gets the load average. See: http://en.wikipedia.org/wiki/Load_(computing)
+ Gets the load average. See: `<http://en.wikipedia.org/wiki/Load_(computing)>`_
.. note::
Returns [0,0,0] on Windows (i.e., it's not implemented).
diff --git a/deps/uv/docs/src/threading.rst b/deps/uv/docs/src/threading.rst
index 38daf4e5a1..aab13f84b6 100644
--- a/deps/uv/docs/src/threading.rst
+++ b/deps/uv/docs/src/threading.rst
@@ -56,8 +56,9 @@ Threads
^^^^^^^
.. c:function:: int uv_thread_create(uv_thread_t* tid, uv_thread_cb entry, void* arg)
-.. c:function:: unsigned long uv_thread_self(void)
+.. c:function:: uv_thread_t uv_thread_self(void)
.. c:function:: int uv_thread_join(uv_thread_t *tid)
+.. c:function:: int uv_thread_equal(const uv_thread_t* t1, const uv_thread_t* t2)
Thread-local storage
^^^^^^^^^^^^^^^^^^^^