Permalink
Browse files

Merge pull request #148 from stevepiercy/master

minor grammar and syntax fixes
  • Loading branch information...
2 parents 32876d0 + 43fae80 commit 9ecb4b96d2ca56f12276859734c747246255050a @bertjwregeer bertjwregeer committed on GitHub Jan 3, 2017
Showing with 9 additions and 9 deletions.
  1. +7 −7 docs/filewrapper.rst
  2. +2 −2 docs/index.rst
View
@@ -31,24 +31,24 @@ object which supports *at least* the ``read()`` method, and the ``read()``
method must support an optional size hint argument and the ``read()`` method
*must* return **bytes** objects (never unicode). It *should* support the
``seek()`` and ``tell()`` methods. If it does not, normal iteration over the
-filelike object using the provided block_size is used (and copying is done,
-negating any benefit of the file wrapper). It *should* support a ``close()``
-method.
+``filelike_object`` using the provided ``block_size`` is used (and copying is
+done, negating any benefit of the file wrapper). It *should* support a
+``close()`` method.
The specified ``block_size`` argument to the file wrapper constructor will be
used only when the ``filelike_object`` doesn't support ``seek`` and/or
``tell`` methods. Waitress needs to use normal iteration to serve the file
in this degenerate case (as per the WSGI pec), and this block size will be
used as the iteration chunk size. The ``block_size`` argument is optional;
-if it is not passed, a default value``32768`` is used.
+if it is not passed, a default value ``32768`` is used.
-Waitress will set a ``Content-Length`` header on the behalf of an application
-when a file wrapper with a sufficiently filelike object is used if the
+Waitress will set a ``Content-Length`` header on behalf of an application
+when a file wrapper with a sufficiently file-like object is used if the
application hasn't already set one.
The machinery which handles a file wrapper currently doesn't do anything
particularly special using fancy system calls (it doesn't use ``sendfile``
for example); using it currently just prevents the system from needing to
copy data to a temporary buffer in order to send it to the client. No
copying of data is done when a WSGI app returns a file wrapper that wraps a
-sufficiently filelike object. It may do something fancier in the future.
+sufficiently file-like object. It may do something fancier in the future.
View
@@ -4,7 +4,7 @@ Waitress
Waitress is meant to be a production-quality pure-Python WSGI server with
very acceptable performance. It has no dependencies except ones which live
in the Python standard library. It runs on CPython on Unix and Windows under
-Python 2.6+ and Python 3.2+. It is also known to run on PyPy 1.6.0 on UNIX.
+Python 2.7+ and Python 3.3+. It is also known to run on PyPy 1.6.0 on UNIX.
It supports HTTP/1.0 and HTTP/1.1.
Usage
@@ -36,7 +36,7 @@ WSGI app as a single argument:
from waitress import serve
serve(wsgiapp)
-
+
Press Ctrl-C (or Ctrl-Break on Windows) to exit the server.
The default is to bind to any IPv4 address on port 8080:

0 comments on commit 9ecb4b9

Please sign in to comment.