This is an automated email from the ASF dual-hosted git repository.

dbecker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit eadd35f6d5c8510a1d3533d92e5793e9be9c6ff2
Author: Tamas Mate <[email protected]>
AuthorDate: Tue Oct 10 15:09:26 2023 +0200

    IMPALA-11853: Fix formatted docs query options CSS
    
    The recent documentation formatting changes introduced the navigation
    panel on the left. However, due to the length of the query options
    navigation title these could overlap with the documentation paragraphs.
    
    This commit removes the underscores from the navigation titles of the
    query options, so browsers can break them into multiple lines.
    Additionally, the "SET" and "Query Options for the SET Statement" pages
    are merged to save some more space for the query option navigation
    titles.
    
    Testing:
     - Built the documentation and tested manually
    
    Change-Id: Icec787d7a2af848aaaff65be2ecf311a5ce8fe7f
    Reviewed-on: http://gerrit.cloudera.org:8080/20556
    Tested-by: Impala Public Jenkins <[email protected]>
    Reviewed-by: Jason Fehr <[email protected]>
    Reviewed-by: Peter Rozsa <[email protected]>
    Reviewed-by: Tamas Mate <[email protected]>
---
 docs/impala.ditamap                                | 178 ++++++++++-----------
 docs/impala_keydefs.ditamap                        |   1 -
 docs/topics/impala_abort_on_error.xml              |   2 +-
 docs/topics/impala_allow_erasure_coded_files.xml   |   2 +-
 docs/topics/impala_allow_unsupported_formats.xml   |   2 +-
 docs/topics/impala_appx_count_distinct.xml         |   2 +-
 docs/topics/impala_batch_size.xml                  |   2 +-
 docs/topics/impala_broadcast_bytes_limit.xml       |   2 +-
 docs/topics/impala_buffer_pool_limit.xml           |   2 +-
 docs/topics/impala_compression_codec.xml           |   2 +-
 .../impala_compute_stats_min_sample_size.xml       |   2 +-
 docs/topics/impala_config_options.xml              |   2 +-
 docs/topics/impala_debug_action.xml                |   2 +-
 docs/topics/impala_decimal_v2.xml                  |   2 +-
 docs/topics/impala_default_file_format.xml         |   2 +-
 .../impala_default_hints_insert_statement.xml      |   2 +-
 .../impala_default_join_distribution_mode.xml      |   2 +-
 .../impala_default_spillable_buffer_size.xml       |   2 +-
 docs/topics/impala_default_transactional_type.xml  |   2 +-
 docs/topics/impala_delete_stats_in_truncate.xml    |   3 +-
 docs/topics/impala_disable_codegen.xml             |   2 +-
 .../impala_disable_codegen_rows_threshold.xml      |   2 +-
 .../impala_disable_hbase_num_rows_estimate.xml     |   2 +-
 .../impala_disable_row_runtime_filtering.xml       |   2 +-
 .../impala_disable_streaming_preaggregations.xml   |   2 +-
 docs/topics/impala_disable_unsafe_spills.xml       |   2 +-
 docs/topics/impala_enable_expr_rewrites.xml        |   2 +-
 .../impala_exec_single_node_rows_threshold.xml     |   2 +-
 docs/topics/impala_exec_time_limit_s.xml           |   2 +-
 docs/topics/impala_expand_complex_types.xml        |   3 +-
 docs/topics/impala_explain_level.xml               |   2 +-
 docs/topics/impala_fetch_rows_timeout_ms.xml       |   2 +-
 docs/topics/impala_hbase_cache_blocks.xml          |   2 +-
 docs/topics/impala_hbase_caching.xml               |   2 +-
 docs/topics/impala_idle_session_timeout.xml        |   2 +-
 docs/topics/impala_join_rows_produced_limit.xml    |   2 +-
 docs/topics/impala_kudu_read_mode.xml              |   2 +-
 docs/topics/impala_live_progress.xml               |   2 +-
 docs/topics/impala_live_summary.xml                |   2 +-
 docs/topics/impala_max_errors.xml                  |   2 +-
 .../impala_max_mem_estimate_for_admission.xml      |   2 +-
 docs/topics/impala_max_num_runtime_filters.xml     |   2 +-
 docs/topics/impala_max_result_spooling_mem.xml     |   2 +-
 docs/topics/impala_max_row_size.xml                |   2 +-
 docs/topics/impala_max_scan_range_length.xml       |   2 +-
 .../impala_max_spilled_result_spooling_mem.xml     |   2 +-
 docs/topics/impala_mem_limit.xml                   |   2 +-
 docs/topics/impala_min_spillable_buffer_size.xml   |   2 +-
 docs/topics/impala_mt_dop.xml                      |   2 +-
 docs/topics/impala_num_nodes.xml                   |   2 +-
 docs/topics/impala_num_rows_produced_limit.xml     |   2 +-
 docs/topics/impala_num_scanner_threads.xml         |   2 +-
 .../topics/impala_optimize_partition_key_scans.xml |   2 +-
 .../impala_parquet_annotate_strings_utf8.xml       |   2 +-
 docs/topics/impala_parquet_array_resolution.xml    |   2 +-
 docs/topics/impala_parquet_compression_codec.xml   |   2 +-
 .../topics/impala_parquet_dictionary_filtering.xml |   2 +-
 .../impala_parquet_fallback_schema_resolution.xml  |   2 +-
 docs/topics/impala_parquet_file_size.xml           |   2 +-
 .../impala_parquet_object_store_split_size.xml     |   2 +-
 .../topics/impala_parquet_page_row_count_limit.xml |   2 +-
 docs/topics/impala_parquet_read_page_index.xml     |   2 +-
 docs/topics/impala_parquet_read_statistics.xml     |   2 +-
 docs/topics/impala_parquet_write_page_index.xml    |   2 +-
 docs/topics/impala_prefetch_mode.xml               |   2 +-
 docs/topics/impala_query_options.xml               | 101 ------------
 docs/topics/impala_query_timeout_s.xml             |   2 +-
 docs/topics/impala_refresh_updated_hms.xml         |   2 +-
 docs/topics/impala_replica_preference.xml          |   2 +-
 docs/topics/impala_request_pool.xml                |   2 +-
 docs/topics/impala_resource_trace_ratio.xml        |   2 +-
 docs/topics/impala_retry_failed_queries.xml        |   2 +-
 docs/topics/impala_runtime_bloom_filter_size.xml   |   2 +-
 docs/topics/impala_runtime_filter_max_size.xml     |   2 +-
 docs/topics/impala_runtime_filter_min_size.xml     |   2 +-
 docs/topics/impala_runtime_filter_mode.xml         |   2 +-
 docs/topics/impala_runtime_filter_wait_time_ms.xml |   2 +-
 docs/topics/impala_s3_skip_insert_staging.xml      |   2 +-
 docs/topics/impala_scan_bytes_limit.xml            |   2 +-
 docs/topics/impala_schedule_random_replica.xml     |   2 +-
 docs/topics/impala_scratch_limit.xml               |   2 +-
 docs/topics/impala_seq_compression_mode.xml        |   1 +
 docs/topics/impala_set.xml                         |  46 +++++-
 docs/topics/impala_shell_commands.xml              |   4 +-
 docs/topics/impala_shuffle_distinct_exprs.xml      |   2 +-
 docs/topics/impala_spool_query_results.xml         |   2 +-
 docs/topics/impala_support_start_over.xml          |   2 +-
 docs/topics/impala_sync_ddl.xml                    |   2 +-
 .../impala_thread_reservation_aggregate_limit.xml  |   2 +-
 docs/topics/impala_thread_reservation_limit.xml    |   2 +-
 docs/topics/impala_topn_bytes_limit.xml            |   2 +-
 docs/topics/impala_utf8_mode.xml                   |   2 +-
 92 files changed, 218 insertions(+), 287 deletions(-)

diff --git a/docs/impala.ditamap b/docs/impala.ditamap
index dff2672cd..046721002 100644
--- a/docs/impala.ditamap
+++ b/docs/impala.ditamap
@@ -168,97 +168,95 @@ under the License.
         <topicref href="topics/impala_distinct.xml"/>
       </topicref>
       <topicref href="topics/impala_set.xml">
