##// END OF EJS Templates
Merging upstream.
bgranger -
r2340:ef5de34e merge
parent child Browse files
Show More
@@ -39,7 +39,7 b' from IPython.core.splitinput import split_user_input'
39 39 from IPython.core.page import page
40 40
41 41 from IPython.utils.traitlets import List, Int, Any, Str, CBool, Bool
42 from IPython.utils.genutils import make_quoted_expr
42 from IPython.utils.genutils import make_quoted_expr, Term
43 43 from IPython.utils.autoattr import auto_attr
44 44
45 45 #-----------------------------------------------------------------------------
@@ -72,7 +72,6 b' class IPClusterCLLoader(ArgParseConfigLoader):'
72 72 parent_parser2 = argparse.ArgumentParser(add_help=False)
73 73 parent_parser2.add_argument('-p','--profile',
74 74 dest='Global.profile',type=unicode,
75 default=NoConfigDefault,
76 75 help='The string name of the profile to be used. This determines '
77 76 'the name of the cluster dir as: cluster_<profile>. The default profile '
78 77 'is named "default". The cluster directory is resolve this way '
@@ -81,7 +80,6 b' class IPClusterCLLoader(ArgParseConfigLoader):'
81 80 metavar='Global.profile')
82 81 parent_parser2.add_argument('--cluster-dir',
83 82 dest='Global.cluster_dir',type=unicode,
84 default=NoConfigDefault,
85 83 help='Set the cluster dir. This overrides the logic used by the '
86 84 '--profile option.',
87 85 default=NoConfigDefault,
@@ -14,6 +14,8 b' ALLSPHINXOPTS = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SRCDIR)'
14 14
15 15 .PHONY: help clean html web pickle htmlhelp latex changes linkcheck api
16 16
17 default: html
18
17 19 help:
18 20 @echo "Please use \`make <target>' where <target> is one of"
19 21 @echo " html to make standalone HTML files"
@@ -34,6 +34,7 b" if __name__ == '__main__':"
34 34 r'\.ipdoctest',
35 35 r'\.Gnuplot',
36 36 r'\.frontend\.process\.winprocess',
37 r'\.Shell',
37 38 ]
38 39 docwriter.write_api_docs(outdir)
39 40 docwriter.write_index(outdir, 'gen',
@@ -182,7 +182,7 b" latex_documents = [ ('index', 'ipython.tex', 'IPython Documentation',"
182 182 #latex_appendices = []
183 183
184 184 # If false, no module index is generated.
185 #latex_use_modindex = True
185 latex_use_modindex = True
186 186
187 187
188 188 # Cleanup
1 NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (811 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now