diff --git a/CHANGELOG.md b/CHANGELOG.md index def90e6954b2..4801f202643a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Versions are `MAJOR.PATCH`. ### Changed ### Fixed +- [#56237](https://github.com/saltstack/salt/pull/56237) - Fix alphabetical ordering and remove duplicates across all documentation indexes - [@myii](https://github.com/myii) - [#56082](https://github.com/saltstack/salt/pull/56082) - Fix saltversioninfo grain for new version - [#56143](https://github.com/saltstack/salt/pull/56143) - Use encoding when caching pillar data - [#56172](https://github.com/saltstack/salt/pull/56172) - Only change mine data if using new allow_tgt feature diff --git a/doc/ref/cli/index.rst b/doc/ref/cli/index.rst index fccf51d1db9d..99e31b3cb6a3 100644 --- a/doc/ref/cli/index.rst +++ b/doc/ref/cli/index.rst @@ -2,6 +2,12 @@ Command Line Reference ====================== +salt-api +======== +.. toctree:: + + salt-api + salt-call ========= .. toctree:: @@ -80,12 +86,6 @@ salt-unity salt-unity -salt-api -======== -.. toctree:: - - salt-api - spm === .. toctree:: diff --git a/doc/ref/grains/all/index.rst b/doc/ref/grains/all/index.rst index 9fd6a0171e6c..bd019ca55a0d 100644 --- a/doc/ref/grains/all/index.rst +++ b/doc/ref/grains/all/index.rst @@ -10,8 +10,8 @@ grains modules :toctree: :template: autosummary.rst.tmpl - cimc chronos + cimc core disks esxi diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst index e68b1474e3e6..0ee95768464e 100644 --- a/doc/ref/modules/all/index.rst +++ b/doc/ref/modules/all/index.rst @@ -113,10 +113,10 @@ execution modules ddns deb_apache deb_postgres - debuild_pkgbuild debconfmod debian_ip debian_service + debuild_pkgbuild defaults devmap dig @@ -175,12 +175,12 @@ execution modules hg hosts http + icinga2 ifttt ilo - icinga2 incron - influxdbmod influxdb08mod + influxdbmod infoblox ini_manage inspectlib @@ -238,11 +238,9 @@ execution modules lxd mac_assistive mac_brew_pkg - macdefaults mac_desktop mac_group mac_keychain - macpackage mac_pkgutil mac_portspkg mac_power @@ -254,6 +252,8 @@ execution modules mac_timezone mac_user mac_xattr + macdefaults + macpackage makeconf mandrill marathon @@ -277,16 +277,15 @@ execution modules nacl nagios nagios_rpc - namecheap_domains_dns namecheap_domains + namecheap_domains_dns namecheap_domains_ns namecheap_ssl namecheap_users - napalm_mod - napalm_netacl napalm_bgp napalm_formula napalm_mod + napalm_netacl napalm_network napalm_ntp napalm_probes @@ -414,6 +413,7 @@ execution modules smbios smf_service smtp + snapper solaris_fmadm solaris_group solaris_shadow @@ -429,7 +429,6 @@ execution modules ssh ssh_pkg ssh_service - snapper state status statuspage @@ -450,8 +449,8 @@ execution modules telemetry temp test - testinframod test_virtual + testinframod textfsm_mod timezone tls @@ -497,7 +496,6 @@ execution modules win_pki win_powercfg win_psget - winrepo win_servermanager win_service win_shadow @@ -510,6 +508,7 @@ execution modules win_useradd win_wua win_wusa + winrepo x509 xapi_virt xbpspkg diff --git a/doc/ref/proxy/all/index.rst b/doc/ref/proxy/all/index.rst index 33ae5f4df3ac..675b46d41870 100644 --- a/doc/ref/proxy/all/index.rst +++ b/doc/ref/proxy/all/index.rst @@ -11,7 +11,6 @@ proxy modules :template: autosummary.rst.tmpl arista_pyeapi - cimc chronos cimc cisconso diff --git a/doc/ref/states/all/index.rst b/doc/ref/states/all/index.rst index 0c71b922810a..fe3af4106ab0 100644 --- a/doc/ref/states/all/index.rst +++ b/doc/ref/states/all/index.rst @@ -90,9 +90,9 @@ state modules elasticsearch_index_template environ eselect + esxi etcd_mod ethtool - esxi event file firewall @@ -168,10 +168,10 @@ state modules lvs_service lxc mac_assistive - macdefaults mac_keychain - macpackage mac_xattr + macdefaults + macpackage makeconf marathon_app mdadm_raid @@ -188,13 +188,13 @@ state modules mysql_grants mysql_query mysql_user + net_napalm_yang netacl netconfig netntp netsnmp netusers network - net_napalm_yang neutron_network neutron_secgroup neutron_secgroup_rule @@ -215,8 +215,8 @@ state modules pagerduty_user panos pcs - pecl pdbedit + pecl pip_state pkg pkgbuild @@ -329,8 +329,8 @@ state modules zabbix_valuemap zcbuildout zenoss - zk_concurrency zfs + zk_concurrency zone zookeeper zpool