From ee4a760f789cd63eec32d27b8b8b85534122b3d3 Mon Sep 17 00:00:00 2001 From: Ieva C Date: Wed, 29 Apr 2020 11:21:25 +0100 Subject: [PATCH 1/2] Fix documentation front matter and merge it with index.rst --- docs/source/traits_user_manual/front.rst | 42 --------------------- docs/source/traits_user_manual/index.rst | 48 +++++++++++++++++++++++- 2 files changed, 47 insertions(+), 43 deletions(-) delete mode 100644 docs/source/traits_user_manual/front.rst diff --git a/docs/source/traits_user_manual/front.rst b/docs/source/traits_user_manual/front.rst deleted file mode 100644 index f706f4441..000000000 --- a/docs/source/traits_user_manual/front.rst +++ /dev/null @@ -1,42 +0,0 @@ -==================== -Traits 6 User Manual -==================== - -:Authors: David C. Morrill, Janet M. Swisher -:Version: Document Version 4 -:Copyright: 2005, 2006, 2008 Enthought, Inc. All Rights Reserved. - -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. -| 515 Congress Avenue -| Suite 2100 -| Austin TX 78701 -| 1.512.536.1057 (voice) -| 1.512.536.1059 (fax) -| http://www.enthought.com -| info@enthought.com diff --git a/docs/source/traits_user_manual/index.rst b/docs/source/traits_user_manual/index.rst index f8f15d436..9362e06bc 100644 --- a/docs/source/traits_user_manual/index.rst +++ b/docs/source/traits_user_manual/index.rst @@ -1,10 +1,17 @@ +==================== Traits 6 User Manual ==================== +:Authors: David C. Morrill, Janet M. Swisher, and Enthought developers +:Version: Document Version 4 +:Copyright: 2005-2020 Enthought, Inc. All Rights Reserved. + +Contents +======== + .. toctree:: :maxdepth: 3 - front.rst intro.rst defining.rst notification.rst @@ -21,3 +28,42 @@ Indices and tables * :ref:`genindex` * :ref:`search` + + +License +======= + +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 From 33f8f810ceca3cd2b677a76a0e322a6c7ccb12bc Mon Sep 17 00:00:00 2001 From: Ieva C Date: Wed, 29 Apr 2020 12:59:29 +0100 Subject: [PATCH 2/2] Remove Document Version from index.rst --- docs/source/traits_user_manual/index.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/traits_user_manual/index.rst b/docs/source/traits_user_manual/index.rst index 9362e06bc..400a8ea33 100644 --- a/docs/source/traits_user_manual/index.rst +++ b/docs/source/traits_user_manual/index.rst @@ -3,7 +3,6 @@ Traits 6 User Manual ==================== :Authors: David C. Morrill, Janet M. Swisher, and Enthought developers -:Version: Document Version 4 :Copyright: 2005-2020 Enthought, Inc. All Rights Reserved. Contents