Skip to content

Commit

Permalink
Bug 1115278 - Fix mach documentation issues; r=glandium
Browse files Browse the repository at this point in the history
terminal.py had an ambiguous |import logging| that was importing
mach.logging from Sphinx. We fix it.

There was also a poorly formed link in the mach commands documentation.
We fix it.

--HG--
extra : rebase_source : 12783c69027989ac031d29e4ecbc1ee2f465ffa4
extra : histedit_source : 4283c6cdecc4de8aa7636d0c4cc566daf5142b50
  • Loading branch information
indygreg committed Dec 24, 2014
1 parent 6d6343a commit 72383f2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion python/mach/docs/commands.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The important decorators are as follows:
A method decorator that defines an argument to the command. Its
arguments are essentially proxied to ArgumentParser.add_argument()

:py:func:`SubCommand <mach.decorators.SubCommand`
:py:func:`SubCommand <mach.decorators.SubCommand>`
A method decorator that denotes that the method should be a
sub-command to an existing ``@Command``. The decorator takes the
parent command name as its first argument and the sub-command name
Expand Down
2 changes: 1 addition & 1 deletion python/mach/mach/terminal.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
one place, away from code that is commonly looked at.
"""

from __future__ import print_function, unicode_literals
from __future__ import absolute_import, print_function, unicode_literals

import logging
import sys
Expand Down

0 comments on commit 72383f2

Please sign in to comment.