commit 3d4054ed1db72ef8acf6c1aa2e19e387d47e147a
Author: Joel Pittet <joel@pittet.ca>
Date:   Wed Apr 17 08:37:31 2013 -0700

    join and docs

diff --git a/core/modules/views/views_ui/templates/views-ui-display-tab-setting.html.twig b/core/modules/views/views_ui/templates/views-ui-display-tab-setting.html.twig
index 3730059..3e05bea 100644
--- a/core/modules/views/views_ui/templates/views-ui-display-tab-setting.html.twig
+++ b/core/modules/views/views_ui/templates/views-ui-display-tab-setting.html.twig
@@ -4,15 +4,13 @@
  * Template for each row inside the "boxes" on the display query edit screen.
  *
  * Available variables:
- * - attributes: An array of HTML attributes such as class for the container.
+ * - attributes: HTML attributes such as class for the container.
  * - description: The description or label for this setting.
- * - zebra: A string identifying the row as either 'odd' or 'even'.
- * - settings_links: An array of links for this setting.
- * - defaulted: A boolean flag indicating this setting is in its default state.
- * - overridden: A boolean flag indicating this setting is overridden.
+ * - zebra: A CSS class dentifying the row as either 'odd' or 'even'.
+ * - settings_links: A list of links for this setting.
  *
- * @see template_preprocess
- * @see template_preprocess_views_ui_display_tab_bucket
+ * @see template_preprocess()
+ * @see template_preprocess_views_ui_display_tab_bucket()
  *
  * @ingroup themeable
  */
@@ -22,12 +20,6 @@
     <span class="label">{{ description }}</span>
   {%- endif %}
   {% if settings_links %}
-    {% set separator = '<span class="label">&nbsp;|&nbsp;</span>' %}
-    {% for link in settings_links %}
-      {{ link }}
-      {% if loop.length > 1 and not loop.last %}
-        {{ separator }}
-      {% endif %}
-    {% endfor %}
+    {{ settings_links|join('<span class="label">&nbsp;|&nbsp;</span>') }}
   {% endif %}
 </div>
diff --git a/core/modules/views/views_ui/views_ui.theme.inc b/core/modules/views/views_ui/views_ui.theme.inc
index 3c0e9aa..9709212 100644
--- a/core/modules/views/views_ui/views_ui.theme.inc
+++ b/core/modules/views/views_ui/views_ui.theme.inc
@@ -16,7 +16,18 @@ function theme_views_ui_container($variables) {
 }
 
 /**
- * Prepares variables for views-ui-display-tab-setting.html.twig.
+ * Prepares variables for Views UI display tab setting templates.
+ *
+ * Default template: views-ui-display-tab-setting.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - link: @todo.
+ *   - settings_links: @todo.
+ *   - defaulted: @todo.
+ *   - overridden: @todo.
+ *   - description: @todo.
+ *   - description_separator: @todo.
  */
 function template_preprocess_views_ui_display_tab_setting(&$variables) {
   static $zebra = 0;