diff --git a/README.rst b/README.rst index 64ab5ec9c..66038003f 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,7 @@ xonsh The language is a superset of Python 3.6+ with additional shell primitives. xonsh (pronounced *conch*) is meant for the daily use of experts and novices alike. - .. image:: https://raw.githubusercontent.com/xonsh/xonsh/master/docs/_static/xonsh4.png + .. image:: https://raw.githubusercontent.com/xonsh/xonsh/master/docs/_static/xonsh5.png :alt: What is xonsh? :align: center @@ -36,9 +36,9 @@ xonsh :target: https://codecov.io/gh/xonsh/xonsh :alt: codecov - .. image:: https://gstatic.com/cloudssh/images/open-btn.svg + .. image:: https://img.shields.io/badge/Google%20Cloud%20Shell-xonsh-green :target: https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/xonsh/xonsh.git - :alt: Open in Cloud Shell + :alt: Open in Google Cloud Shell First steps *********** @@ -47,7 +47,7 @@ Visit https://xon.sh for more information: - `Installation `_ - using packages, docker or AppImage. - `Tutorial `_ - step by step introduction in xonsh. -- `Xontribs `_ - list of awesome xonsh extensions. +- `Xontribs `_ or `Github Xontribs `_ - list of awesome xonsh extensions. Projects that use xonsh *********************** diff --git a/docs/_static/xonsh4.png b/docs/_static/xonsh4.png deleted file mode 100644 index 7467cd770..000000000 Binary files a/docs/_static/xonsh4.png and /dev/null differ diff --git a/docs/_static/xonsh5.png b/docs/_static/xonsh5.png new file mode 100644 index 000000000..305e5d29a Binary files /dev/null and b/docs/_static/xonsh5.png differ diff --git a/docs/installation.rst b/docs/installation.rst index 30aa040b9..31519eba9 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -15,10 +15,3 @@ Xonsh can be installed and run with various package managers, by using appimage, appimage containers jupyter - - -.. note:: - - On Windows 10, the separately-installable `Windows Terminal app`_ is recommended. - -.. _`Windows Terminal app`: https://github.com/microsoft/terminal/releases \ No newline at end of file diff --git a/docs/packages.rst b/docs/packages.rst index c0cc34e36..9b541303e 100644 --- a/docs/packages.rst +++ b/docs/packages.rst @@ -90,3 +90,9 @@ To ensure xonsh uses ``readline`` even if ``prompt-toolkit`` is installed, confi $SHELL_TYPE = 'readline' +Windows +------- + +On Windows 10, the separately-installable `Windows Terminal app`_ is recommended. + +.. _`Windows Terminal app`: https://github.com/microsoft/terminal/releases \ No newline at end of file diff --git a/docs/talks_and_articles.rst b/docs/talks_and_articles.rst index 8349aec76..3eb69fbdf 100644 --- a/docs/talks_and_articles.rst +++ b/docs/talks_and_articles.rst @@ -5,9 +5,25 @@ Here are some talks, articles, and other sundry about your favorite shell. Talks ============ -**Python Nordeste 2016:** presented by Lucas Inojosa http://lucasicf.github.io/talks/shell_python/ -**PyCon 2016:** presented by Anthony Scopatz +**SciPy, Jul 2019:** presented by Anthony Scopatz and Gil Forsyth + +.. raw:: html + +
+ +
+ +**Brněnské Pyvo, May 2019:** presented by Alexander Sosedkin + +.. raw:: html + +
+ +
+ + +**PyCon, Jun 2016:** presented by Anthony Scopatz .. raw:: html diff --git a/docs/xontribs.rst b/docs/xontribs.rst index 98f8eee79..5fc846d3c 100644 --- a/docs/xontribs.rst +++ b/docs/xontribs.rst @@ -12,3 +12,5 @@ command line using the ``xontrib`` command: .. See the xontrib tutorial for more information. .. include:: xontribsbody + +More xontribs you can find on `Github `_. \ No newline at end of file