-        <topicref href="topics/impala_query_options.xml">
-          <topicref href="topics/impala_abort_on_error.xml"/>
-          <topicref href="topics/impala_allow_erasure_coded_files.xml"/>
-          <topicref href="topics/impala_allow_unsupported_formats.xml"/>
-          <topicref href="topics/impala_appx_count_distinct.xml"/>
-          <topicref href="topics/impala_batch_size.xml"/>
-          <topicref href="topics/impala_broadcast_bytes_limit.xml"/>
-          <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_buffer_pool_limit.xml"/>
-          <topicref href="topics/impala_compression_codec.xml"/>
-          <topicref href="topics/impala_compute_stats_min_sample_size.xml"/>
-          <topicref href="topics/impala_debug_action.xml"/>
-          <topicref rev="2.9.0" href="topics/impala_decimal_v2.xml"/>
-          <topicref rev="3.2.0" href="topics/impala_default_file_format.xml"/>
-          <topicref rev="3.3.0" 
href="topics/impala_default_hints_insert_statement.xml"/>
-          <topicref rev="2.9.0 IMPALA-5381" 
href="topics/impala_default_join_distribution_mode.xml"/>
-          <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_default_spillable_buffer_size.xml"/>
-          <topicref rev="3.3.0" 
href="topics/impala_default_transactional_type.xml"/>
-          <topicref href="topics/impala_delete_stats_in_truncate.xml"/>
-          <topicref href="topics/impala_disable_codegen.xml"/>
-          <topicref rev="2.10.0 IMPALA-5483" 
href="topics/impala_disable_codegen_rows_threshold.xml"/>
-          <topicref href="topics/impala_disable_hbase_num_rows_estimate.xml"/>
-          <topicref rev="2.5.0" 
href="topics/impala_disable_row_runtime_filtering.xml"/>
-          <topicref rev="2.5.0" 
href="topics/impala_disable_streaming_preaggregations.xml"/>
-          <topicref href="topics/impala_disable_unsafe_spills.xml"/>
-          <topicref href="topics/impala_enable_expr_rewrites.xml"/>
-          <topicref href="topics/impala_exec_single_node_rows_threshold.xml"/>
-          <topicref href="topics/impala_exec_time_limit_s.xml"/>
-          <topicref href="topics/impala_explain_level.xml">
-            <topicref rev="2.5.0" 
href="topics/impala_max_num_runtime_filters.xml"/>
-          </topicref>
-          <topicref href="topics/impala_fetch_rows_timeout_ms.xml"/>
-          <topicref href="topics/impala_join_rows_produced_limit.xml"/>
-          <topicref href="topics/impala_hbase_cache_blocks.xml"/>
-          <topicref href="topics/impala_hbase_caching.xml"/>
-          <topicref href="topics/impala_idle_session_timeout.xml"/>
-          <topicref href="topics/impala_kudu_read_mode.xml"/>
-          <topicref href="topics/impala_live_progress.xml"/>
-          <topicref href="topics/impala_live_summary.xml"/>
-          <topicref href="topics/impala_max_errors.xml"/>
-          <topicref rev="3.1 IMPALA-6847" 
href="topics/impala_max_mem_estimate_for_admission.xml"/>
-          <topicref href="topics/impala_max_result_spooling_mem.xml"/>
-          <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_max_row_size.xml"/>
-          <topicref href="topics/impala_max_scan_range_length.xml"/>
-          <topicref href="topics/impala_max_spilled_result_spooling_mem.xml"/>
-          <topicref href="topics/impala_mem_limit.xml"/>
-          <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_min_spillable_buffer_size.xml"/>
-          <topicref rev="2.8.0" href="topics/impala_mt_dop.xml"/>
-          <topicref href="topics/impala_num_nodes.xml"/>
-          <topicref rev="3.2" 
href="topics/impala_num_rows_produced_limit.xml"/>
-          <topicref href="topics/impala_num_scanner_threads.xml"/>
-          <topicref rev="2.5.0" 
href="topics/impala_optimize_partition_key_scans.xml"/>
-          <topicref href="topics/impala_parquet_compression_codec.xml"/>
-          <topicref rev="2.6.0 IMPALA-2069" 
href="topics/impala_parquet_annotate_strings_utf8.xml"/>
-          <topicref rev="2.9.0 IMPALA-4725" 
href="topics/impala_parquet_array_resolution.xml"/>
-          <topicref href="topics/impala_parquet_dictionary_filtering.xml"/>
-          <topicref rev="2.6.0 IMPALA-2835" 
href="topics/impala_parquet_fallback_schema_resolution.xml"/>
-          <topicref href="topics/impala_parquet_file_size.xml"/>
-          <topicref href="topics/impala_parquet_object_store_split_size.xml"/>
-          <topicref href="topics/impala_parquet_page_row_count_limit.xml"/>
-          <topicref href="topics/impala_parquet_read_statistics.xml"/>
-          <topicref href="topics/impala_parquet_read_page_index.xml"/>
-          <topicref href="topics/impala_parquet_write_page_index.xml"/>
-          <topicref rev="2.6.0 IMPALA-3286" 
href="topics/impala_prefetch_mode.xml"/>
-          <topicref href="topics/impala_query_timeout_s.xml"/>
-          <topicref href="topics/impala_refresh_updated_hms.xml"/>
-          <topicref rev="2.7.0" href="topics/impala_replica_preference.xml"/>
-          <topicref href="topics/impala_request_pool.xml"/>
-          <topicref href="topics/impala_resource_trace_ratio.xml"/>
-          <topicref rev="4.0.0" href="topics/impala_retry_failed_queries.xml"/>
-          <topicref rev="2.5.0" 
href="topics/impala_runtime_bloom_filter_size.xml"/>
-          <topicref rev="2.6.0" 
href="topics/impala_runtime_filter_max_size.xml"/>
-          <topicref rev="2.6.0" 
href="topics/impala_runtime_filter_min_size.xml"/>
-          <topicref rev="2.5.0" href="topics/impala_runtime_filter_mode.xml"/>
-          <topicref rev="2.5.0" 
href="topics/impala_runtime_filter_wait_time_ms.xml"/>
-          <topicref rev="2.6.0" 
href="topics/impala_s3_skip_insert_staging.xml"/>
-          <topicref rev="3.1" href="topics/impala_scan_bytes_limit.xml"/>
-          <topicref rev="2.5.0" 
href="topics/impala_schedule_random_replica.xml"/>
-          <topicref rev="2.8.0 IMPALA-3671" 
href="topics/impala_scratch_limit.xml"/>
-          <!-- This option is for internal use only and might go away without 
ever being documented. -->
-          <!-- <topicref href="topics/impala_seq_compression_mode.xml"/> -->
-          <topicref href="topics/impala_shuffle_distinct_exprs.xml"/>
-          <topicref href="topics/impala_spool_query_results.xml"/>
-          <topicref href="topics/impala_support_start_over.xml"/>
-          <topicref href="topics/impala_sync_ddl.xml"/>
-          <topicref 
href="topics/impala_thread_reservation_aggregate_limit.xml"/>
-          <topicref href="topics/impala_thread_reservation_limit.xml"/>
-          <topicref href="topics/impala_timezone.xml"/>
-          <topicref href="topics/impala_topn_bytes_limit.xml"/>
-          <topicref href="topics/impala_utf8_mode.xml"/>
-          <topicref href="topics/impala_expand_complex_types.xml"/>
+        <topicref href="topics/impala_abort_on_error.xml"/>
+        <topicref href="topics/impala_allow_erasure_coded_files.xml"/>
+        <topicref href="topics/impala_allow_unsupported_formats.xml"/>
+        <topicref href="topics/impala_appx_count_distinct.xml"/>
+        <topicref href="topics/impala_batch_size.xml"/>
+        <topicref href="topics/impala_broadcast_bytes_limit.xml"/>
+        <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_buffer_pool_limit.xml"/>
+        <topicref href="topics/impala_compression_codec.xml"/>
+        <topicref href="topics/impala_compute_stats_min_sample_size.xml"/>
+        <topicref href="topics/impala_debug_action.xml"/>
+        <topicref rev="2.9.0" href="topics/impala_decimal_v2.xml"/>
+        <topicref rev="3.2.0" href="topics/impala_default_file_format.xml"/>
+        <topicref rev="3.3.0" 
href="topics/impala_default_hints_insert_statement.xml"/>
+        <topicref rev="2.9.0 IMPALA-5381" 
href="topics/impala_default_join_distribution_mode.xml"/>
+        <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_default_spillable_buffer_size.xml"/>
+        <topicref rev="3.3.0" 
href="topics/impala_default_transactional_type.xml"/>
+        <topicref href="topics/impala_delete_stats_in_truncate.xml"/>
+        <topicref href="topics/impala_disable_codegen.xml"/>
+        <topicref rev="2.10.0 IMPALA-5483" 
href="topics/impala_disable_codegen_rows_threshold.xml"/>
+        <topicref href="topics/impala_disable_hbase_num_rows_estimate.xml"/>
+        <topicref rev="2.5.0" 
href="topics/impala_disable_row_runtime_filtering.xml"/>
+        <topicref rev="2.5.0" 
href="topics/impala_disable_streaming_preaggregations.xml"/>
+        <topicref href="topics/impala_disable_unsafe_spills.xml"/>
+        <topicref href="topics/impala_enable_expr_rewrites.xml"/>
+        <topicref href="topics/impala_exec_single_node_rows_threshold.xml"/>
+        <topicref href="topics/impala_exec_time_limit_s.xml"/>
+        <topicref href="topics/impala_explain_level.xml">
+          <topicref rev="2.5.0" 
href="topics/impala_max_num_runtime_filters.xml"/>
         </topicref>
