Merge "Update the doc links to the newest ones"

horizon/middleware/base.py

@@ -94,8 +94,8 @@ class HorizonMiddleware(object):
                         '%(cookie_size)sB >= %(max_cookie_size)sB. '
                         'You need to configure file-based or database-backed '
                         'sessions instead of cookie-based sessions: '
-                        'http://docs.openstack.org/developer/horizon/topics/'
-                        'deployment.html#session-storage',
+                        'https://docs.openstack.org/horizon/latest/'
+                        'admin/sessions.html',
                         {
                             'user_id': request.session.get(
                                 'user_id', 'Unknown'),

openstack_dashboard/local/local_settings.py.example

@@ -790,7 +790,8 @@ SECURITY_GROUP_RULES = {
 #  $glance --os-image-api-version 2 help md-namespace-import
 #  $glance-manage db_load_metadefs <directory_with_definition_files>
 #
-# See Metadata Definitions on: http://docs.openstack.org/developer/glance/
+# See Metadata Definitions on:
+# https://docs.openstack.org/glance/latest/user/glancemetadefcatalogapi.html
 
 # TODO: (david-lyle) remove when plugins support settings natively
 # Note: This is only used when the Sahara plugin is configured and enabled
@@ -903,7 +904,8 @@ ALLOWED_PRIVATE_SUBNET_CIDR = {'ipv4': [], 'ipv6': []}
 # Horizon has the ability to display these extra attributes via this setting.
 # If you'd like to display extra data in the project or user tables, set the
 # corresponding dict key to the attribute name, followed by the display name.
-# For more information, see horizon's customization (http://docs.openstack.org/developer/horizon/topics/customizing.html#horizon-customization-module-overrides)
+# For more information, see horizon's customization
+# (https://docs.openstack.org/horizon/latest/configuration/customizing.html#horizon-customization-module-overrides)
 #PROJECT_TABLE_EXTRA_INFO = {
 #   'phone_num': _('Phone Number'),
 #}

openstack_dashboard/settings.py

@@ -72,7 +72,7 @@ HORIZON_CONFIG = {
         'types': ['alert-success', 'alert-info']
     },
     'bug_url': None,
-    'help_url': "http://docs.openstack.org",
+    'help_url': "https://docs.openstack.org/",
     'exceptions': {'recoverable': exceptions.RECOVERABLE,
                    'not_found': exceptions.NOT_FOUND,
                    'unauthorized': exceptions.UNAUTHORIZED},

openstack_dashboard/static/app/core/openstack-service-api/cinder.service.js

@@ -284,12 +284,11 @@
      *  {
      *    "items": [
      *      {
-     *        "alias": "NMN",
-     *        "description": "Multiple network support.",
+     *        "alias": "OS-SCH-HNT",
+     *        "description": "Pass arbitrary key/value pairs to the scheduler.",
      *        "links": [],
-     *        "name": "Multinic",
-     *        "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1",
-     *        "updated": "2011-06-09T00:00:00Z"
+     *        "name": "SchedulerHints",
+     *        "updated": "2013-04-18T00:00:00+00:00"
      *      }
      *    ]
      *  }

openstack_dashboard/test/integration_tests/config.py

@@ -20,7 +20,7 @@ DashboardGroup = [
                default='http://localhost/',
                help="Where the dashboard can be found"),
     cfg.StrOpt('help_url',
-               default='http://docs.openstack.org/',
+               default='https://docs.openstack.org/',
                help="Dashboard help page url"),
 ]
 

openstack_dashboard/test/integration_tests/horizon.conf

@@ -7,7 +7,7 @@
 dashboard_url=http://localhost/dashboard/
 
 # Dashboard help page url (string value)
-help_url=http://docs.openstack.org/
+help_url=https://docs.openstack.org/
 
 [selenium]
 # Timeout in seconds to wait for a page to become available

openstack_dashboard/test/settings.py

@@ -100,7 +100,7 @@ HORIZON_CONFIG = {
         "help_text": "Password must be between 8 and 18 characters."
     },
     'user_home': None,
-    'help_url': "http://docs.openstack.org",
+    'help_url': "https://docs.openstack.org/",
     'exceptions': {'recoverable': exceptions.RECOVERABLE,
                    'not_found': exceptions.NOT_FOUND,
                    'unauthorized': exceptions.UNAUTHORIZED},

releasenotes/notes/openstack-profiler-at-developer-dashboard-da1b1556e30aa858.yaml

@@ -2,7 +2,7 @@
 features:
   - A new Profiler panel in the Developer dashboard is
     introduced. It integrates
-    `osprofiler library <http://docs.openstack.org/developer/osprofiler/>`_
+    `osprofiler library <https://docs.openstack.org/osprofiler/latest/>`_
     into horizon, thus implementing
     `blueprint openstack-profiler-at-developer-dashboard <https://blueprints.launchpad.net/horizon/+spec/openstack-profiler-at-developer-dashboard>`_.
     Initially profiler is disabled. To enable it the value