Merge "Add note on JJB defaults"

diff --combined docs/conf.py
index b438a88,0359ed9..2458cfe
--- 1/docs/conf.py
--- 2/docs/conf.py
+++ b/docs/conf.py
@@@ -67,7 -67,7 +67,7 @@@ author = 'Linux Foundation Releng
  # built documents.
  #
  # The short X.Y version.
 -version = '0.11.0-dev'
 +version = '0.12.0-dev'
  # The full version, including alpha/beta/rc tags.
  release = version
  
@@@ -255,6 -255,8 +255,7 @@@ htmlhelp_basename = 'LinuxFoundationRel
  
  # Example configuration for intersphinx: refer to the Python standard library.
  intersphinx_mapping = {
+     'jjb': ('https://docs.openstack.org/infra/jenkins-job-builder/', None),
      'lftools': ('http://lftools.releng.linuxfoundation.org/en/latest/', None),
      'python': ('https://docs.python.org/', None),
  }
 -