Merge "docs: Add a new cells v2 document"

Author: Zuul

doc/source/_extra/.htaccess

@@ -9,12 +9,12 @@ redirectmatch 301 ^/nova/([^/]+)/api_plugins.html$ /nova/$1/contributor/api.html
 redirectmatch 301 ^/nova/([^/]+)/architecture.html$ /nova/$1/user/architecture.html
 redirectmatch 301 ^/nova/([^/]+)/block_device_mapping.html$ /nova/$1/user/block-device-mapping.html
 redirectmatch 301 ^/nova/([^/]+)/blueprints.html$ /nova/$1/contributor/blueprints.html
-redirectmatch 301 ^/nova/([^/]+)/cells.html$ /nova/$1/user/cells.html
+redirectmatch 301 ^/nova/([^/]+)/cells.html$ /nova/$1/admin/cells.html
 redirectmatch 301 ^/nova/([^/]+)/code-review.html$ /nova/$1/contributor/code-review.html
 redirectmatch 301 ^/nova/([^/]+)/conductor.html$ /nova/$1/user/conductor.html
 redirectmatch 301 ^/nova/([^/]+)/development.environment.html$ /nova/$1/contributor/development-environment.html
 redirectmatch 301 ^/nova/([^/]+)/devref/api.html /nova/$1/contributor/api.html
-redirectmatch 301 ^/nova/([^/]+)/devref/cells.html /nova/$1/user/cells.html
+redirectmatch 301 ^/nova/([^/]+)/devref/cells.html /nova/$1/admin/cells.html
 redirectmatch 301 ^/nova/([^/]+)/devref/filter_scheduler.html /nova/$1/admin/scheduling.html
 # catch all, if we hit something in devref assume it moved to
 # reference unless we have already triggered a hit above.
@@ -64,7 +64,9 @@ redirectmatch 301 ^/nova/([^/]+)/testing/zero-downtime-upgrade.html$ /nova/$1/co
 redirectmatch 301 ^/nova/([^/]+)/threading.html$ /nova/$1/reference/threading.html
 redirectmatch 301 ^/nova/([^/]+)/upgrade.html$ /nova/$1/admin/upgrades.html
 redirectmatch 301 ^/nova/([^/]+)/user/aggregates.html$ /nova/$1/admin/aggregates.html
-redirectmatch 301 ^/nova/([^/]+)/user/cellsv2_layout.html$ /nova/$1/user/cellsv2-layout.html
+redirectmatch 301 ^/nova/([^/]+)/user/cells.html$ /nova/$1/admin/cells.html
+redirectmatch 301 ^/nova/([^/]+)/user/cellsv2-layout.html$ /nova/$1/admin/cells.html
+redirectmatch 301 ^/nova/([^/]+)/user/cellsv2_layout.html$ /nova/$1/admin/cells.html
 redirectmatch 301 ^/nova/([^/]+)/user/config-drive.html$ /nova/$1/user/metadata.html
 redirectmatch 301 ^/nova/([^/]+)/user/filter-scheduler.html$ /nova/$1/admin/scheduling.html
 redirectmatch 301 ^/nova/([^/]+)/user/metadata-service.html$ /nova/$1/user/metadata.html