diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-06-19 12:03:20 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-06-19 12:05:23 +0100 |
| commit | 9daf81b94e7945d7adfdf62206cf9cb436166f0d (patch) | |
| tree | 0ca2a77977432d0c139886297afb433569b588ca /docs/Makefile | |
| parent | 315ab41e416c777d4f42932d42df07872e8f8895 (diff) | |
| parent | d9a43545be1af95a13c181c8b178f5631d3a4148 (diff) | |
Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
django/db/models/loading.py
Diffstat (limited to 'docs/Makefile')
| -rw-r--r-- | docs/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/Makefile b/docs/Makefile index 2a8bcd7101..a2c926c7ea 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -6,11 +6,12 @@ SPHINXOPTS = SPHINXBUILD = sphinx-build PAPER = BUILDDIR = _build +LANGUAGE = # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -n -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -n -d $(BUILDDIR)/doctrees -D language=$(LANGUAGE) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . |