Commit 02cb0b48 by Will Daly

Merge pull request #795 from edx/will/silence-doc-warnings

Silence doc test errors/warnings
parents cee44501 12cf060b
...@@ -15,13 +15,13 @@ endif ...@@ -15,13 +15,13 @@ endif
Q_FLAG = Q_FLAG =
ifeq ($(quiet), true) ifeq ($(quiet), true)
Q_FLAG = -q Q_FLAG = -Q
endif endif
# Internal variables. # Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -q -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source ALLSPHINXOPTS = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
# the i18n builder cannot share the environment and doctrees with the others # the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
......
...@@ -15,13 +15,13 @@ endif ...@@ -15,13 +15,13 @@ endif
Q_FLAG = Q_FLAG =
ifeq ($(quiet), true) ifeq ($(quiet), true)
Q_FLAG = -q Q_FLAG = -Q
endif endif
# Internal variables. # Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -q -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source ALLSPHINXOPTS = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
# the i18n builder cannot share the environment and doctrees with the others # the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
......
...@@ -15,7 +15,7 @@ endif ...@@ -15,7 +15,7 @@ endif
Q_FLAG = Q_FLAG =
ifeq ($(quiet), true) ifeq ($(quiet), true)
Q_FLAG = -q Q_FLAG = -Q
endif endif
# Internal variables. # Internal variables.
......
...@@ -18,7 +18,7 @@ task :builddocs, [:type, :quiet] do |t, args| ...@@ -18,7 +18,7 @@ task :builddocs, [:type, :quiet] do |t, args|
if args.quiet == 'verbose' if args.quiet == 'verbose'
sh('make html quiet=false') sh('make html quiet=false')
else else
sh('make html') sh('make html quiet=true')
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment