Skip to content

Commit

Permalink
docs update
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Smith committed May 26, 2013
1 parent 246c1f5 commit 6d56e2a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions arrow/arrow.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Arrow(object):
:param minute: minute, default 0
:param second: second, default 0
:param microsecond: microsecond, default 0
:param tzinfo: tzinfo struct, default None
:param tzinfo: a ``tzinfo`` object, default None
If tzinfo is None, it is assumed to be UTC on creation.
Expand Down Expand Up @@ -54,7 +54,7 @@ def __init__(self, year, month, day, hour=0, minute=0, second=0, microsecond=0,
def now(cls, tzinfo=None):
'''Constructs an :class:`Arrow <arrow.Arrow>` object, representing "now".
:param tzinfo: (optional) a tzinfo struct. Defaults to local time.
:param tzinfo: (optional) a ``tzinfo`` object. Defaults to local time.
'''

utc = datetime.utcnow().replace(tzinfo=dateutil_tz.tzutc())
Expand All @@ -78,7 +78,7 @@ def fromtimestamp(cls, timestamp, tzinfo=None):
'''Constructs an :class:`Arrow <arrow.Arrow>` object from a timestamp.
:param timestamp: an integer or floating-point timestamp.
:param tzinfo: (optional) a tzinfo struct. Defaults to local time.
:param tzinfo: (optional) a ``tzinfo`` object. Defaults to local time.
'''

tzinfo = tzinfo or dateutil_tz.tzlocal()
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.insert(0, os.path.abspath('../arrow'))
sys.path.insert(0, os.path.abspath('../'))

# -- General configuration -----------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ Or just iterate over a range of time:
API Guide
---------

.. automodule:: api
.. automodule:: arrow.api
:members:

.. automodule:: arrow
.. automodule:: arrow.arrow
:members:

0 comments on commit 6d56e2a

Please sign in to comment.