From 12cf060ba7059a521203a85ad56ef62b3fae67c7 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Mon, 26 Aug 2013 15:57:58 -0400
Subject: [PATCH] Silence doc test errors/warnings

---
 docs/course_authors/Makefile | 4 ++--
 docs/data/Makefile           | 4 ++--
 docs/developers/Makefile     | 2 +-
 rakelib/docs.rake            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/course_authors/Makefile b/docs/course_authors/Makefile
index b05c2d944a..d02280e2fd 100644
--- a/docs/course_authors/Makefile
+++ b/docs/course_authors/Makefile
@@ -15,13 +15,13 @@ endif
 Q_FLAG        = 
 
 ifeq ($(quiet), true)
-Q_FLAG = -q
+Q_FLAG = -Q
 endif
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 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
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
diff --git a/docs/data/Makefile b/docs/data/Makefile
index 272527a445..2096b14f91 100644
--- a/docs/data/Makefile
+++ b/docs/data/Makefile
@@ -15,13 +15,13 @@ endif
 Q_FLAG        = 
 
 ifeq ($(quiet), true)
-Q_FLAG = -q
+Q_FLAG = -Q
 endif
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 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
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
diff --git a/docs/developers/Makefile b/docs/developers/Makefile
index 65fea6d46e..faa8708cd4 100644
--- a/docs/developers/Makefile
+++ b/docs/developers/Makefile
@@ -15,7 +15,7 @@ endif
 Q_FLAG        = 
 
 ifeq ($(quiet), true)
-Q_FLAG = -q
+Q_FLAG = -Q
 endif
 
 # Internal variables.
diff --git a/rakelib/docs.rake b/rakelib/docs.rake
index 3af50e2492..025bee3727 100644
--- a/rakelib/docs.rake
+++ b/rakelib/docs.rake
@@ -18,7 +18,7 @@ task :builddocs, [:type, :quiet] do |t, args|
         if args.quiet == 'verbose'
             sh('make html quiet=false')
         else
-            sh('make html')
+            sh('make html quiet=true')
         end
     end
 end