Move "whatis" contents to index and fix wording. Move "whatis" to "disclaimer".

3 files changed, 29 insertions, 41 deletions

diff --git a/source/disclaimer.rst b/source/disclaimer.rst
new file mode 100644
index 0000000..bcd731a
--- /dev/null
+++ b/source/disclaimer.rst
@@ -0,0 +1,20 @@
+******************
+General Disclaimer
+******************
+
+
+::
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
diff --git a/source/index.rst b/source/index.rst
index bad5163..9ad2d5d 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -6,13 +6,19 @@
 Welcome to AstroConda's documentation!
 ======================================
 
-Contents:
+AstroConda is a free software repository maintained by the `Space Telescope Science Institute <http://www.stsci.edu/>`_ (STScI)
+in Baltimore, Maryland. This repository provides tools and utilities commonly used by the astronomical community.
+
+The components provided through the `astroconda <http://ssb.stsci.edu/astroconda>`_ channel on `ssb.stsci.edu <http://ssb.stsci.edu>`_
+include most of the tools the user needs to work with Hubble Space Telescope (HST) data and data from other telescopes in
+a single Anaconda Python environment.  Each of the components contains sets of packages which have also been built and tested
+to insure that they work with each other in the same environment.
+
 
 .. toctree::
    :maxdepth: 2
    :titlesonly:
 
-   whatis
    installation
    updating
    faq
@@ -20,4 +26,5 @@ Contents:
    package_manifest
    release_notes
    resources
+   disclaimer
 
diff --git a/source/whatis.rst b/source/whatis.rst
deleted file mode 100644
index f63469b..0000000
--- a/source/whatis.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-*******************
-What is AstroConda?
-*******************
-
-AstroConda is a free software repository maintained by the `Space Telescope Science Institute <http://www.stsci.edu/>`_ (STScI)
-in Baltimore, Maryland. This repository provides tools and utilities commonly used by the Astronomy community.
-This repository provides tools and utilities commonly used by the astronomical community.
-
-The components provided through the `astroconda <http://anaconda.org/astroconda>`_ channel on `anaconda.org <http://anaconda.org>`_
-include most of the tools the user needs to work with Hubble Space Telescope (HST) data and data from other telescopes in
-a single Anaconda Python environment.  Each of the components contains sets of packages which have also been built and tested
-to insure that they work with each other in the same environment.
-
-Support for use of the STScI-developed software included in the astroconda channel on `anaconda.org <http://anaconda.org>`_
-will be provided by STScI by emailing `help@stsci.edu <mailto:help@stsci.edu>`_.
-
-.. note::
-
-    If a package you are looking for has not been included astroconda channel, please see the `Contributing Guide <contributing.html>`_.
-
-~~~~~~~~~~~~~~~~~~
-General Disclaimer
-~~~~~~~~~~~~~~~~~~
-
-::
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-