+        <topicref href="topics/impala_fetch_rows_timeout_ms.xml"/>
+        <topicref href="topics/impala_join_rows_produced_limit.xml"/>
+        <topicref href="topics/impala_hbase_cache_blocks.xml"/>
+        <topicref href="topics/impala_hbase_caching.xml"/>
+        <topicref href="topics/impala_idle_session_timeout.xml"/>
+        <topicref href="topics/impala_kudu_read_mode.xml"/>
+        <topicref href="topics/impala_live_progress.xml"/>
+        <topicref href="topics/impala_live_summary.xml"/>
+        <topicref href="topics/impala_max_errors.xml"/>
+        <topicref rev="3.1 IMPALA-6847" 
href="topics/impala_max_mem_estimate_for_admission.xml"/>
+        <topicref href="topics/impala_max_result_spooling_mem.xml"/>
+        <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_max_row_size.xml"/>
+        <topicref href="topics/impala_max_scan_range_length.xml"/>
+        <topicref href="topics/impala_max_spilled_result_spooling_mem.xml"/>
+        <topicref href="topics/impala_mem_limit.xml"/>
+        <topicref rev="2.10.0 IMPALA-3200" 
href="topics/impala_min_spillable_buffer_size.xml"/>
+        <topicref rev="2.8.0" href="topics/impala_mt_dop.xml"/>
+        <topicref href="topics/impala_num_nodes.xml"/>
+        <topicref rev="3.2" href="topics/impala_num_rows_produced_limit.xml"/>
+        <topicref href="topics/impala_num_scanner_threads.xml"/>
+        <topicref rev="2.5.0" 
href="topics/impala_optimize_partition_key_scans.xml"/>
+        <topicref href="topics/impala_parquet_compression_codec.xml"/>
+        <topicref rev="2.6.0 IMPALA-2069" 
href="topics/impala_parquet_annotate_strings_utf8.xml"/>
+        <topicref rev="2.9.0 IMPALA-4725" 
href="topics/impala_parquet_array_resolution.xml"/>
+        <topicref href="topics/impala_parquet_dictionary_filtering.xml"/>
+        <topicref rev="2.6.0 IMPALA-2835" 
href="topics/impala_parquet_fallback_schema_resolution.xml"/>
+        <topicref href="topics/impala_parquet_file_size.xml"/>
+        <topicref href="topics/impala_parquet_object_store_split_size.xml"/>
+        <topicref href="topics/impala_parquet_page_row_count_limit.xml"/>
+        <topicref href="topics/impala_parquet_read_statistics.xml"/>
+        <topicref href="topics/impala_parquet_read_page_index.xml"/>
+        <topicref href="topics/impala_parquet_write_page_index.xml"/>
+        <topicref rev="2.6.0 IMPALA-3286" 
href="topics/impala_prefetch_mode.xml"/>
+        <topicref href="topics/impala_query_timeout_s.xml"/>
+        <topicref href="topics/impala_refresh_updated_hms.xml"/>
+        <topicref rev="2.7.0" href="topics/impala_replica_preference.xml"/>
+        <topicref href="topics/impala_request_pool.xml"/>
+        <topicref href="topics/impala_resource_trace_ratio.xml"/>
+        <topicref rev="4.0.0" href="topics/impala_retry_failed_queries.xml"/>
+        <topicref rev="2.5.0" 
href="topics/impala_runtime_bloom_filter_size.xml"/>
+        <topicref rev="2.6.0" 
href="topics/impala_runtime_filter_max_size.xml"/>
+        <topicref rev="2.6.0" 
href="topics/impala_runtime_filter_min_size.xml"/>
+        <topicref rev="2.5.0" href="topics/impala_runtime_filter_mode.xml"/>
+        <topicref rev="2.5.0" 
href="topics/impala_runtime_filter_wait_time_ms.xml"/>
+        <topicref rev="2.6.0" href="topics/impala_s3_skip_insert_staging.xml"/>
+        <topicref rev="3.1" href="topics/impala_scan_bytes_limit.xml"/>
+        <topicref rev="2.5.0" 
href="topics/impala_schedule_random_replica.xml"/>
+        <topicref rev="2.8.0 IMPALA-3671" 
href="topics/impala_scratch_limit.xml"/>
+        <!-- This option is for internal use only and might go away without 
ever being documented. -->
+        <!-- <topicref href="topics/impala_seq_compression_mode.xml"/> -->
+        <topicref href="topics/impala_shuffle_distinct_exprs.xml"/>
+        <topicref href="topics/impala_spool_query_results.xml"/>
+        <topicref href="topics/impala_support_start_over.xml"/>
+        <topicref href="topics/impala_sync_ddl.xml"/>
+        <topicref href="topics/impala_thread_reservation_aggregate_limit.xml"/>
+        <topicref href="topics/impala_thread_reservation_limit.xml"/>
+        <topicref href="topics/impala_timezone.xml"/>
+        <topicref href="topics/impala_topn_bytes_limit.xml"/>
+        <topicref href="topics/impala_utf8_mode.xml"/>
+        <topicref href="topics/impala_expand_complex_types.xml"/>
       </topicref>
       <topicref href="topics/impala_show.xml"/>
       <topicref href="topics/impala_shutdown.xml"/>
diff --git a/docs/impala_keydefs.ditamap b/docs/impala_keydefs.ditamap
index 601d8208a..ca1582410 100644
--- a/docs/impala_keydefs.ditamap
+++ b/docs/impala_keydefs.ditamap
@@ -10792,7 +10792,6 @@ under the License.
   <keydef href="topics/impala_distinct.xml" keys="distinct"/>
   <keydef href="topics/impala_hints.xml" keys="hints"/>
   <keydef href="topics/impala_set.xml" keys="set"/>
-  <keydef href="topics/impala_query_options.xml" keys="query_options"/>
   <keydef href="topics/impala_abort_on_error.xml" keys="abort_on_error"/>
   <keydef href="topics/impala_allow_unsupported_formats.xml" 
keys="allow_unsupported_formats"/>
   <keydef href="topics/impala_appx_count_distinct.xml" 
keys="appx_count_distinct"/>
diff --git a/docs/topics/impala_abort_on_error.xml 
b/docs/topics/impala_abort_on_error.xml
index 81b0583aa..67966bf54 100644
--- a/docs/topics/impala_abort_on_error.xml
+++ b/docs/topics/impala_abort_on_error.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="abort_on_error">
 
   <title>ABORT_ON_ERROR Query Option</title>
-  <titlealts audience="PDF"><navtitle>ABORT_ON_ERROR</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>ABORT ON ERROR</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_allow_erasure_coded_files.xml 
b/docs/topics/impala_allow_erasure_coded_files.xml
index 30228e924..0698bf05c 100644
--- a/docs/topics/impala_allow_erasure_coded_files.xml
+++ b/docs/topics/impala_allow_erasure_coded_files.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>ALLOW_ERASURE_CODED_FILES</navtitle>
+    <navtitle>ALLOW ERASURE CODED FILES</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_allow_unsupported_formats.xml 
b/docs/topics/impala_allow_unsupported_formats.xml
index d140c1c57..e015e1668 100644
--- a/docs/topics/impala_allow_unsupported_formats.xml
+++ b/docs/topics/impala_allow_unsupported_formats.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="allow_unsupported_formats">
 
   <title>ALLOW_UNSUPPORTED_FORMATS Query Option</title>
-  <titlealts 
audience="PDF"><navtitle>ALLOW_UNSUPPORTED_FORMATS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>ALLOW UNSUPPORTED 
FORMATS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_appx_count_distinct.xml 
b/docs/topics/impala_appx_count_distinct.xml
index 28544e028..58a8f43e1 100644
--- a/docs/topics/impala_appx_count_distinct.xml
+++ b/docs/topics/impala_appx_count_distinct.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>APPX_COUNT_DISTINCT</navtitle>
+    <navtitle>APPX COUNT DISTINCT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_batch_size.xml 
b/docs/topics/impala_batch_size.xml
index d6cb6f072..9a72806c1 100644
--- a/docs/topics/impala_batch_size.xml
+++ b/docs/topics/impala_batch_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="batch_size">
 
   <title>BATCH_SIZE Query Option</title>
-  <titlealts audience="PDF"><navtitle>BATCH_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>BATCH SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_broadcast_bytes_limit.xml 
b/docs/topics/impala_broadcast_bytes_limit.xml
index 283cd9c10..11cde02b8 100644
--- a/docs/topics/impala_broadcast_bytes_limit.xml
+++ b/docs/topics/impala_broadcast_bytes_limit.xml
@@ -24,7 +24,7 @@ under the License.
 
     <titlealts audience="PDF">
 
-        <navtitle>BROADCAST_BYTES_LIMIT</navtitle>
+        <navtitle>BROADCAST BYTES LIMIT</navtitle>
 
     </titlealts>
 
diff --git a/docs/topics/impala_buffer_pool_limit.xml 
b/docs/topics/impala_buffer_pool_limit.xml
index 7fba9b377..8b9141c53 100644
--- a/docs/topics/impala_buffer_pool_limit.xml
+++ b/docs/topics/impala_buffer_pool_limit.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="buffer_pool_limit" rev="2.10.0 IMPALA-3200">
 
   <title>BUFFER_POOL_LIMIT Query Option</title>
-  <titlealts audience="PDF"><navtitle>BUFFER_POOL_LIMIT</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>BUFFER POOL LIMIT</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_compression_codec.xml 
b/docs/topics/impala_compression_codec.xml
index 1863affc4..50282ad20 100644
--- a/docs/topics/impala_compression_codec.xml
+++ b/docs/topics/impala_compression_codec.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.0.0" id="compression_codec">
 
   <title>COMPRESSION_CODEC Query Option (<keyword keyref="impala20"/> or 
higher only)</title>
-  <titlealts audience="PDF"><navtitle>COMPRESSION_CODEC</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>COMPRESSION CODEC</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_compute_stats_min_sample_size.xml 
b/docs/topics/impala_compute_stats_min_sample_size.xml
index bf2905862..771feab8f 100644
--- a/docs/topics/impala_compute_stats_min_sample_size.xml
+++ b/docs/topics/impala_compute_stats_min_sample_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="compute_stats_sample_min_sample_size" rev="2.12.0">
   <title>COMPUTE_STATS_MIN_SAMPLE_SIZE Query Option</title>
   <titlealts audience="PDF">
-    <navtitle>COMPUTE_STATS_MIN_SAMPLE_SIZE</navtitle>
+    <navtitle>COMPUTE STATS MIN SAMPLE SIZE</navtitle>
   </titlealts>
   <prolog>
     <metadata>
