summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-11-11 08:59:44 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-11-11 08:59:44 +0100
commit7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8 (patch)
tree7061d7dc8c0e31d96e35fef2adce9999713be9f2 /doc
parented8400bb9a59f267185d2d09b8f47d270a44ee99 (diff)
parent3c4f70996e46ed7e9c3a480f51398194d31e3e93 (diff)
downloadnixpkgs-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar
nixpkgs-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.gz
nixpkgs-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.bz2
nixpkgs-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.lz
nixpkgs-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.xz
nixpkgs-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.tar.zst
nixpkgs-7863aae5b2eeb8c7af241a0f0ee0c5a15a8fabc8.zip
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r--doc/languages-frameworks/python.section.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 81ce4d94ad2..eefe46b15de 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used.
 ### Interpreters
 
 Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
-respectively `python27`, `python35`, `python36` and `python37`. The PyPy
+respectively `python27`, `python35`, `python36`, and `python37`. The PyPy
 interpreter is available as `pypy`. The aliases `python2` and `python3`
 correspond to respectively `python27` and `python37`. The default interpreter,
 `python`, maps to `python2`. The Nix expressions for the interpreters can be