diff --git a/docs/advanced.rst b/docs/advanced.rst
index ab31f35bf79088bab1b0b786937e313db99e3d21..c2f06bce5324f57c039586dfd79c2271f6d69833 100644
--- a/docs/advanced.rst
+++ b/docs/advanced.rst
@@ -52,16 +52,16 @@ Although *diskdump* is a lot more flexible than the older formats, there are
 still some rules to follow:
 
  * For Linux:
-   * All block devices in ``/etc/fstab`` should be specified using persistent
-   names (UUID or LABEL)
-   * LVM partitions are not supported
-   * Only ext{2,3,4} file systems are supported
+    * All block devices in ``/etc/fstab`` should be specified using persistent
+      names (UUID or LABEL)
+    * LVM partitions are not supported
+    * Only ext{2,3,4} file systems are supported
  * For FreeBSD:
-   * GUID Partition Tables (GPT) should be used
-   * Only UFS2 file systems are supported
-   * Labels should be omitted in ``/etc/fstab`` entries
+    * GUID Partition Tables (GPT) should be used
+    * Only UFS2 file systems are supported
+    * Labels should be omitted in ``/etc/fstab`` entries
  * For {Open,Net}BSD:
-   * Only FFS file systems should be used
+    * Only FFS file systems should be used
 
 .. _windows-deployment:
 
@@ -144,7 +144,7 @@ one:
 The ``@TIMEZONE_INDEX@`` container will be replaced during the installation of
 the file by the index value of the time zone which is specified through the
 *WINDOWS_TIMEZONE* configuration variable. For more info check `here
-<https://msdn.microsoft.com/en-us/library/ms912391%28v=winembedded.11%29.aspx>`_.
+<https://msdn.microsoft.com/en-us/library/ms912391%28v=winembedded.11%29.aspx>`__.
 This file is known to work with Windows XP and in order for the deployment to
 be completely unattended, the user must provide a Windows Product key using the
 *os_product_key* OS parameter *snf-image* offers. As with the newer Windows
@@ -291,7 +291,7 @@ environment variables that are present when the configuration tasks run.
 |NIC_%N_*             |The Ganeti provided environment variable for the Nth   |
 |                     |network interface controller. Check                    |
 |                     |`here <http://docs.ganeti.org/ganeti/current/man/ganeti|
-|                     |-os-interface.html>`_                                  |
+|                     |-os-interface.html>`__                                 |
 +---------------------+-------------------------------------------------------+
 |DHCP_TAGS            |The value of the DHCP_TAGS configuration parameter (see|
 |                     |:ref:`Configuration Parameters                         |
diff --git a/docs/usage.rst b/docs/usage.rst
index af95cfb8fe487247b50e4d621f9a6d7852c4570f..adccafb08aafbf68c58f67a5479da141df549974 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -12,45 +12,45 @@ that have been tested with *snf-image* and provided here for testing purposes:
 
 
  * Debian Jessie Base System
-   [`diskdump <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/debian_base-8.0-x86_64.diskdump.meta>`__]
  * Debian Jessie Desktop
-   [`diskdump <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/debian_desktop-8.0-x86_64.diskdump.meta>`__]
  * CentOS 7.x
-   [`diskdump <https://cdn.synnefo.org/centos-7-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/centos-7-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/centos-7-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/centos-7-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/centos-7-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/centos-7-x86_64.diskdump.meta>`__]
  * Fedora Desktop 23
-   [`diskdump <https://cdn.synnefo.org/fedora-23-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/fedora-23-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/fedora-23-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/fedora-23-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/fedora-23-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/fedora-23-x86_64.diskdump.meta>`__]
  * Ubuntu Desktop LTS 14.04
-   [`diskdump <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/ubuntu_desktop-14.04-x86_64.diskdump.meta>`__]
  * Ubuntu Server LTS 14.04
-   [`diskdump <https://cdn.synnefo.org/ubuntu_server-14.04-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/ubuntu_server-14.04-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/ubuntu_server-14.04-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/ubuntu_server-14.04-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/ubuntu_server-14.04-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/ubuntu_server-14.04-x86_64.diskdump.meta>`__]
  * OpenSUSE Desktop 13.2
-   [`diskdump <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/opensuse_desktop-13.2-x86_64.diskdump.meta>`__]
  * Oracle Linux 7.x
-   [`diskdump <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/oraclelinux-7-x86_64.diskdump.meta>`__]
  * FreeBSD 10.2
-   [`diskdump <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/freebsd-10.2-x86_64.diskdump.meta>`__]
  * NetBSD 7.0
-   [`diskdump <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump>`_]
-   [`md5sum <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump.md5sum>`_]
-   [`metadata <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump.meta>`_]
+   [`diskdump <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump>`__]
+   [`md5sum <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump.md5sum>`__]
+   [`metadata <https://cdn.synnefo.org/netbsd-7.0-x86_64.diskdump.meta>`__]
 
 Sample Usage
 ^^^^^^^^^^^^