merge from 3.5

This commit is contained in:
Senthil Kumaran 2016-02-05 19:37:47 -08:00
commit 029f7f7af2
1 changed files with 1 additions and 1 deletions

View File

@ -514,7 +514,7 @@ component and the hostname and optionally the port number)
e.g. "http://example.com/" *or* an "authority" (i.e. the hostname,
optionally including the port number) e.g. "example.com" or "example.com:8080"
(the latter example includes a port number). The authority, if present, must
NOT contain the "userinfo" component - for example "joe@password:example.com" is
NOT contain the "userinfo" component - for example "joe:password@example.com" is
not correct.