Merge branch '1.0.x'

flask/ctx.py

@@ -175,7 +175,7 @@ def has_request_context():
                 self.remote_addr = remote_addr
 
     Alternatively you can also just test any of the context bound objects
-    (such as :class:`request` or :class:`g` for truthness)::
+    (such as :class:`request` or :class:`g`) for truthness::
 
         class User(db.Model):
 

flask/helpers.py

@@ -278,7 +278,7 @@ def url_for(endpoint, **values):
     :param values: the variable arguments of the URL rule
     :param _external: if set to ``True``, an absolute URL is generated. Server
       address can be changed via ``SERVER_NAME`` configuration variable which
-      defaults to `localhost`.
+      falls back to the `Host` header, then to the IP and port of the request.
     :param _scheme: a string specifying the desired URL scheme. The `_external`
       parameter must be set to ``True`` or a :exc:`ValueError` is raised. The default
       behavior uses the same scheme as the current request, or