Rev 5222: Fix remaining sphinx_conf references. in file:///home/vila/src/bzr/bugs/219334-texinfo/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/219334-texinfo/

------------------------------------------------------------
revno: 5222
revision-id: v.ladeuil+lp at free.fr-20100707150314-7i5po3dwg8umiv8x
parent: v.ladeuil+lp at free.fr-20100707113203-hhdq1cp04un2r1d6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: texinfo
timestamp: Wed 2010-07-07 17:03:14 +0200
message:
  Fix remaining sphinx_conf references.
-------------- next part --------------
=== modified file 'doc/developers/conf.py'
--- a/doc/developers/conf.py	2009-09-09 15:51:18 +0000
+++ b/doc/developers/conf.py	2010-07-07 15:03:14 +0000
@@ -13,7 +13,7 @@
 sys.path = [os.path.abspath('../..')] + sys.path
 
 # Most of the configuration for Bazaar docs is defined here ...
-from bzrlib.doc_generate.sphinx_conf import *
+from bzrlib.doc_generate.conf import *
 
 
 ## Configuration specific to this site ##

=== modified file 'doc/es/conf.py'
--- a/doc/es/conf.py	2009-09-09 15:51:18 +0000
+++ b/doc/es/conf.py	2010-07-07 15:03:14 +0000
@@ -13,7 +13,7 @@
 sys.path = [os.path.abspath('../..')] + sys.path
 
 # Most of the configuration for Bazaar docs is defined here ...
-from bzrlib.doc_generate.sphinx_conf import *
+from bzrlib.doc_generate.conf import *
 
 
 ## Configuration specific to this site ##

=== modified file 'doc/ja/conf.py'
--- a/doc/ja/conf.py	2009-11-18 06:18:14 +0000
+++ b/doc/ja/conf.py	2010-07-07 15:03:14 +0000
@@ -13,7 +13,7 @@
 sys.path = [os.path.abspath('../..')] + sys.path
 
 # Most of the configuration for Bazaar docs is defined here ...
-from bzrlib.doc_generate.sphinx_conf import *
+from bzrlib.doc_generate.conf import *
 
 
 ## Configuration specific to this site ##

=== modified file 'doc/ru/conf.py'
--- a/doc/ru/conf.py	2009-09-09 15:51:18 +0000
+++ b/doc/ru/conf.py	2010-07-07 15:03:14 +0000
@@ -13,7 +13,7 @@
 sys.path = [os.path.abspath('../..')] + sys.path
 
 # Most of the configuration for Bazaar docs is defined here ...
-from bzrlib.doc_generate.sphinx_conf import *
+from bzrlib.doc_generate.conf import *
 
 
 ## Configuration specific to this site ##