summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-05 23:48:51 -0400
committerChris McDonough <chrism@plope.com>2014-05-05 23:48:51 -0400
commit0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849 (patch)
treea624aa38b3db1f7de58bb8bf9aaff4583cec28fd /docs/narr/project.rst
parentba85e591d563ed654f492f7cab5ca492a32a86d7 (diff)
parent0117573edbc5dff565868187f8841859b3e36a51 (diff)
downloadpyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.tar.gz
pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.tar.bz2
pyramid-0caac0a0af78cd55df2e1f3c3c7fc5171dbfe849.zip
Merge branch 'master' into redundant_totuorial_logging_config
Diffstat (limited to 'docs/narr/project.rst')
-rw-r--r--docs/narr/project.rst56
1 files changed, 17 insertions, 39 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 62b91de0e..0ada1a379 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -476,24 +476,23 @@ structure:
.. code-block:: text
MyProject/
- ├── CHANGES.txt
- ├── MANIFEST.in
- ├── README.txt
- ├── development.ini
- ├── myproject
- │   ├── __init__.py
- │   ├── static
- │   │   ├── pyramid-16x16.png
- │   │   ├── pyramid.png
- │   │   ├── theme.css
- │   │   └── theme.min.css
- │   ├── templates
- │   │   └── mytemplate.pt
- │   ├── tests.py
- │   └── views.py
- ├── production.ini
- ├── setup.cfg
- └── setup.py
+ |-- CHANGES.txt
+ |-- development.ini
+ |-- MANIFEST.in
+ |-- myproject
+ | |-- __init__.py
+ | |-- static
+ | | |-- pyramid-16x16.png
+ | | |-- pyramid.png
+ | | |-- theme.css
+ | | `-- theme.min.css
+ | |-- templates
+ | | `-- mytemplate.pt
+ | |-- tests.py
+ | `-- views.py
+ |-- production.ini
+ |-- README.txt
+ `-- setup.py
The ``MyProject`` :term:`Project`
---------------------------------
@@ -515,9 +514,6 @@ describe, run, and test your application.
#. ``production.ini`` is a :term:`PasteDeploy` configuration file that can
be used to execute your application in a production configuration.
-#. ``setup.cfg`` is a :term:`setuptools` configuration file used by
- ``setup.py``.
-
#. ``MANIFEST.in`` is a :term:`distutils` "manifest" file, naming which files
should be included in a source distribution of the package when ``python
setup.py sdist`` is run.
@@ -746,24 +742,6 @@ named ``MyProject-0.1.tar.gz``. You can send this tarball to other people
who want to install and use your application.
.. index::
- single: setup.cfg
-
-``setup.cfg``
-~~~~~~~~~~~~~
-
-The ``setup.cfg`` file is a :term:`setuptools` configuration file. It
-contains various settings related to testing and internationalization:
-
-Our generated ``setup.cfg`` looks like this:
-
-.. literalinclude:: MyProject/setup.cfg
- :language: guess
- :linenos:
-
-The values in the default setup file allow various commonly-used
-internationalization commands and testing commands to work more smoothly.
-
-.. index::
single: package
The ``myproject`` :term:`Package`