Merge branch 'doc-fixes' into develop

This commit is contained in:
ZyX 2014-09-05 20:41:03 +04:00
commit 682846dcd5
5 changed files with 17 additions and 4 deletions

View File

@ -396,7 +396,7 @@ ascii Theme without any unicode characters at all
<config-themes-seg-args>` options. <config-themes-seg-args>` options.
List of lister segments is available in :ref:`Lister reference List of lister segments is available in :ref:`Lister reference
<config-lister>` section. <config-listers>` section.
.. _config-themes-seg-name: .. _config-themes-seg-name:

View File

@ -10,3 +10,4 @@ Developer guide
develop/listers develop/listers
develop/local-themes develop/local-themes
develop/extensions develop/extensions
develop/tips-and-tricks

View File

@ -33,16 +33,22 @@ Pip installation
This project is currently unavailable from PyPI due to a naming conflict with an This project is currently unavailable from PyPI due to a naming conflict with an
unrelated project, thus you will have to use the following command to install unrelated project, thus you will have to use the following command to install
powerline with ``pip``:: powerline with ``pip``:
.. code-block:: sh
pip install --user git+git://github.com/Lokaltog/powerline pip install --user git+git://github.com/Lokaltog/powerline
. You may also choose to clone powerline repository somewhere and use:: . You may also choose to clone powerline repository somewhere and use
.. code-block:: sh
pip install -e --user {path_to_powerline} pip install -e --user {path_to_powerline}
, but note that in this case ``pip`` will not install ``powerline`` executable , but note that in this case ``pip`` will not install ``powerline`` executable
and you will have to do something like:: and you will have to do something like
.. code-block:: sh
ln -s {path_to_powerline}/scripts/powerline ~/.local/bin ln -s {path_to_powerline}/scripts/powerline ~/.local/bin
@ -54,6 +60,12 @@ and you will have to do something like::
(``git+https://github.com/Lokaltog/powerline``) protocols. ``git`` protocol (``git+https://github.com/Lokaltog/powerline``) protocols. ``git`` protocol
should be the fastest, but least secure one though. should be the fastest, but least secure one though.
To install release version uploaded to PyPI use
.. code-block:: sh
pip install powerline-status
Fonts installation Fonts installation
================== ==================