diff --git a/docs/topics/impala_config_options.xml 
b/docs/topics/impala_config_options.xml
index 7ef661204..b4e455f1c 100644
--- a/docs/topics/impala_config_options.xml
+++ b/docs/topics/impala_config_options.xml
@@ -243,7 +243,7 @@ Starting Impala Catalog Server:                            
[  OK  ]</codeblock>
             <cmdname>impalad</cmdname> instance. The option values you specify 
here override the
             default values for
             <xref
-              href="impala_query_options.xml#query_options">Impala query
+              href="impala_set.xml">Impala query
             options</xref>, as shown by the <codeph>SET</codeph> statement in
             <cmdname>impala-shell</cmdname>.
           </p>
diff --git a/docs/topics/impala_debug_action.xml 
b/docs/topics/impala_debug_action.xml
index 4297b11e3..2b03f75c6 100644
--- a/docs/topics/impala_debug_action.xml
+++ b/docs/topics/impala_debug_action.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="debug_action">
 
   <title>DEBUG_ACTION Query Option</title>
-  <titlealts audience="PDF"><navtitle>DEBUG_ACTION</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DEBUG ACTION</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_decimal_v2.xml 
b/docs/topics/impala_decimal_v2.xml
index e2a66e18f..fe6308c2e 100644
--- a/docs/topics/impala_decimal_v2.xml
+++ b/docs/topics/impala_decimal_v2.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="decimal_v2" rev="2.9.0">
 
   <title>DECIMAL_V2 Query Option</title>
-  <titlealts audience="PDF"><navtitle>DECIMAL_V2</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DECIMAL V2</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_default_file_format.xml 
b/docs/topics/impala_default_file_format.xml
index 5a2985c66..7d41cc6ae 100644
--- a/docs/topics/impala_default_file_format.xml
+++ b/docs/topics/impala_default_file_format.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>DEFAULT_FILE_FORMAT</navtitle>
+    <navtitle>DEFAULT FILE FORMAT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_default_hints_insert_statement.xml 
b/docs/topics/impala_default_hints_insert_statement.xml
index ef2584f2b..7db09944d 100644
--- a/docs/topics/impala_default_hints_insert_statement.xml
+++ b/docs/topics/impala_default_hints_insert_statement.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>DEFAULT_HINTS_INSERT_STATEMENT</navtitle>
+    <navtitle>DEFAULT HINTS INSERT STATEMENT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_default_join_distribution_mode.xml 
b/docs/topics/impala_default_join_distribution_mode.xml
index 1b17d50b7..a2968db58 100644
--- a/docs/topics/impala_default_join_distribution_mode.xml
+++ b/docs/topics/impala_default_join_distribution_mode.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="default_join_distribution_mode" rev="2.9.0 IMPALA-5381 
IMPALA-5583">
 
   <title>DEFAULT_JOIN_DISTRIBUTION_MODE Query Option</title>
-  <titlealts 
audience="PDF"><navtitle>DEFAULT_JOIN_DISTRIBUTION_MODE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DEFAULT JOIN DISTRIBUTION 
MODE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_default_spillable_buffer_size.xml 
b/docs/topics/impala_default_spillable_buffer_size.xml
index b2bb46dde..f41c0ce2c 100644
--- a/docs/topics/impala_default_spillable_buffer_size.xml
+++ b/docs/topics/impala_default_spillable_buffer_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="default_spillable_buffer_size" rev="2.10.0 IMPALA-3200">
 
   <title>DEFAULT_SPILLABLE_BUFFER_SIZE Query Option</title>
-  <titlealts 
audience="PDF"><navtitle>DEFAULT_SPILLABLE_BUFFER_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DEFAULT SPILLABLE BUFFER 
SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_default_transactional_type.xml 
b/docs/topics/impala_default_transactional_type.xml
index becd447ae..4c4617245 100644
--- a/docs/topics/impala_default_transactional_type.xml
+++ b/docs/topics/impala_default_transactional_type.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>DEFAULT_TRANSACTIONAL_TYPE</navtitle>
+    <navtitle>DEFAULT TRANSACTIONAL TYPE</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_delete_stats_in_truncate.xml 
b/docs/topics/impala_delete_stats_in_truncate.xml
index 8b3f65eb3..a2f51570a 100644
--- a/docs/topics/impala_delete_stats_in_truncate.xml
+++ b/docs/topics/impala_delete_stats_in_truncate.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="delete_stats_in_truncate">
 
  <title>DELETE_STATS_IN_TRUNCATE Query Option</title>
- <titlealts 
audience="PDF"><navtitle>DELETE_STATS_IN_TRUNCATE</navtitle></titlealts>
+ <titlealts audience="PDF"><navtitle>DELETE STATS IN 
TRUNCATE</navtitle></titlealts>
  <prolog>
   <metadata>
    <data name="Category" value="Impala"/>
@@ -63,4 +63,3 @@ under the License.
   
  </conbody>
 </concept>
