1 files changed, 24 insertions, 1 deletions

diff --git a/source/whatis.rst b/source/whatis.rst
index db76b57..a30a673 100644
--- a/source/whatis.rst
+++ b/source/whatis.rst
@@ -2,4 +2,27 @@
 What is AstroConda?
 *******************
 
-TODO
\ No newline at end of file
+AstroConda is a free software repository maintained by the `Space Telescope Science Institute <http://www.stsci.edu/>`_
+in Baltimore, Maryland. This repository provides tools and utilities commonly used by the Astronomy community.
+
+.. note::
+
+    If a package you are looking for does not exist, 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.
\ No newline at end of file