Merge branch 'fix-sphinx-docs' into 'master'

Fix sphinx docs

See merge request apt-team/python-apt!51

apt/progress/text.py

@@ -129,7 +129,7 @@ class AcquireProgress(base.AcquireProgress, TextProgress):
             import fcntl
             import termios
             import struct
-            buf = fcntl.ioctl(self._file, termios.TIOCGWINSZ, 8 * b' ')  # type: ignore # noqa
+            buf = fcntl.ioctl(self._file, termios.TIOCGWINSZ, 8 * b' ')  # noqa
             dummy, col, dummy, dummy = struct.unpack('hhhh', buf)
             self._width = col - 1  # 1 for the cursor
 

doc/source/c++/embedding.rst

-.. highlightlang:: c++
+.. highlight:: c++
 
 Embedding Python APT
 ====================
@@ -27,7 +27,7 @@ type :class:`apt_pkg.HashString`:
 .. literalinclude:: ../../client-example.cc
 
 
-.. highlightlang:: sh
+.. highlight:: sh
 
 If this file were called client-example.cc, you could compile it using::
 

doc/source/conf.py

@@ -55,7 +55,7 @@ source_suffix = '.rst'
 #source_encoding = 'utf-8'
 
 # The master toctree document.
-#master_doc = 'contents'
+master_doc = 'contents'
 
 # General information about the project.
 project = u'python-apt'

doc/source/library/apt_pkg.rst

@@ -1937,8 +1937,6 @@ generic hash support:
 
         Get the :class:`HashString` object at the specified index.
 
-    .. autoattribute:: usable
-
 The :mod:`apt_pkg` module also provides the functions :func:`md5sum`,
 :func:`sha1sum` and :func:`sha256sum` for creating a single hash from a
 :class:`bytes` or :class:`file` object:

doc/source/templates/indexcontent.html

-{% extends "defindex.html" %}
+{% extends "layout.html" %}
 {% block body %}
   <h1>{{ docstitle|e }}</h1>
   <p>

doc/source/tutorials/contributing.rst

@@ -41,7 +41,7 @@ https://anonscm.debian.org/cgit/apt/python-apt.git
     cherry-picked or backported from the ``debian/sid`` branch.
 
 
-.. highlightlang:: c
+.. highlight:: cpp
 
 C++ Coding style
 ----------------
@@ -244,7 +244,9 @@ for one logical unit).
 
 The changelog message should follow standard git format. At the end of the
 message, tags understood by gbp-dch and other tags may be added. An example
-commit message could be::
+commit message could be:
+
+.. code-block:: none
 
   apt.package: Fix blah blah
 
@@ -285,7 +287,7 @@ above. You can send your content in plain text, but reStructuredText is the
 preferred format. I (Julian Andres Klode) will review your patch and include
 it.
 
-.. highlightlang:: sh
+.. highlight:: sh
 
 Example patch session
 ----------------------