summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2011-12-23 15:58:11 -0800
committerRyan Dahl <ry@tinyclouds.org>2011-12-23 15:58:11 -0800
commitc2d9e62f1691ace1c837811716aa515d5c4947fc (patch)
treea6cf3eb1e2bbb3ef1d5db3916af55341537f9637 /doc
parente4731f816817bc6ea52d1fa2d51cb024bd48c337 (diff)
parentd85c85aac1e2e87c0dbac7feddeb38f23da6d700 (diff)
downloadnode-new-c2d9e62f1691ace1c837811716aa515d5c4947fc.tar.gz
Merge remote branch 'origin/v0.6'
Conflicts: deps/v8/src/version.cc
Diffstat (limited to 'doc')
-rw-r--r--doc/about/index.html18
-rw-r--r--doc/api/addons.markdown2
-rw-r--r--doc/api/crypto.markdown7
-rw-r--r--doc/community/index.html17
-rw-r--r--doc/index.html20
-rw-r--r--doc/template.html11
6 files changed, 37 insertions, 38 deletions
diff --git a/doc/about/index.html b/doc/about/index.html
index 4e67c9e336..f3a33554f4 100644
--- a/doc/about/index.html
+++ b/doc/about/index.html
@@ -1,7 +1,8 @@
<!doctype html>
<html>
<head>
- <style type="text/css">
+ <meta charset="utf-8">
+ <style>
ul {
padding: 0;
margin: 0;
@@ -9,13 +10,12 @@
</style>
<link type="image/x-icon" rel="icon" href="../favicon.ico">
<link type="image/x-icon" rel="shortcut icon" href="../favicon.ico">
- <link type="text/css" rel="stylesheet" href="../pipe.css">
- <link type="text/css" rel="stylesheet" href="../sh_vim-dark.css">
+ <link rel="stylesheet" href="../pipe.css">
+ <link rel="stylesheet" href="../sh_vim-dark.css">
<link rel="alternate"
type="application/rss+xml"
title="node blog"
href="http://feeds.feedburner.com/nodejs/123123123">
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>node.js</title>
</head>
<body>
@@ -109,16 +109,16 @@ console.log('Server running at http://127.0.0.1:1337/');</pre>
is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>.
</div>
- <script type="text/javascript" src="../sh_main.js"></script>
- <script type="text/javascript" src="../sh_javascript.min.js"></script>
- <script type="text/javascript">highlight(undefined, undefined, 'pre');</script>
+ <script src="../sh_main.js"></script>
+ <script src="../sh_javascript.min.js"></script>
+ <script>highlight(undefined, undefined, 'pre');</script>
- <script type="text/javascript">
+ <script>
var gaJsHost = (("https:" == document.location.protocol) ?
"https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
- <script type="text/javascript">
+ <script>
try {
var pageTracker = _gat._getTracker("UA-10874194-2");
pageTracker._trackPageview();
diff --git a/doc/api/addons.markdown b/doc/api/addons.markdown
index b004014126..6f99f8be48 100644
--- a/doc/api/addons.markdown
+++ b/doc/api/addons.markdown
@@ -88,4 +88,4 @@ the recently built module:
console.log(addon.hello()); // 'world'
For the moment, that is all the documentation on addons. Please see
-<https://github.com/ry/node_postgres> for a real example.
+<https://github.com/pietern/hiredis-node> for a real example.
diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index d51b1fa0c0..6ca68d5c38 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -47,9 +47,10 @@ Example: this program that takes the sha1 sum of a file
console.log(d + ' ' + filename);
});
-### hash.update(data)
+### hash.update(data, input_encoding='binary')
-Updates the hash content with the given `data`.
+Updates the hash content with the given `data`, the encoding of which is given
+in `input_encoding` and can be `'utf8'`, `'ascii'` or `'binary'`.
This can be called many times with new data as it is streamed.
### hash.digest(encoding='binary')
@@ -255,4 +256,4 @@ Generates cryptographically strong pseudo-random data. Usage:
console.log('Have %d bytes of random data: %s', buf.length, buf);
} catch (ex) {
// handle error
- } \ No newline at end of file
+ }
diff --git a/doc/community/index.html b/doc/community/index.html
index 3dd7cd7e3e..9c427624b5 100644
--- a/doc/community/index.html
+++ b/doc/community/index.html
@@ -1,15 +1,15 @@
<!doctype html>
<html>
<head>
- <style type="text/css">
+ <meta charset="utf-8">
+ <style>
ul {
padding: 0;
margin: 0;
}
</style>
- <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js?ver=3.1.3'></script>
- <script type="text/javascript" src="../sh_main.js"></script>
- <script type="text/javascript" src="../sh_javascript.min.js"></script>
+ <script src="../sh_main.js"></script>
+ <script src="../sh_javascript.min.js"></script>
<link type="image/x-icon" rel="icon" href="../favicon.ico">
<link type="image/x-icon" rel="shortcut icon" href="../favicon.ico">
<link type="text/css" rel="stylesheet" href="../pipe.css">
@@ -18,7 +18,6 @@
type="application/rss+xml"
title="node blog"
href="http://feeds.feedburner.com/nodejs/123123123">
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>node.js</title>
</head>
<body>
@@ -148,16 +147,16 @@
is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>.
</div>
- <script type="text/javascript">
+ <script>
var gaJsHost = (("https:" == document.location.protocol) ?
"https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
- <script type="text/javascript">
+ <script>
try {
var pageTracker = _gat._getTracker("UA-10874194-2");
pageTracker._trackPageview();
} catch(err) {}
</script>
-
-</body></html>
+</body>
+</html> \ No newline at end of file
diff --git a/doc/index.html b/doc/index.html
index f687c1495c..fab47811bb 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,7 +1,8 @@
<!doctype html>
-<html>
+<html lang="en">
<head>
- <style type="text/css">
+ <meta charset="utf-8">
+ <style>
ul {
padding: 0;
margin: 0;
@@ -9,13 +10,12 @@
</style>
<link type="image/x-icon" rel="icon" href="favicon.ico">
<link type="image/x-icon" rel="shortcut icon" href="favicon.ico">
- <link type="text/css" rel="stylesheet" href="pipe.css">
- <link type="text/css" rel="stylesheet" href="sh_vim-dark.css">
+ <link rel="stylesheet" href="pipe.css">
+ <link rel="stylesheet" href="sh_vim-dark.css">
<link rel="alternate"
type="application/rss+xml"
title="node blog"
href="http://feeds.feedburner.com/nodejs/123123123">
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>node.js</title>
</head>
<body>
@@ -200,16 +200,16 @@ server.listen(1337, "127.0.0.1");</pre>
is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>.
</div>
- <script type="text/javascript" src="sh_main.js"></script>
- <script type="text/javascript" src="sh_javascript.min.js"></script>
- <script type="text/javascript">highlight(undefined, undefined, 'pre');</script>
+ <script src="sh_main.js"></script>
+ <script src="sh_javascript.min.js"></script>
+ <script>highlight(undefined, undefined, 'pre');</script>
- <script type="text/javascript">
+ <script>
var gaJsHost = (("https:" == document.location.protocol) ?
"https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
- <script type="text/javascript">
+ <script>
try {
var pageTracker = _gat._getTracker("UA-10874194-2");
pageTracker._trackPageview();
diff --git a/doc/template.html b/doc/template.html
index 60826dcab2..0f65b366f1 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -1,7 +1,7 @@
-<!DOCTYPE html>
-<html>
+<!doctype html>
+<html lang="en">
<head>
- <meta charset="UTF-8">
+ <meta charset="utf-8">
<title>{{section}}Node.js v0.6.6 Manual &amp; Documentation</title>
<link rel="stylesheet" href="assets/style.css">
<link rel="stylesheet" href="assets/sh.css">
@@ -21,16 +21,15 @@
<script src="assets/sh_main.js"></script>
<script src="assets/sh_javascript.min.js"></script>
<script>highlight(undefined, undefined, 'pre');</script>
- <script type="text/javascript">
+ <script>
var gaJsHost = (("https:" == document.location.protocol) ?
"https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
- <script type="text/javascript">
+ <script>
try {
var pageTracker = _gat._getTracker("UA-10874194-2");
pageTracker._trackPageview();
} catch(err) {}</script>
- <script type="text/javascript">highlight(undefined, undefined, 'pre');</script>
</body>
</html>
View Lorry Controller Status