diff options
| author | Donald Stufft <donald@stufft.io> | 2014-11-19 12:39:18 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-11-19 12:39:18 -0500 |
| commit | 09ecca34b3eeb76d4f231040338e1c68bf770702 (patch) | |
| tree | 54be2e06b0bf378a4a2daa616790fa9bf949bceb /docs | |
| parent | 5e62aa3b59398252faef0d638a0f087d6c682800 (diff) | |
| parent | affa001a6767efee24b4d6bc1a2f04eb7aeea65b (diff) | |
| download | python-setuptools-git-09ecca34b3eeb76d4f231040338e1c68bf770702.tar.gz | |
Merge branch 'master' into use-packaging
Conflicts:
.hgtags
CHANGES.txt
ez_setup.py
setuptools.egg-info/requires.txt
setuptools/version.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/setuptools.txt | 2 | ||||
| -rw-r--r-- | docs/using.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/setuptools.txt b/docs/setuptools.txt index c3844cf2..a34ec304 100644 --- a/docs/setuptools.txt +++ b/docs/setuptools.txt @@ -473,7 +473,7 @@ script called ``baz``, you might do something like this:: setup( # other arguments here... - entry_points = { + entry_points={ 'console_scripts': [ 'foo = my_package.some_module:main_func', 'bar = other_module:some_func', diff --git a/docs/using.txt b/docs/using.txt index e44847d6..bd80893d 100644 --- a/docs/using.txt +++ b/docs/using.txt @@ -8,3 +8,6 @@ it at the very beginning of `setup.py` like this:: from ez_setup import use_setuptools use_setuptools() + +More info on `ez_setup.py` can be found at `the project home page +<https://pypy.python.org/pypi/setuptools>`_. |