Skip to content

Commit 29242eb

Browse files
committed
Merge branch 'feature/review-docs' into develop
2 parents f3c9076 + e98b2b3 commit 29242eb

File tree

2 files changed

+16
-25
lines changed

2 files changed

+16
-25
lines changed

docs/conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
sys.path.append(os.path.join(HERE, '..'))
2323

2424
import tagging
25+
import sphinx_rtd_theme
2526

27+
html_theme = "sphinx_rtd_theme"
28+
29+
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
2630
# -- General configuration ------------------------------------------------
2731

2832
# If your documentation needs a minimal Sphinx version, state it here.
@@ -117,7 +121,7 @@
117121

118122
# The theme to use for HTML and HTML Help pages. See the documentation for
119123
# a list of builtin themes.
120-
html_theme = 'default'
124+
#html_theme = 'default'
121125

122126
# Theme options are theme-specific and customize the look and feel of a theme
123127
# further. For a list of options available for each theme, see the

docs/index.rst

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,9 @@ retrieval of tags simple.
88

99
.. _`Django`: http://www.djangoproject.com
1010

11-
.. toctree::
12-
:maxdepth: 3
13-
14-
Indices and tables
15-
==================
16-
17-
* :ref:`genindex`
18-
* :ref:`modindex`
19-
* :ref:`search`
20-
11+
.. contents::
12+
:local:
13+
:depth: 3
2114

2215
Installation
2316
============
@@ -31,21 +24,16 @@ https://pypi.python.org/pypi/django-tagging/
3124
Source distribution
3225
~~~~~~~~~~~~~~~~~~~
3326

34-
Download the .zip distribution file and unpack it. Inside is a script
27+
Download the a distribution file and unpack it. Inside is a script
3528
named ``setup.py``. Enter this command::
3629

37-
python setup.py install
30+
$ python setup.py install
3831

3932
...and the package will install automatically.
4033

41-
Windows installer
42-
~~~~~~~~~~~~~~~~~
43-
44-
A Windows installer is also made available - download the .exe
45-
distribution file and launch it to install the application.
34+
More easily with :program:`pip`::
4635

47-
An uninstaller will also be created, accessible through Add/Remove
48-
Programs in your Control Panel.
36+
$ pip install django-tagging
4937

5038
Installing the development version
5139
----------------------------------
@@ -66,8 +54,8 @@ You can verify that the application is available on your PYTHONPATH by
6654
opening a Python interpreter and entering the following commands::
6755

6856
>>> import tagging
69-
>>> tagging.VERSION
70-
(0, 3, 4, 'final', 0)
57+
>>> tagging.__version__
58+
0.4.dev0
7159

7260
When you want to update your copy of the Django Tagging source code, run
7361
the command ``git pull`` from within the ``django-tagging`` directory.
@@ -91,14 +79,13 @@ Once you've installed Django Tagging and want to use it in your Django
9179
applications, do the following:
9280

9381
1. Put ``'tagging'`` in your ``INSTALLED_APPS`` setting.
94-
2. Run the command ``manage.py syncdb``.
82+
2. Run the command ``manage.py migrate``.
9583

96-
The ``syncdb`` command creates the necessary database tables and
84+
The ``migrate`` command creates the necessary database tables and
9785
creates permission objects for all installed apps that need them.
9886

9987
That's it!
10088

101-
10289
Settings
10390
========
10491

0 commit comments

Comments
 (0)