Merge pull request #7871 from takluyver/docs-misc-cleanup-feb15

Misc docs cleanup
This commit is contained in:
Min RK 2015-02-26 09:12:15 -08:00
commit 41e61d42a5
3 changed files with 21 additions and 21 deletions

View File

@ -87,13 +87,13 @@ class FileContentsManager(FileManagerMixin, ContentsManager):
This can be used to process the file on disk,
such as converting the notebook to a script or HTML via nbconvert.
It will be called as (all arguments passed by keyword):
It will be called as (all arguments passed by keyword)::
hook(os_path=os_path, model=model, contents_manager=instance)
path: the filesystem path to the file just written
model: the model representing the file
contents_manager: this ContentsManager instance
- path: the filesystem path to the file just written
- model: the model representing the file
- contents_manager: this ContentsManager instance
"""
)
def _post_save_hook_changed(self, name, old, new):

View File

@ -81,14 +81,14 @@ class ContentsManager(LoggingConfigurable):
such as removing notebook outputs or other side effects that
should not be saved.
It will be called as (all arguments passed by keyword):
It will be called as (all arguments passed by keyword)::
hook(path=path, model=model, contents_manager=self)
model: the model to be saved. Includes file contents.
modifying this dict will affect the file that is stored.
path: the API path of the save destination
contents_manager: this ContentsManager instance
- model: the model to be saved. Includes file contents.
Modifying this dict will affect the file that is stored.
- path: the API path of the save destination
- contents_manager: this ContentsManager instance
"""
)
def _pre_save_hook_changed(self, name, old, new):

View File

@ -171,7 +171,7 @@ def interactive(__interact_f, **kwargs):
Parameters
----------
__interact_f : function
The function to which the interactive widgets are tied. The **kwargs
The function to which the interactive widgets are tied. The `**kwargs`
should match the function signature.
**kwargs : various, optional
An interactive widget is created for each keyword argument that is a
@ -246,7 +246,7 @@ def interact(__interact_f=None, **kwargs):
"""
Displays interactive widgets which are tied to a function.
Expects the first argument to be a function. Parameters to this function are
widget abbreviations passed in as keyword arguments (**kwargs). Can be used
widget abbreviations passed in as keyword arguments (`**kwargs`). Can be used
as a decorator (see examples).
Returns
@ -256,7 +256,7 @@ def interact(__interact_f=None, **kwargs):
Parameters
----------
__interact_f : function
The function to which the interactive widgets are tied. The **kwargs
The function to which the interactive widgets are tied. The `**kwargs`
should match the function signature. Passed to :func:`interactive()`
**kwargs : various, optional
An interactive widget is created for each keyword argument that is a
@ -264,37 +264,37 @@ def interact(__interact_f=None, **kwargs):
Examples
--------
Renders an interactive text field that shows the greeting with the passed in
text.
Render an interactive text field that shows the greeting with the passed in
text::
1. Invocation of interact as a function
# 1. Using interact as a function
def greeting(text="World"):
print "Hello {}".format(text)
interact(greeting, text="IPython Widgets")
2. Invocation of interact as a decorator
# 2. Using interact as a decorator
@interact
def greeting(text="World"):
print "Hello {}".format(text)
3. Invocation of interact as a decorator with named parameters
# 3. Using interact as a decorator with named parameters
@interact(text="IPython Widgets")
def greeting(text="World"):
print "Hello {}".format(text)
Renders an interactive slider widget and prints square of number.
Render an interactive slider widget and prints square of number::
1. Invocation of interact as a function
# 1. Using interact as a function
def square(num=1):
print "{} squared is {}".format(num, num*num)
interact(square, num=5)
2. Invocation of interact as a decorator
# 2. Using interact as a decorator
@interact
def square(num=2):
print "{} squared is {}".format(num, num*num)
3. Invocation of interact as a decorator with named parameters
# 3. Using interact as a decorator with named parameters
@interact(num=5)
def square(num=2):
print "{} squared is {}".format(num, num*num)