-
diff --git a/docs/topics/impala_disable_codegen.xml 
b/docs/topics/impala_disable_codegen.xml
index 7410b6c35..1ea6442c9 100644
--- a/docs/topics/impala_disable_codegen.xml
+++ b/docs/topics/impala_disable_codegen.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>DISABLE_CODEGEN</navtitle>
+    <navtitle>DISABLE CODEGEN</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_disable_codegen_rows_threshold.xml 
b/docs/topics/impala_disable_codegen_rows_threshold.xml
index 438db3d9b..e3f82b613 100644
--- a/docs/topics/impala_disable_codegen_rows_threshold.xml
+++ b/docs/topics/impala_disable_codegen_rows_threshold.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.10.0" id="disable_codegen_rows_threshold">
 
   <title>DISABLE_CODEGEN_ROWS_THRESHOLD Query Option (<keyword 
keyref="impala210_full"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>DISABLE_CODEGEN_ROWS_THRESHOLD</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DISABLE CODEGEN ROWS 
THRESHOLD</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_disable_hbase_num_rows_estimate.xml 
b/docs/topics/impala_disable_hbase_num_rows_estimate.xml
index 998d5515a..b7e1bcfb5 100644
--- a/docs/topics/impala_disable_hbase_num_rows_estimate.xml
+++ b/docs/topics/impala_disable_hbase_num_rows_estimate.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>DISABLE_HBASE_NUM_ROWS_ESTIMATE</navtitle>
+    <navtitle>DISABLE HBASE NUM ROWS ESTIMATE</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_disable_row_runtime_filtering.xml 
b/docs/topics/impala_disable_row_runtime_filtering.xml
index 8bdbcda1f..c6bbdb432 100644
--- a/docs/topics/impala_disable_row_runtime_filtering.xml
+++ b/docs/topics/impala_disable_row_runtime_filtering.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="disable_row_runtime_filtering" rev="2.5.0">
 
   <title>DISABLE_ROW_RUNTIME_FILTERING Query Option (<keyword 
keyref="impala25"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>DISABLE_ROW_RUNTIME_FILTERING</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DISABLE ROW RUNTIME 
FILTERING</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_disable_streaming_preaggregations.xml 
b/docs/topics/impala_disable_streaming_preaggregations.xml
index bde6ec76b..edff085a6 100644
--- a/docs/topics/impala_disable_streaming_preaggregations.xml
+++ b/docs/topics/impala_disable_streaming_preaggregations.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="disable_streaming_preaggregations" rev="2.5.0 IMPALA-1305">
 
   <title>DISABLE_STREAMING_PREAGGREGATIONS Query Option (<keyword 
keyref="impala25"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>DISABLE_STREAMING_PREAGGREGATIONS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DISABLE STREAMING 
PREAGGREGATIONS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_disable_unsafe_spills.xml 
b/docs/topics/impala_disable_unsafe_spills.xml
index 0a61966be..d18d34e49 100644
--- a/docs/topics/impala_disable_unsafe_spills.xml
+++ b/docs/topics/impala_disable_unsafe_spills.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.0.0" id="disable_unsafe_spills">
 
   <title>DISABLE_UNSAFE_SPILLS Query Option (<keyword keyref="impala20"/> or 
higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>DISABLE_UNSAFE_SPILLS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>DISABLE UNSAFE 
SPILLS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_enable_expr_rewrites.xml 
b/docs/topics/impala_enable_expr_rewrites.xml
index 1c3f886e3..43590bbd0 100644
--- a/docs/topics/impala_enable_expr_rewrites.xml
+++ b/docs/topics/impala_enable_expr_rewrites.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>ENABLE_EXPR_REWRITES</navtitle>
+    <navtitle>ENABLE EXPR REWRITES</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_exec_single_node_rows_threshold.xml 
b/docs/topics/impala_exec_single_node_rows_threshold.xml
index 62f7988c0..52ef27b23 100644
--- a/docs/topics/impala_exec_single_node_rows_threshold.xml
+++ b/docs/topics/impala_exec_single_node_rows_threshold.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.0.0" id="exec_single_node_rows_threshold">
 
   <title>EXEC_SINGLE_NODE_ROWS_THRESHOLD Query Option (<keyword 
keyref="impala21"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>EXEC_SINGLE_NODE_ROWS_THRESHOLD</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>EXEC SINGLE NODE ROWS 
THRESHOLD</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_exec_time_limit_s.xml 
b/docs/topics/impala_exec_time_limit_s.xml
index a0320b8dd..068302e90 100644
--- a/docs/topics/impala_exec_time_limit_s.xml
+++ b/docs/topics/impala_exec_time_limit_s.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>EXEC_TIME_LIMIT_S</navtitle>
+    <navtitle>EXEC TIME LIMIT S</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_expand_complex_types.xml 
b/docs/topics/impala_expand_complex_types.xml
index 1fa39eca9..f5de8257d 100644
--- a/docs/topics/impala_expand_complex_types.xml
+++ b/docs/topics/impala_expand_complex_types.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="expand_complex_types">
 
  <title>EXPAND_COMPLEX_TYPES Query Option</title>
- <titlealts 
audience="PDF"><navtitle>EXPAND_COMPLEX_TYPES</navtitle></titlealts>
+ <titlealts audience="PDF"><navtitle>EXPAND COMPLEX 
TYPES</navtitle></titlealts>
  <prolog>
   <metadata>
    <data name="Category" value="Impala"/>
@@ -58,4 +58,3 @@ under the License.
   </p>
  </conbody>
 </concept>
-
diff --git a/docs/topics/impala_explain_level.xml 
b/docs/topics/impala_explain_level.xml
index e44677cf2..57318d649 100644
--- a/docs/topics/impala_explain_level.xml
+++ b/docs/topics/impala_explain_level.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="1.2" id="explain_level">
 
   <title>EXPLAIN_LEVEL Query Option</title>
-  <titlealts audience="PDF"><navtitle>EXPLAIN_LEVEL</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>EXPLAIN LEVEL</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_fetch_rows_timeout_ms.xml 
b/docs/topics/impala_fetch_rows_timeout_ms.xml
index 0da8e5daa..aee724c4b 100644
--- a/docs/topics/impala_fetch_rows_timeout_ms.xml
+++ b/docs/topics/impala_fetch_rows_timeout_ms.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="FETCH_ROWS_TIMEOUT_MS">
   <title>FETCH_ROWS_TIMEOUT_MS Query Option</title>
   <titlealts audience="PDF">
-    <navtitle>FETCH_ROWS_TIMEOUT_MS</navtitle>
+    <navtitle>FETCH ROWS TIMEOUT MS</navtitle>
   </titlealts>
   <prolog>
     <metadata>
diff --git a/docs/topics/impala_hbase_cache_blocks.xml 
b/docs/topics/impala_hbase_cache_blocks.xml
index 5bc3e16f1..de91e59af 100644
--- a/docs/topics/impala_hbase_cache_blocks.xml
+++ b/docs/topics/impala_hbase_cache_blocks.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="hbase_cache_blocks">
 
   <title>HBASE_CACHE_BLOCKS Query Option</title>
-  <titlealts audience="PDF"><navtitle>HBASE_CACHE_BLOCKS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>HBASE CACHE BLOCKS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_hbase_caching.xml 
b/docs/topics/impala_hbase_caching.xml
index db0a4119c..875896b53 100644
--- a/docs/topics/impala_hbase_caching.xml
+++ b/docs/topics/impala_hbase_caching.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="hbase_caching">
 
   <title>HBASE_CACHING Query Option</title>
-  <titlealts audience="PDF"><navtitle>HBASE_CACHING</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>HBASE CACHING</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_idle_session_timeout.xml 
b/docs/topics/impala_idle_session_timeout.xml
index ba656ceac..d55a85881 100644
--- a/docs/topics/impala_idle_session_timeout.xml
+++ b/docs/topics/impala_idle_session_timeout.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>IDLE_SESSION_TIMEOUT</navtitle>
+    <navtitle>IDLE SESSION TIMEOUT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_join_rows_produced_limit.xml 
b/docs/topics/impala_join_rows_produced_limit.xml
index 5b0f647ce..f97d259ef 100644
--- a/docs/topics/impala_join_rows_produced_limit.xml
+++ b/docs/topics/impala_join_rows_produced_limit.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>JOIN_ROWS_PRODUCED_LIMIT</navtitle>
+    <navtitle>JOIN ROWS PRODUCED LIMIT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_kudu_read_mode.xml 
b/docs/topics/impala_kudu_read_mode.xml
index 4f6e2c86e..6372a768c 100644
--- a/docs/topics/impala_kudu_read_mode.xml
+++ b/docs/topics/impala_kudu_read_mode.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>KUDU_READ_MODE</navtitle>
+    <navtitle>KUDU READ MODE</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_live_progress.xml 
b/docs/topics/impala_live_progress.xml
index bba0980d9..4885f5a3b 100644
--- a/docs/topics/impala_live_progress.xml
+++ b/docs/topics/impala_live_progress.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.3.0" id="live_progress">
 
   <title>LIVE_PROGRESS Query Option (<keyword keyref="impala23"/> or higher 
only)</title>
-  <titlealts audience="PDF"><navtitle>LIVE_PROGRESS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>LIVE PROGRESS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_live_summary.xml 
b/docs/topics/impala_live_summary.xml
index 36e3449d1..4e9164212 100644
--- a/docs/topics/impala_live_summary.xml
+++ b/docs/topics/impala_live_summary.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.3.0" id="live_summary">
 
   <title>LIVE_SUMMARY Query Option (<keyword keyref="impala23"/> or higher 
only)</title>
-  <titlealts audience="PDF"><navtitle>LIVE_SUMMARY</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>LIVE SUMMARY</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_max_errors.xml 
b/docs/topics/impala_max_errors.xml
index 63bae5ba4..ba4fdf8e7 100644
--- a/docs/topics/impala_max_errors.xml
+++ b/docs/topics/impala_max_errors.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="max_errors">
 
   <title>MAX_ERRORS Query Option</title>
-  <titlealts audience="PDF"><navtitle>MAX_ERRORS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>MAX ERRORS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_max_mem_estimate_for_admission.xml 
b/docs/topics/impala_max_mem_estimate_for_admission.xml
index ee5136d87..a15e61e33 100644
--- a/docs/topics/impala_max_mem_estimate_for_admission.xml
+++ b/docs/topics/impala_max_mem_estimate_for_admission.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>MAX_MEM_ESTIMATE_FOR_ADMISSION</navtitle>
+    <navtitle>MAX MEM ESTIMATE FOR ADMISSION</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_max_num_runtime_filters.xml 
b/docs/topics/impala_max_num_runtime_filters.xml
index 0fa52e051..ccf2d605f 100644
--- a/docs/topics/impala_max_num_runtime_filters.xml
+++ b/docs/topics/impala_max_num_runtime_filters.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="max_num_runtime_filters" rev="2.5.0">
 
   <title>MAX_NUM_RUNTIME_FILTERS Query Option (<keyword keyref="impala25"/> or 
higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>MAX_NUM_RUNTIME_FILTERS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>MAX NUM RUNTIME 
FILTERS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_max_result_spooling_mem.xml 
b/docs/topics/impala_max_result_spooling_mem.xml
index 4479047ea..3a37adcea 100644
--- a/docs/topics/impala_max_result_spooling_mem.xml
+++ b/docs/topics/impala_max_result_spooling_mem.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="MAX_RESULT_SPOOLING_MEM" rev="2.10.0 IMPALA-3200">
   <title>MAX_RESULT_SPOOLING_MEM Query Option</title>
   <titlealts audience="PDF">
-    <navtitle>MAX_RESULT_SPOOLING_MEM</navtitle>
+    <navtitle>MAX RESULT SPOOLING MEM</navtitle>
   </titlealts>
   <prolog>
     <metadata>
diff --git a/docs/topics/impala_max_row_size.xml 
b/docs/topics/impala_max_row_size.xml
index f1da99bf1..a1ff3ee29 100644
--- a/docs/topics/impala_max_row_size.xml
+++ b/docs/topics/impala_max_row_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="max_row_size" rev="2.10.0 IMPALA-3200">
 
   <title>MAX_ROW_SIZE Query Option</title>
-  <titlealts audience="PDF"><navtitle>MAX_ROW_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>MAX ROW SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_max_scan_range_length.xml 
b/docs/topics/impala_max_scan_range_length.xml
index cc5978b2c..b6cabc669 100644
--- a/docs/topics/impala_max_scan_range_length.xml
+++ b/docs/topics/impala_max_scan_range_length.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="max_scan_range_length">
 
   <title>MAX_SCAN_RANGE_LENGTH Query Option</title>
-  <titlealts 
audience="PDF"><navtitle>MAX_SCAN_RANGE_LENGTH</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>MAX SCAN RANGE 
LENGTH</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_max_spilled_result_spooling_mem.xml 
b/docs/topics/impala_max_spilled_result_spooling_mem.xml
index 55fc36a2a..1a26949e4 100644
--- a/docs/topics/impala_max_spilled_result_spooling_mem.xml
+++ b/docs/topics/impala_max_spilled_result_spooling_mem.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="MAX_SPILLED_RESULT_SPOOLING_MEM" rev="2.10.0 IMPALA-3200">
   <title>MAX_SPILLED_RESULT_SPOOLING_MEM Query Option</title>
   <titlealts audience="PDF">
-    <navtitle>MAX_SPILLED_RESULT_SPOOLING_MEM</navtitle>
+    <navtitle>MAX SPILLED RESULT SPOOLING MEM</navtitle>
   </titlealts>
   <prolog>
     <metadata>
diff --git a/docs/topics/impala_mem_limit.xml b/docs/topics/impala_mem_limit.xml
index a9a5ca1ba..d3a5db5fb 100644
--- a/docs/topics/impala_mem_limit.xml
+++ b/docs/topics/impala_mem_limit.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="mem_limit">
  <title>MEM_LIMIT Query Option</title>
  <titlealts audience="PDF">
-  <navtitle>MEM_LIMIT</navtitle>
+  <navtitle>MEM LIMIT</navtitle>
  </titlealts>
  <prolog>
   <metadata>
diff --git a/docs/topics/impala_min_spillable_buffer_size.xml 
b/docs/topics/impala_min_spillable_buffer_size.xml
index b5dec6434..e2d1c2b7c 100644
--- a/docs/topics/impala_min_spillable_buffer_size.xml
+++ b/docs/topics/impala_min_spillable_buffer_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="min_spillable_buffer_size" rev="2.10.0 IMPALA-3200">
 
   <title>MIN_SPILLABLE_BUFFER_SIZE Query Option</title>
-  <titlealts 
audience="PDF"><navtitle>MIN_SPILLABLE_BUFFER_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>MIN SPILLABLE BUFFER 
SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_mt_dop.xml b/docs/topics/impala_mt_dop.xml
index 5ca2be672..28d1db608 100644
--- a/docs/topics/impala_mt_dop.xml
+++ b/docs/topics/impala_mt_dop.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="mt_dop">
 
   <title>MT_DOP Query Option</title>
-  <titlealts audience="PDF"><navtitle>MT_DOP</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>MT DOP</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_num_nodes.xml b/docs/topics/impala_num_nodes.xml
index 0bbf782c8..2885c24db 100644
--- a/docs/topics/impala_num_nodes.xml
+++ b/docs/topics/impala_num_nodes.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="num_nodes">
 
   <title>NUM_NODES Query Option</title>
-  <titlealts audience="PDF"><navtitle>NUM_NODES</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>NUM NODES</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_num_rows_produced_limit.xml 
b/docs/topics/impala_num_rows_produced_limit.xml
index 8891412b1..a2c9b4689 100644
--- a/docs/topics/impala_num_rows_produced_limit.xml
+++ b/docs/topics/impala_num_rows_produced_limit.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>NUM_ROWS_PRODUCED_LIMIT</navtitle>
+    <navtitle>NUM ROWS PRODUCED LIMIT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_num_scanner_threads.xml 
b/docs/topics/impala_num_scanner_threads.xml
index dd111da8f..2330d41b6 100644
--- a/docs/topics/impala_num_scanner_threads.xml
+++ b/docs/topics/impala_num_scanner_threads.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="num_scanner_threads">
 
   <title>NUM_SCANNER_THREADS Query Option</title>
-  <titlealts 
audience="PDF"><navtitle>NUM_SCANNER_THREADS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>NUM SCANNER 
THREADS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_optimize_partition_key_scans.xml 
b/docs/topics/impala_optimize_partition_key_scans.xml
index a70f3b247..287a55c2c 100644
--- a/docs/topics/impala_optimize_partition_key_scans.xml
+++ b/docs/topics/impala_optimize_partition_key_scans.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.5.0 IMPALA-2499" id="optimize_partition_key_scans">
 
   <title>OPTIMIZE_PARTITION_KEY_SCANS Query Option (<keyword 
keyref="impala25"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>OPTIMIZE_PARTITION_KEY_SCANS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>OPTIMIZE PARTITION KEY 
SCANS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_parquet_annotate_strings_utf8.xml 
b/docs/topics/impala_parquet_annotate_strings_utf8.xml
index 9437fed50..0d4e09c63 100644
--- a/docs/topics/impala_parquet_annotate_strings_utf8.xml
+++ b/docs/topics/impala_parquet_annotate_strings_utf8.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="parquet_annotate_strings_utf8" rev="2.6.0 IMPALA-2069">
 
   <title>PARQUET_ANNOTATE_STRINGS_UTF8 Query Option (<keyword 
keyref="impala26"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>PARQUET_ANNOTATE_STRINGS_UTF8</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>PARQUET ANNOTATE STRINGS 
UTF8</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_parquet_array_resolution.xml 
b/docs/topics/impala_parquet_array_resolution.xml
index 769487763..724492098 100644
--- a/docs/topics/impala_parquet_array_resolution.xml
+++ b/docs/topics/impala_parquet_array_resolution.xml
@@ -26,7 +26,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>PARQUET_ARRAY_RESOLUTION</navtitle>
+    <navtitle>PARQUET ARRAY RESOLUTION</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_parquet_compression_codec.xml 
b/docs/topics/impala_parquet_compression_codec.xml
index d1f146c0c..74f28b30c 100644
--- a/docs/topics/impala_parquet_compression_codec.xml
+++ b/docs/topics/impala_parquet_compression_codec.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="parquet_compression_codec">
 
   <title>PARQUET_COMPRESSION_CODEC Query Option</title>
-  <titlealts 
audience="PDF"><navtitle>PARQUET_COMPRESSION_CODEC</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>PARQUET COMPRESSION 
CODEC</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_parquet_dictionary_filtering.xml 
b/docs/topics/impala_parquet_dictionary_filtering.xml
index 2d68b4da1..47f53e089 100644
--- a/docs/topics/impala_parquet_dictionary_filtering.xml
+++ b/docs/topics/impala_parquet_dictionary_filtering.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>PARQUET_DICTIONARY_FILTERING</navtitle>
+    <navtitle>PARQUET DICTIONARY FILTERING</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_parquet_fallback_schema_resolution.xml 
b/docs/topics/impala_parquet_fallback_schema_resolution.xml
index b66116640..1d9b781e3 100644
--- a/docs/topics/impala_parquet_fallback_schema_resolution.xml
+++ b/docs/topics/impala_parquet_fallback_schema_resolution.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="parquet_fallback_schema_resolution" rev="2.6.0 IMPALA-2835">
 
   <title>PARQUET_FALLBACK_SCHEMA_RESOLUTION Query Option (<keyword 
keyref="impala26"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>PARQUET_FALLBACK_SCHEMA_RESOLUTION</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>PARQUET FALLBACK SCHEMA 
RESOLUTION</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_parquet_file_size.xml 
b/docs/topics/impala_parquet_file_size.xml
index 0a824e37c..cf4843438 100644
--- a/docs/topics/impala_parquet_file_size.xml
+++ b/docs/topics/impala_parquet_file_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="parquet_block_size" id="parquet_file_size">
 
   <title>PARQUET_FILE_SIZE Query Option</title>
-  <titlealts audience="PDF"><navtitle>PARQUET_FILE_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>PARQUET FILE SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_parquet_object_store_split_size.xml 
b/docs/topics/impala_parquet_object_store_split_size.xml
index b03310ceb..eb57016c0 100644
--- a/docs/topics/impala_parquet_object_store_split_size.xml
+++ b/docs/topics/impala_parquet_object_store_split_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="parquet_block_size" id="parquet_object_store_split_size">
   <title>PARQUET_OBJECT_STORE_SPLIT_SIZE Query Option</title>
   <titlealts audience="PDF">
-    <navtitle>PARQUET_OBJECT_STORE_SPLIT_SIZE</navtitle>
+    <navtitle>PARQUET OBJECT STORE SPLIT SIZE</navtitle>
   </titlealts>
   <prolog>
     <metadata>
diff --git a/docs/topics/impala_parquet_page_row_count_limit.xml 
b/docs/topics/impala_parquet_page_row_count_limit.xml
index d71f3486d..9f5b20d4a 100644
--- a/docs/topics/impala_parquet_page_row_count_limit.xml
+++ b/docs/topics/impala_parquet_page_row_count_limit.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>PARQUET_PAGE_ROW_COUNT_LIMIT</navtitle>
+    <navtitle>PARQUET PAGE ROW COUNT LIMIT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_parquet_read_page_index.xml 
b/docs/topics/impala_parquet_read_page_index.xml
index 149f00ff4..7c6849763 100644
--- a/docs/topics/impala_parquet_read_page_index.xml
+++ b/docs/topics/impala_parquet_read_page_index.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>PARQUET_READ_PAGE_INDEX</navtitle>
+    <navtitle>PARQUET READ PAGE INDEX</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_parquet_read_statistics.xml 
b/docs/topics/impala_parquet_read_statistics.xml
index 632d73a02..68d0fdfd5 100644
--- a/docs/topics/impala_parquet_read_statistics.xml
+++ b/docs/topics/impala_parquet_read_statistics.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>PARQUET_READ_STATISTICS</navtitle>
+    <navtitle>PARQUET READ STATISTICS</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_parquet_write_page_index.xml 
b/docs/topics/impala_parquet_write_page_index.xml
index 49d0ee4d7..2f3207127 100644
--- a/docs/topics/impala_parquet_write_page_index.xml
+++ b/docs/topics/impala_parquet_write_page_index.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>PARQUET_WRITE_PAGE_INDEX</navtitle>
+    <navtitle>PARQUET WRITE PAGE INDEX</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_prefetch_mode.xml 
b/docs/topics/impala_prefetch_mode.xml
index 71521f8c0..3a0521d77 100644
--- a/docs/topics/impala_prefetch_mode.xml
+++ b/docs/topics/impala_prefetch_mode.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="prefetch_mode" rev="2.6.0 IMPALA-3286">
 
   <title>PREFETCH_MODE Query Option (<keyword keyref="impala26"/> or higher 
only)</title>
-  <titlealts audience="PDF"><navtitle>PREFETCH_MODE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>PREFETCH MODE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_query_options.xml 
b/docs/topics/impala_query_options.xml
deleted file mode 100644
index 36127f414..000000000
--- a/docs/topics/impala_query_options.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
-<concept id="query_options">
-
-  <title>Query Options for the SET Statement</title>
-  <prolog>
-    <metadata>
-      <data name="Category" value="Impala Query Options"/>
-      <data name="Category" value="Impala"/>
-      <data name="Category" value="impala-shell"/>
-      <data name="Category" value="SQL"/>
-      <data name="Category" value="Querying"/>
-      <data name="Category" value="Configuring"/>
-      <data name="Category" value="Data Analysts"/>
-      <data name="Category" value="Developers"/>
-    </metadata>
-  </prolog>
-
-  <conbody>
-
-    <p>
-      You can specify the following options using the <codeph>SET</codeph> 
statement, and those settings affect all
-      queries issued from that session.
-    </p>
-
-    <p>
-      Some query options are useful in day-to-day operations for improving 
usability, performance, or flexibility.
-    </p>
-
-    <p>
-      Other query options control special-purpose aspects of Impala operation 
and are intended primarily for
-      advanced debugging or troubleshooting.
-    </p>
-
-    <p>
-      Options with Boolean parameters can be set to 1 or <codeph>true</codeph> 
to enable, or 0 or <codeph>false</codeph>
-      to turn off.
-    </p>
-
-    <note rev="2.0.0">
-      <p rev="2.0.0">
-        In Impala 2.0 and later, you can set query options directly through 
the JDBC and ODBC interfaces by using the
-        <codeph>SET</codeph> statement. Formerly, <codeph>SET</codeph> was 
only available as a command within the
-        <cmdname>impala-shell</cmdname> interpreter.
-      </p>
-      <p rev="2.11.0">
-        In <keyword keyref="impala211_full"/> and later, you can set query 
options for an <cmdname>impala-shell</cmdname> session
-        by specifying one or more command-line arguments of the form
-        
<codeph>--query_option=<varname>option</varname>=<varname>value</varname></codeph>.
-        See <xref keyref="shell_options"/> for details.
-      </p>
-    </note>
-
-<!-- This is the list including defaults from the pre-release 1.2 impala-shell:
-        ABORT_ON_DEFAULT_LIMIT_EXCEEDED: 0
-        ABORT_ON_ERROR: 0
-        ALLOW_UNSUPPORTED_FORMATS: 0
-        BATCH_SIZE: 0
-        DEBUG_ACTION:
-        DEFAULT_ORDER_BY_LIMIT: -1
-        DISABLE_CODEGEN: 0
-        HBASE_CACHE_BLOCKS: 0
-        HBASE_CACHING: 0
-        MAX_ERRORS: 0
-        MAX_IO_BUFFERS: 0
-        MAX_SCAN_RANGE_LENGTH: 0
-        MEM_LIMIT: 0
-        NUM_NODES: 0
-        NUM_SCANNER_THREADS: 0
-        PARQUET_COMPRESSION_CODEC: SNAPPY
-        PARQUET_FILE_SIZE: 0
-        SUPPORT_START_OVER: false
--->
-
-    <p outputclass="toc"/>
-
-    <p conref="../shared/impala_common.xml#common/related_info"/>
-
-    <p>
-      <xref href="impala_set.xml#set"/>
-    </p>
-  </conbody>
-</concept>
diff --git a/docs/topics/impala_query_timeout_s.xml 
b/docs/topics/impala_query_timeout_s.xml
index e41c0870f..ae2702436 100644
--- a/docs/topics/impala_query_timeout_s.xml
+++ b/docs/topics/impala_query_timeout_s.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="2.0.0" id="query_timeout_s">
 
   <title>QUERY_TIMEOUT_S Query Option (<keyword keyref="impala20"/> or higher 
only)</title>
-  <titlealts audience="PDF"><navtitle>QUERY_TIMEOUT_S</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>QUERY TIMEOUT S</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_refresh_updated_hms.xml 
b/docs/topics/impala_refresh_updated_hms.xml
index 779c7d282..870a5e631 100644
--- a/docs/topics/impala_refresh_updated_hms.xml
+++ b/docs/topics/impala_refresh_updated_hms.xml
@@ -24,7 +24,7 @@ under the License.
 
  <titlealts audience="PDF">
 
-  <navtitle>REFRESH_UPDATED_HMS_PARTITIONS</navtitle>
+  <navtitle>REFRESH UPDATED HMS PARTITIONS</navtitle>
 
  </titlealts>
 
diff --git a/docs/topics/impala_replica_preference.xml 
b/docs/topics/impala_replica_preference.xml
index 6c0d3abed..cb4f43f8c 100644
--- a/docs/topics/impala_replica_preference.xml
+++ b/docs/topics/impala_replica_preference.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>REPLICA_PREFERENCE</navtitle>
+    <navtitle>REPLICA PREFERENCE</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_request_pool.xml 
b/docs/topics/impala_request_pool.xml
index 625dc87d7..ab30115ab 100644
--- a/docs/topics/impala_request_pool.xml
+++ b/docs/topics/impala_request_pool.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="1.3.0" id="request_pool">
 
   <title>REQUEST_POOL Query Option</title>
-  <titlealts audience="PDF"><navtitle>REQUEST_POOL</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>REQUEST POOL</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_resource_trace_ratio.xml 
b/docs/topics/impala_resource_trace_ratio.xml
index eb054a825..5dcca2316 100644
--- a/docs/topics/impala_resource_trace_ratio.xml
+++ b/docs/topics/impala_resource_trace_ratio.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>RESOURCE_TRACE_RATIO</navtitle>
+    <navtitle>RESOURCE TRACE RATIO</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_retry_failed_queries.xml 
b/docs/topics/impala_retry_failed_queries.xml
index 09bb7802a..52a9336b3 100644
--- a/docs/topics/impala_retry_failed_queries.xml
+++ b/docs/topics/impala_retry_failed_queries.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="RETRY_FAILED_QUERIES" rev="2.10.0 IMPALA-3200">
   <title>RETRY_FAILED_QUERIES Query Option</title>
   <titlealts audience="PDF">
-    <navtitle>RETRY_FAILED_QUERIES</navtitle>
+    <navtitle>RETRY FAILED QUERIES</navtitle>
   </titlealts>
   <prolog>
     <metadata>
diff --git a/docs/topics/impala_runtime_bloom_filter_size.xml 
b/docs/topics/impala_runtime_bloom_filter_size.xml
index 96f0ca52f..b16c698fe 100644
--- a/docs/topics/impala_runtime_bloom_filter_size.xml
+++ b/docs/topics/impala_runtime_bloom_filter_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="runtime_bloom_filter_size" rev="2.5.0">
 
   <title>RUNTIME_BLOOM_FILTER_SIZE Query Option (<keyword keyref="impala25"/> 
or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>RUNTIME_BLOOM_FILTER_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>RUNTIME BLOOM FILTER 
SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_runtime_filter_max_size.xml 
b/docs/topics/impala_runtime_filter_max_size.xml
index 2370d4488..5e17f4528 100644
--- a/docs/topics/impala_runtime_filter_max_size.xml
+++ b/docs/topics/impala_runtime_filter_max_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="runtime_filter_max_size" rev="2.6.0 IMPALA-3480">
 
   <title>RUNTIME_FILTER_MAX_SIZE Query Option (<keyword keyref="impala26"/> or 
higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>RUNTIME_FILTER_MAX_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>RUNTIME FILTER MAX 
SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_runtime_filter_min_size.xml 
b/docs/topics/impala_runtime_filter_min_size.xml
index 36a442660..2c5394ef6 100644
--- a/docs/topics/impala_runtime_filter_min_size.xml
+++ b/docs/topics/impala_runtime_filter_min_size.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="runtime_filter_min_size" rev="2.6.0 IMPALA-3480">
 
   <title>RUNTIME_FILTER_MIN_SIZE Query Option (<keyword keyref="impala26"/> or 
higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>RUNTIME_FILTER_MIN_SIZE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>RUNTIME FILTER MIN 
SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_runtime_filter_mode.xml 
b/docs/topics/impala_runtime_filter_mode.xml
index 56bbf2149..93d807dc5 100644
--- a/docs/topics/impala_runtime_filter_mode.xml
+++ b/docs/topics/impala_runtime_filter_mode.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="runtime_filter_mode" rev="2.5.0">
 
   <title>RUNTIME_FILTER_MODE Query Option (<keyword keyref="impala25"/> or 
higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>RUNTIME_FILTER_MODE</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>RUNTIME FILTER 
MODE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_runtime_filter_wait_time_ms.xml 
b/docs/topics/impala_runtime_filter_wait_time_ms.xml
index 51b480655..b81f70440 100644
--- a/docs/topics/impala_runtime_filter_wait_time_ms.xml
+++ b/docs/topics/impala_runtime_filter_wait_time_ms.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="runtime_filter_wait_time_ms" rev="2.5.0">
 
   <title>RUNTIME_FILTER_WAIT_TIME_MS Query Option (<keyword 
keyref="impala25"/> or higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>RUNTIME_FILTER_WAIT_TIME_MS</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>RUNTIME FILTER WAIT TIME 
MS</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_s3_skip_insert_staging.xml 
b/docs/topics/impala_s3_skip_insert_staging.xml
index 879fe8265..e61184c72 100644
--- a/docs/topics/impala_s3_skip_insert_staging.xml
+++ b/docs/topics/impala_s3_skip_insert_staging.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="s3_skip_insert_staging" rev="2.6.0 IMPALA-3452">
 
   <title>S3_SKIP_INSERT_STAGING Query Option (<keyword keyref="impala26"/> or 
higher only)</title>
-  <titlealts 
audience="PDF"><navtitle>S3_SKIP_INSERT_STAGING</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>S3 SKIP INSERT 
STAGING</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_scan_bytes_limit.xml 
b/docs/topics/impala_scan_bytes_limit.xml
index e67c971e8..58fc00e98 100644
--- a/docs/topics/impala_scan_bytes_limit.xml
+++ b/docs/topics/impala_scan_bytes_limit.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>SCAN_BYTES_LIMIT</navtitle>
+    <navtitle>SCAN BYTES LIMIT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_schedule_random_replica.xml 
b/docs/topics/impala_schedule_random_replica.xml
index f8c50feef..47e1e30b7 100644
--- a/docs/topics/impala_schedule_random_replica.xml
+++ b/docs/topics/impala_schedule_random_replica.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>SCHEDULE_RANDOM_REPLICA</navtitle>
+    <navtitle>SCHEDULE RANDOM REPLICA</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_scratch_limit.xml 
b/docs/topics/impala_scratch_limit.xml
index 79ec98751..5db866ed8 100644
--- a/docs/topics/impala_scratch_limit.xml
+++ b/docs/topics/impala_scratch_limit.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="IMPALA-3671" id="scratch_limit">
 
   <title>SCRATCH_LIMIT Query Option</title>
-  <titlealts audience="PDF"><navtitle>SCRATCH_LIMIT</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>SCRATCH LIMIT</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_seq_compression_mode.xml 
b/docs/topics/impala_seq_compression_mode.xml
index d1d6e9385..bcdf1165f 100644
--- a/docs/topics/impala_seq_compression_mode.xml
+++ b/docs/topics/impala_seq_compression_mode.xml
@@ -23,6 +23,7 @@ under the License.
 <!-- This option is for internal use only and might go away without ever being 
documented. It's hidden in the DITA map. -->
 
   <title>SEQ_COMPRESSION_MODE Query Option</title>
+  <titlealts audience="PDF"><navtitle>SEQ COMPRESSION 
MODE</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_set.xml b/docs/topics/impala_set.xml
index fe75cf2a6..4cd9998a6 100644
--- a/docs/topics/impala_set.xml
+++ b/docs/topics/impala_set.xml
@@ -87,9 +87,7 @@ SET <varname>query_option</varname>=""
     </p>
 
     <p>
-      Each query option has a specific allowed notation for its arguments. See
-      <xref href="impala_query_options.xml#query_options"/> for the details of 
each query
-      option.
+      Each query option has a specific allowed notation for its arguments.
     </p>
 
     <p conref="../shared/impala_common.xml#common/usage_notes_blurb"/>
@@ -159,11 +157,49 @@ SET <varname>query_option</varname>=""
 
     <p conref="../shared/impala_common.xml#common/permissions_blurb_no"/>
 
+    <p>
+      <b>Query Options for the SET Statement:</b>
+    </p>
+
+    <p>
+      You can specify the following options using the <codeph>SET</codeph> 
statement, and those settings affect all
+      queries issued from that session.
+    </p>
+
+    <p>
+      Some query options are useful in day-to-day operations for improving 
usability, performance, or flexibility.
+    </p>
+
+    <p>
+      Other query options control special-purpose aspects of Impala operation 
and are intended primarily for
+      advanced debugging or troubleshooting.
+    </p>
+
+    <p>
+      Options with Boolean parameters can be set to 1 or <codeph>true</codeph> 
to enable, or 0 or <codeph>false</codeph>
+      to turn off.
+    </p>
+
+    <note rev="2.0.0">
+      <p rev="2.0.0">
+        In Impala 2.0 and later, you can set query options directly through 
the JDBC and ODBC interfaces by using the
+        <codeph>SET</codeph> statement. Formerly, <codeph>SET</codeph> was 
only available as a command within the
+        <cmdname>impala-shell</cmdname> interpreter.
+      </p>
+      <p rev="2.11.0">
+        In <keyword keyref="impala211_full"/> and later, you can set query 
options for an <cmdname>impala-shell</cmdname> session
+        by specifying one or more command-line arguments of the form
+        
<codeph>--query_option=<varname>option</varname>=<varname>value</varname></codeph>.
+        See <xref keyref="shell_options"/> for details.
+      </p>
+    </note>
+
+    <p outputclass="toc"/>
+
     <p conref="../shared/impala_common.xml#common/related_info"/>
 
     <p>
-      See <xref href="impala_query_options.xml#query_options"/> for the query 
options you can
-      adjust using this statement.
+      <xref href="impala_set.xml#set"/>
     </p>
 
   </conbody>
diff --git a/docs/topics/impala_shell_commands.xml 
b/docs/topics/impala_shell_commands.xml
index f957f2f91..08b1b595e 100644
--- a/docs/topics/impala_shell_commands.xml
+++ b/docs/topics/impala_shell_commands.xml
@@ -295,7 +295,7 @@ under the License.
               <p>
                 Manages query options for an <cmdname>impala-shell</cmdname>
                 session. The available options are the ones listed in <xref
-                  href="impala_query_options.xml#query_options"/>. These 
options
+                  href="impala_set.xml"/>. These options
                 are used for query tuning and troubleshooting. Issue
                   <codeph>SET</codeph> with no arguments to see the current
                 query options, either based on the <cmdname>impalad</cmdname>
@@ -400,7 +400,7 @@ under the License.
             <entry>
               <p>
                 Removes any user-specified value for a query option and 
returns the option to its default value.
-                See <xref href="impala_query_options.xml#query_options"/> for 
the available query options.
+                See <xref href="impala_set.xml"/> for the available query 
options.
               </p>
               <p rev="2.5.0 IMPALA-2180">
                 In <keyword keyref="impala25_full"/> and higher, it can also 
remove user-specified substitution variables
diff --git a/docs/topics/impala_shuffle_distinct_exprs.xml 
b/docs/topics/impala_shuffle_distinct_exprs.xml
index 804ca4faf..2a5bfb835 100644
--- a/docs/topics/impala_shuffle_distinct_exprs.xml
+++ b/docs/topics/impala_shuffle_distinct_exprs.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>SHUFFLE_DISTINCT_EXPRS</navtitle>
+    <navtitle>SHUFFLE DISTINCT EXPRS</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_spool_query_results.xml 
b/docs/topics/impala_spool_query_results.xml
index 997868796..a2c017b86 100644
--- a/docs/topics/impala_spool_query_results.xml
+++ b/docs/topics/impala_spool_query_results.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="SPOOL_QUERY_RESULTS" rev="2.10.0 IMPALA-3200">
   <title>SPOOL_QUERY_RESULTS Query Option</title>
   <titlealts audience="PDF">
-    <navtitle>SPOOL_QUERY_RESULTS</navtitle>
+    <navtitle>SPOOL QUERY RESULTS</navtitle>
   </titlealts>
   <prolog>
     <metadata>
diff --git a/docs/topics/impala_support_start_over.xml 
b/docs/topics/impala_support_start_over.xml
index 629b62759..574b6ea80 100644
--- a/docs/topics/impala_support_start_over.xml
+++ b/docs/topics/impala_support_start_over.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="support_start_over">
 
   <title>SUPPORT_START_OVER Query Option</title>
-  <titlealts audience="PDF"><navtitle>SUPPORT_START_OVER</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>SUPPORT START OVER</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_sync_ddl.xml b/docs/topics/impala_sync_ddl.xml
index 793e9b407..c4113153c 100644
--- a/docs/topics/impala_sync_ddl.xml
+++ b/docs/topics/impala_sync_ddl.xml
@@ -21,7 +21,7 @@ under the License.
 <concept rev="1.2.1" id="sync_ddl">
 
   <title>SYNC_DDL Query Option</title>
-  <titlealts audience="PDF"><navtitle>SYNC_DDL</navtitle></titlealts>
+  <titlealts audience="PDF"><navtitle>SYNC DDL</navtitle></titlealts>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>
diff --git a/docs/topics/impala_thread_reservation_aggregate_limit.xml 
b/docs/topics/impala_thread_reservation_aggregate_limit.xml
index cf33ee7d6..cbfa2c39c 100644
--- a/docs/topics/impala_thread_reservation_aggregate_limit.xml
+++ b/docs/topics/impala_thread_reservation_aggregate_limit.xml
@@ -25,7 +25,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>THREAD_RESERVATION_AGGREGATE_LIMIT</navtitle>
+    <navtitle>THREAD RESERVATION AGGREGATE LIMIT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_thread_reservation_limit.xml 
b/docs/topics/impala_thread_reservation_limit.xml
index cce424937..8d200944a 100644
--- a/docs/topics/impala_thread_reservation_limit.xml
+++ b/docs/topics/impala_thread_reservation_limit.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>THREAD_RESERVATION_LIMIT</navtitle>
+    <navtitle>THREAD RESERVATION LIMIT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_topn_bytes_limit.xml 
b/docs/topics/impala_topn_bytes_limit.xml
index fa212b2a3..99f5b9d0e 100644
--- a/docs/topics/impala_topn_bytes_limit.xml
+++ b/docs/topics/impala_topn_bytes_limit.xml
@@ -24,7 +24,7 @@ under the License.
 
   <titlealts audience="PDF">
 
-    <navtitle>TOPN_BYTES_LIMIT</navtitle>
+    <navtitle>TOPN BYTES LIMIT</navtitle>
 
   </titlealts>
 
diff --git a/docs/topics/impala_utf8_mode.xml b/docs/topics/impala_utf8_mode.xml
index 80ab949c4..5c3b18630 100644
--- a/docs/topics/impala_utf8_mode.xml
+++ b/docs/topics/impala_utf8_mode.xml
@@ -21,7 +21,7 @@ under the License.
 <concept id="utf8_mode">
 
  <title>UTF8_MODE Query Option</title>
- <titlealts audience="PDF"><navtitle>UTF8_MODE</navtitle></titlealts>
+ <titlealts audience="PDF"><navtitle>UTF8 MODE</navtitle></titlealts>
  <prolog>
   <metadata>
    <data name="Category" value="Impala"/>

Reply via email to