Merge pull request #1642 from brianriley/develop

Documentation fixes
This commit is contained in:
Seth House 2012-07-16 16:07:30 -07:00
commit 3aca1a7d0c
3 changed files with 2 additions and 5 deletions

View file

@ -101,7 +101,6 @@ autosummary_generate = True
# Define a substitution for linking to the latest release tarball
rst_prolog = """\
.. _`installation`: http://saltstack.org/install/
.. |saltrepo| replace:: https://github.com/saltstack/salt
.. |latest| replace:: https://github.com/downloads/saltstack/salt/salt-%s.tar.gz
""" % __version__

View file

@ -13,7 +13,7 @@ Get started with Salt
A list of `presentations and interviews on Salt`_ (including the FLOSS
Weekly interview).
.. _`presentations and interviews on Salt`: http://saltstack.org/presentations/
.. _`presentations and interviews on Salt`: http://saltstack.org/learn/
Salt is an open source tool to manage your infrastructure. Easy enough to get
running in minutes and fast enough to manage tens of thousands of servers (and

View file

@ -1,7 +1,5 @@
:orphan:
**Before continuing** make sure you have a working Salt installation by
following the `installation`_ and the :doc:`configuration
following the :doc:`installation </topics/installation/index>` and the :doc:`configuration
</topics/configuration>` instructions.
.. admonition:: Stuck?