nodejs · minervapanda · Oct 7, 2016 · Oct 8, 2016
diff --git a/doc/api/buffer.md b/doc/api/buffer.md
@@ -1837,11 +1837,11 @@ console.log(buf.toString('ascii', 0, 5));
 
 const buf2 = Buffer.from('tést');
 
-// Prints: tés
-console.log(buf.toString('utf8', 0, 3));
+// Prints: té
+console.log(buf2.toString('utf8', 0, 3));
 
 // Prints: tés
-console.log(buf.toString(undefined, 0, 3));
+console.log(buf2.toString(undefined, 0, 3));
 ```
 
 ### buf.toJSON()

diff --git a/doc/api/http.md b/doc/api/http.md
@@ -1015,6 +1015,9 @@ it will switch to implicit header mode and flush the implicit headers.
 This sends a chunk of the response body. This method may
 be called multiple times to provide successive parts of the body.
 
+Note that in `http` module, the response body is omitted when the request is a 
+HEAD. Similarly, The 204 and 304 responses MUST NOT include a message body.
+
 `chunk` can be a string or a buffer. If `chunk` is a string,
 the second parameter specifies how to encode it into a byte stream.
 By default the `encoding` is `'utf8'`. `callback` will be called when this chunk

diff --git a/doc/api/url.md b/doc/api/url.md
@@ -235,6 +235,23 @@ url.resolve('http://example.com/', '/one')    // 'http://example.com/one'
 url.resolve('http://example.com/one', '/two') // 'http://example.com/two'
 ```
 
+<<<<<<< HEAD
+Note that `url.resolve()` method depends on the protocol given in the `from` parameter. Some protocols like '''https''', '''file''', '''ftp''', '''wss''' and '''gopher''' have special cases.
+=======
+Note that `url.resolve()` method depends on the protocol given in the `from` parameter. 
+Some protocols like `https`, `file`, `ftp`, `wss` and `gopher` have special cases.
+>>>>>>> 2dc5a1518990abceb033d6f0a306a95f6ee5474d
+
+For example:
+
+```js
+url.resolve('https://foo.tld', 'bar')   // 'https://foo.tld/bar'
+url.resolve('wss://foo.tld', 'bar')      // 'wss://bar'
+url.resolve('ftps://foo.tld', 'bar')     // 'ftps://bar'
+```
+
+Although, the uniform behaviour of the method is achieved when the URL ends with a slash.
+
 ## Escaped Characters
 
 URLs are only permitted to contain a certain range of characters. Spaces (`' '`)