doc: services: consolidate Storage docs

MAINTAINERS.yml

@@ -3475,7 +3475,7 @@ NVMEM:
   collaborators:
     - henrikbrixandersen
   files:
-    - doc/services/nvmem/
+    - doc/services/storage/nvmem/
     - dts/bindings/nvmem/
     - include/zephyr/devicetree/nvmem.h
     - include/zephyr/nvmem.h
@@ -4585,7 +4585,7 @@ Retention:
     - dts/bindings/retention/
     - include/zephyr/retention/
     - subsys/retention/
-    - doc/services/retention/
+    - doc/services/storage/retention/
   labels:
     - "area: Retention"
 

doc/_scripts/redirects.py

@@ -322,8 +322,12 @@
     ('samples/subsys/video/capture/README', 'samples/drivers/video/capture/README'),
     ('samples/subsys/video/tcpserversink/README', 'samples/drivers/video/tcpserversink/README'),
     ('samples/subsys/video/video', 'samples/drivers/video/video'),
+    ('services/file_system/index', 'services/storage/file_system/index'),
     ('services/modbus/index', 'connectivity/modbus/index'),
+    ('services/nvmem/index', 'services/storage/nvmem/index'),
     ('services/portability/posix', 'services/portability/posix/index'),
+    ('services/retention/blinfo', 'services/storage/retention/blinfo'),
+    ('services/retention/index', 'services/storage/retention/index'),
     ('services/secure_storage', 'services/storage/secure_storage/index'),
     ('services/settings/index', 'services/storage/settings/index'),
     # zephyr-keep-sorted-stop

doc/services/index.rst

@@ -14,7 +14,6 @@ OS Services
    debugging/index.rst
    device_mgmt/index
    dsp/index.rst
-   file_system/index.rst
    formatted_output.rst
    input/index.rst
    instrumentation/index.rst
@@ -25,7 +24,6 @@ OS Services
    resource_management/index.rst
    mem_mgmt/index.rst
    net_buf/index.rst
-   nvmem/index.rst
    modem/index.rst
    notify.rst
    pm/index.rst
@@ -40,7 +38,6 @@ OS Services
    task_wdt/index.rst
    tfm/index
    virtualization/index.rst
-   retention/index.rst
    rtio/index.rst
    zbus/index.rst
    misc.rst

doc/services/storage/index.rst

@@ -6,11 +6,14 @@ Storage
 .. toctree::
    :maxdepth: 1
 
-   nvs/nvs.rst
-   zms/zms.rst
    disk/access.rst
-   flash_map/flash_map.rst
    fcb/fcb.rst
-   stream/stream_flash.rst
+   file_system/index.rst
+   flash_map/flash_map.rst
+   nvmem/index.rst
+   nvs/nvs.rst
+   retention/index.rst
    secure_storage/index.rst
    settings/index.rst
+   stream/stream_flash.rst
+   zms/zms.rst