Browse files

Merge pull request #418 from ddale/master

Minor configuration doc fixes
  • Loading branch information...
takluyver committed May 9, 2011
2 parents f891240 + 614311f commit 3b81000fe96a1ffcb5ba8f7d6e15ae46010701a2
Showing with 2 additions and 2 deletions.
  1. +1 −1 IPython/config/default/
  2. +1 −1 docs/source/config/ipython.txt
@@ -16,7 +16,7 @@
# c.Global.log_level = 20
# This should be a list of importable Python modules that have an
-# load_in_ipython(ip) method. This method gets called when the extension
+# load_ipython_extension(ip) method. This method gets called when the extension
# is loaded. You can put your extensions anywhere they can be imported
# but we add the extensions subdir of the ipython directory to sys.path
# during extension loading, so you can put them there as well.
@@ -13,7 +13,7 @@ The default configuration file for the :command:`ipython` command line applicati
is :file:``. By setting the attributes in this file, you
can configure the application. A sample is provided in
:mod:`IPython.config.default.ipython_config`. Simply copy this file to your
-IPython directory to start using it.
+:ref:`IPython directory <ipython_dir>` to start using it.
Most configuration attributes that this file accepts are associated with
classes that are subclasses of :class:`~IPython.core.component.Component`.

0 comments on commit 3b81000

Please sign in to comment.