summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMaurice Butler <maurice.butler@gmail.com>2014-07-07 16:29:59 +1000
committerFedor Indutny <fedor@indutny.com>2014-07-07 12:00:10 +0300
commit71fc4d9486ed13276e0f27ab755e6e233d91c714 (patch)
treea355ab2c39b67ed6a27e4532290d2cddacb8f2ef /doc
parente2f2a202791293f2152a382852885bfd5eaf87e4 (diff)
downloadandroid-node-v8-71fc4d9486ed13276e0f27ab755e6e233d91c714.tar.gz
android-node-v8-71fc4d9486ed13276e0f27ab755e6e233d91c714.tar.bz2
android-node-v8-71fc4d9486ed13276e0f27ab755e6e233d91c714.zip
doc: added X.json to the LOAD_AS_FILE sudo code
Signed-off-by: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/api/modules.markdown3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown
index a9c503448e..7632d30e54 100644
--- a/doc/api/modules.markdown
+++ b/doc/api/modules.markdown
@@ -385,7 +385,8 @@ in pseudocode of what require.resolve does:
LOAD_AS_FILE(X)
1. If X is a file, load X as JavaScript text. STOP
2. If X.js is a file, load X.js as JavaScript text. STOP
- 3. If X.node is a file, load X.node as binary addon. STOP
+ 3. If X.json is a file, parse X.json to a JavaScript Object. STOP
+ 4. If X.node is a file, load X.node as binary addon. STOP
LOAD_AS_DIRECTORY(X)
1. If X/package.json is a file,