delta/node.git/doc/api/https.markdown, branch execSync-wip

Merge remote-tracking branch 'origin/v0.10'

2013-05-29T21:12:11+00:00

Conflicts:
	deps/uv/ChangeLog
	deps/uv/src/unix/stream.c
	deps/uv/src/version.c
	lib/tls.js

https: Add `secureProtocol` docs

2013-05-28T19:43:37+00:00

Add `secureProtocol` parameter docs to the https.request method.

https: implement https.Server#setTimeout()

2013-04-30T11:10:56+00:00

Like commit d258fb0 ("http: More useful setTimeout API on server") but
this time for the https module.

Fixes #5361.

doc: https: Fix the link to tls.connect

2013-03-16T22:52:39+00:00

Merge remote-tracking branch 'ry/v0.8' into master

2012-12-14T00:57:58+00:00

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/test/test-spawn.c
	deps/uv/uv.gyp
	src/cares_wrap.cc
	src/node.cc
	src/node_version.h
	test/simple/test-buffer.js
	tools/gyp/pylib/gyp/common.py
	tools/install.py

doc: Fix missing link target to 'https.request()'

2012-11-28T02:11:40+00:00

doc: remove duplicate set of options

2012-10-30T00:20:17+00:00

doc: reflect hostname v. host preference in examples

2012-10-29T19:34:03+00:00

The documentation for http.request and https.request states that
`hostname` is preferred over `host` so the code examples should
use that option name.

Merge remote-tracking branch 'origin/v0.8'

2012-10-13T23:16:56+00:00

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/test/runner-win.c
	doc/api/process.markdown
	lib/repl.js
	src/node_crypto.cc
	src/node_version.h

doc: consistent use of the callback argument

2012-10-08T20:58:11+00:00