Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docs/ansible2rst.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
from distutils.version import LooseVersion
from jinja2 import Environment, FileSystemLoader

from ansible.utils import module_docs
try:
from ansible.utils import module_docs
except ImportError:
from ansible.utils import plugin_docs as module_docs
from ansible import __version__ as ansible_version

#####################################################################################
Expand Down
14 changes: 7 additions & 7 deletions library/junos_install_config
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ description:
either NETCONF or the CONSOLE port. Specify the I(console) option to use the
CONSOLE port.

You provide the configuration data in a file. Supported formats when using
- You provide the configuration data in a file. Supported formats when using
NETCONF include ASCII text, Junos XML elements, and Junos OS B(set) commands.
Configurations performed through the console must only use ASCII text formatting.
requirements:
Expand Down Expand Up @@ -175,12 +175,12 @@ options:
choices: ['true','false','yes','no']
ignore_warning:
description:
- A boolean, string or list of string.
If the value is True, it will ignore all warnings regardless of the
warning message. If the value is a string, it will ignore
warning(s) if the message of each warning matches the string. If
the value is a list of strings, ignore warning(s) if the message of
each warning matches at least one of the strings in the list.
- A boolean, string or list of string. If the value is True, it
will ignore all warnings regardless of the warning message. If
the value is a string, it will ignore warning(s) if the message
of each warning matches the string. If the value is a list of
strings, ignore warning(s) if the message of each warning matches
at least one of the strings in the list.
required: false
default: None
check_commit_wait:
Expand Down