merge with 1.0

1 files changed, 1 insertions, 4 deletions

diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index 4cae738d5..ebbcf27b8 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -137,10 +137,7 @@ class BuildDoc(Command):
                      freshenv=self.fresh_env)
 
         try:
-            if self.all_files:
-                app.builder.build_all()
-            else:
-                app.builder.build_update()
+            app.build(force_all=self.all_files)
         except Exception, err:
             from docutils.utils import SystemMessage
             if isinstance(err, SystemMessage):