Merge "Clean up cpu_shared_set config docs"

doc/source/user/flavors.rst

@@ -561,9 +561,9 @@ Emulator threads policy
 
   - ``share``: (default) The emulator threads float across the pCPUs
     associated to the guest. To place a workload's emulator threads on
-    a set of isolated physical CPUs, set ``share``` and
-    ``[compute]/cpu_shared_set`` configuration option to the set of
-    host CPUs that should be used for best-effort CPU resources.
+    a set of isolated physical CPUs, set ``share`` and the
+    :oslo.config:option:`compute.cpu_shared_set` configuration option to the
+    set of host CPUs that should be used for best-effort CPU resources.
 
   - ``isolate``: The emulator threads are isolated on a single pCPU.
 

nova/conf/compute.py

@@ -677,9 +677,10 @@ Defines which physical CPUs (pCPUs) will be used for best-effort guest vCPU
 resources.
 
 Currently only used by libvirt driver to place guest emulator threads when
-hw:emulator_threads_policy:share.
+the flavor extra spec is set to ``hw:emulator_threads_policy=share``.
+
+For example::
 
-::
     cpu_shared_set = "4-12,^8,15"
 """),
     cfg.BoolOpt('live_migration_wait_for_vif_plug',