Skip to content

Fix documentation front matter and merge it with index.rst #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ievacerny merged 2 commits into from
Apr 29, 2020
Merged

Fix documentation front matter and merge it with index.rst #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4a760
Fix documentation front matter and merge it with index.rst
Apr 29, 2020
33f8f81
Remove Document Version from index.rst
Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions docs/source/traits_user_manual/front.rst
View file
Open in desktop

This file was deleted.

47 changes: 46 additions & 1 deletion docs/source/traits_user_manual/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
====================
Traits 6 User Manual
====================

:Authors: David C. Morrill, Janet M. Swisher, and Enthought developers
:Copyright: 2005-2020 Enthought, Inc. All Rights Reserved.

Contents
========

.. toctree::
:maxdepth: 3

front.rst
intro.rst
defining.rst
notification.rst
Expand All @@ -21,3 +27,42 @@ Indices and tables

* :ref:`genindex`
* :ref:`search`


License
Comment thread
ievacerny marked this conversation as resolved.
=======

Redistribution and use of this document in source and derived forms, with or
without modification, are permitted provided that the following conditions are
met:

* Redistributions of source or derived format (for example, Portable Document
Format or Hypertext Markup Language) must retain the above copyright notice,
this list of conditions and the following disclaimer.

* Neither the name of Enthought, Inc., nor the names of contributors may be used
to endorse or promote products derived from this document without specific
prior written permission.

THIS DOCUMENT IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS DOCUMENT, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

All trademarks and registered trademarks are the property of their respective
owners.

| Enthought, Inc.
| 200 W Cesar Chavez
| Suite 202
| Austin, TX 78701
| United States
| 1.512.536.1057 (voice)
| http://www.enthought.com
| info@enthought.com