doc: storage: move "Secure Storage" and "Settings" chapters to "Storage"

Moves the "Secure Storage" and "Settings" chapters to the Storage folder.

Signed-off-by: Andrej Butok <andrey.butok@nxp.com>

Author: butok

MAINTAINERS.yml

@@ -3361,7 +3361,7 @@ Settings:
     - subsys/settings/
     - tests/subsys/settings/
     - samples/subsys/settings/
-    - doc/services/settings/
+    - doc/services/storage/settings/
   labels:
     - "area: Settings"
   tests:
@@ -4343,7 +4343,7 @@ Secure storage:
     - subsys/secure_storage/
     - include/zephyr/psa/
     - samples/psa/
-    - doc/services/secure_storage.rst
+    - doc/services/storage/secure_storage/index.rst
     - tests/subsys/secure_storage/
   labels:
     - "area: Secure storage"

doc/_scripts/redirects.py

@@ -210,7 +210,7 @@
     ('reference/peripherals/uart', 'hardware/peripherals/uart'),
     ('reference/peripherals/video', 'hardware/peripherals/video'),
     ('reference/pm/index', 'services/pm/api/index'),
-    ('reference/settings/index', 'services/settings/index'),
+    ('reference/settings/index', 'services/storage/settings/index'),
     ('reference/shell/index', 'services/shell/index'),
     ('reference/storage/fcb/fcb', 'services/storage/fcb/fcb'),
     ('reference/storage/index', 'services/storage/index'),
@@ -308,5 +308,7 @@
     ('samples/subsys/video/video', 'samples/drivers/video/video'),
     ('services/crypto/tinycrypt', 'services/crypto/psa_crypto'),
     ('services/portability/posix', 'services/portability/posix/index'),
+    ('services/secure_storage', 'services/storage/secure_storage/index'),
+    ('services/settings/index', 'services/storage/settings/index'),
     # zephyr-keep-sorted-stop
 ]

doc/services/index.rst

@@ -29,10 +29,8 @@ OS Services
    portability/index.rst
    poweroff.rst
    profiling/index.rst
-   secure_storage.rst
    shell/index.rst
    serialization/index.rst
-   settings/index.rst
    smf/index.rst
    storage/index.rst
    sensing/index.rst

doc/services/storage/index.rst

@@ -12,3 +12,5 @@ Storage
    flash_map/flash_map.rst
    fcb/fcb.rst
    stream/stream_flash.rst
+   secure_storage/index.rst
+   settings/index.rst

doc/services/secure_storage.rst …ervices/storage/secure_storage/index.rstdoc/services/secure_storage.rst renamed to doc/services/storage/secure_storage/index.rst doc/services/secure_storage.rst renamed to doc/services/storage/secure_storage/index.rst

@@ -1,6 +1,6 @@
 .. _secure_storage:
 
-Secure storage
+Secure Storage
 ##############
 
 | The secure storage subsystem provides an implementation of the functions defined in the