consolidation

docs/appimage.rst

@@ -1,5 +1,5 @@
-Via AppImage
-=============
+AppImage
+========
 
 `AppImage <https://appimage.org/>`_ is a format for distributing portable software on Linux without needing superuser permissions to install the application. It tries also to allow Linux distribution-agnostic binary software deployment for application developers, also called Upstream packaging. 
 

docs/contact.rst

@@ -2,7 +2,8 @@
 
 Contact Us
 ==========
-If you have questions or comments, please send them to the mailing list
-xonsh@googlegroups.com, page us on IRC, contact the author directly, or
-open an issue on GitHub.
-`Join the mailing list here! <https://groups.google.com/forum/#!forum/xonsh>`_
+If you have questions or comments, please:
+
+* `Open issue on GitHub <https://github.com/xonsh/xonsh>`_
+* `Join the mailing list <https://groups.google.com/forum/#!forum/xonsh>`_
+* Page us on `Gitter <https://gitter.im/xonsh/xonsh>`_ or `IRC channel #xonsh on OFTC <http://www.oftc.net/>`_

docs/containers.rst

@@ -1,5 +1,5 @@
-Run from container
-==================
+Docker container
+================
 
 Xonsh publishes a handful of containers, primarily targeting CI and automation use cases. All of them are published on `Docker Hub <https://hub.docker.com/u/xonsh>`__.
 

docs/contents.rst

@@ -4,10 +4,10 @@ the xonsh shell
 
 .. include:: intro.rst
 
-.. include:: installation.rst
-
 .. include:: comparison.rst
 
+.. include:: installation.rst
+
 .. include:: guides.rst
 
 .. include:: setup.rst

docs/guides.rst

@@ -17,6 +17,7 @@ Guides
     tutorial_subproc_strings
     tutorial_ptk
     bash_to_xsh
+    editors
     subproc_types
     python_virtual_environments
     keyboard_shortcuts

docs/installation.rst

@@ -14,24 +14,11 @@ Xonsh can be installed via different ways:
     packages
     appimage
     containers
-    editors
     jupyter
 
+
 .. note::
 
    On Windows 10, the separately-installable `Windows Terminal app`_ is recommended.
 
-.. _`Windows Terminal app`: https://github.com/microsoft/terminal/releases
-
-Configuration and Customization
--------------------------------
-
-Xonsh uses startup configuration files and provides configuration wizards to help you set them up.
-
-.. toctree::
-    :titlesonly:
-    :maxdepth: 2
-
-    xonshrc
-    customization
-    platform-issues
+.. _`Windows Terminal app`: https://github.com/microsoft/terminal/releases

docs/links.rst

@@ -3,11 +3,8 @@
 Helpful Links
 =============
 
-* `Documentation <http://xon.sh>`_
-* `Gitter <https://gitter.im/xonsh/xonsh>`_
-* `Mailing list <https://groups.google.com/forum/#!forum/xonsh>`_
-* `IRC: channel #xonsh on OFTC <http://www.oftc.net/>`_
 * `GitHub Repository <https://github.com/xonsh/xonsh>`_
+* `DockerHub images <https://hub.docker.com/u/xonsh>`_
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`

docs/packages.rst

@@ -1,5 +1,5 @@
-Via Package Manager
-===================
+Package Manager
+===============
 
 You can install xonsh using ``conda``, ``pip`` or the package manager for 
 your operating system distribution.

docs/setup.rst

@@ -7,7 +7,9 @@ Config Files and Settings
     :maxdepth: 2
 
     xonshrc
+    customization
     envvars
     aliases
     xontribs
-    events
+    events
+    platform-issues