summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2017-11-06 13:31:39 +0100
committerGitHub <noreply@github.com>2017-11-06 13:31:39 +0100
commit61f7eec07b4c1152390de0f3217197ca64e927f4 (patch)
tree5866eb426becf3a6e2952676ca4e260c10e7fb08
parent4a0ba055bf54dc66297b06c29b90af9e46095fd6 (diff)
parent8fcdae957b14e1ca14e727f2148f344b5c4dc58b (diff)
downloadbottle-61f7eec07b4c1152390de0f3217197ca64e927f4.tar.gz
Merge pull request #1006 from fredj/spelling
Fix spelling errors
-rwxr-xr-xbottle.py2
-rwxr-xr-xdocs/contact.rst2
-rwxr-xr-xdocs/recipes.rst2
-rwxr-xr-xdocs/tutorial.rst2
-rw-r--r--docs/tutorial_app.rst2
5 files changed, 5 insertions, 5 deletions
diff --git a/bottle.py b/bottle.py
index 0d43d7c..c556baf 100755
--- a/bottle.py
+++ b/bottle.py
@@ -2377,7 +2377,7 @@ class ConfigDict(dict):
Leading and trailing whitespace is removed from keys and values.
Values can be omitted, in which case the key/value delimiter may
also be left out. Values can also span multiple lines, as long as
- they are indented deeper than the first line of the value. Commends
+ they are indented deeper than the first line of the value. Commands
are prefixed by ``#`` or ``;`` and may only appear on their own on
an otherwise empty line.
diff --git a/docs/contact.rst b/docs/contact.rst
index ab50f61..8c844bd 100755
--- a/docs/contact.rst
+++ b/docs/contact.rst
@@ -2,7 +2,7 @@
Contact
=============
-.. rubric:: About the Autor
+.. rubric:: About the Author
Hi, I'm *Marcel Hellkamp* (aka *defnull*), author of Bottle and the guy behind this website. I'm 27 years old and studying computer science at the Georg-August-University in Göttingen, Germany. Python is my favorite language, but I also code in ruby and JavaScript a lot. Watch me on `twitter <http://twitter.com/bottlepy>`_ or visit my profile at `GitHub <http://github.com/defnull>`_ to get in contact. A `mailinglist <http://groups.google.de/group/bottlepy>`_ is open for Bottle related questions, too.
diff --git a/docs/recipes.rst b/docs/recipes.rst
index 3e0a490..2ad6cda 100755
--- a/docs/recipes.rst
+++ b/docs/recipes.rst
@@ -42,7 +42,7 @@ There is no built-in support for sessions because there is no *right* way to do
bottle.run(app=app)
-WARNING: Beaker's SessionMiddleware is not thread safe. If two concurrent requests modify the same session at the same time, one of the updates might get lost. For this reason, sessions should only be populated once and treated as a read-only store after that. If you find yourself updating sessions regularly, and don't want to risk loosing any updates, think about using a real database instead or seek alternative session middleware libraries.
+WARNING: Beaker's SessionMiddleware is not thread safe. If two concurrent requests modify the same session at the same time, one of the updates might get lost. For this reason, sessions should only be populated once and treated as a read-only store after that. If you find yourself updating sessions regularly, and don't want to risk losing any updates, think about using a real database instead or seek alternative session middleware libraries.
Debugging with Style: Debugging Middleware
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 326e05d..852afcf 100755
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -871,7 +871,7 @@ Development
================================================================================
So you have learned the basics and want to write your own application? Here are
-some tips that might help you beeing more productive.
+some tips that might help you being more productive.
.. _default-app:
diff --git a/docs/tutorial_app.rst b/docs/tutorial_app.rst
index 6f66a98..b426bbc 100644
--- a/docs/tutorial_app.rst
+++ b/docs/tutorial_app.rst
@@ -463,7 +463,7 @@ So far, we used the standard server used by Bottle, which is the `WSGI reference
.. rubric:: Running Bottle on a different port and IP
-As standard, Bottle serves the pages on the IP adress 127.0.0.1, also known as ``localhost``, and on port ``8080``. To modify the setting is pretty simple, as additional parameters can be passed to Bottle's ``run()`` function to change the port and the address.
+As standard, Bottle serves the pages on the IP address 127.0.0.1, also known as ``localhost``, and on port ``8080``. To modify the setting is pretty simple, as additional parameters can be passed to Bottle's ``run()`` function to change the port and the address.
To change the port, just add ``port=portnumber`` to the run command. So, for example::