datajoint · dimitri-yatsenko · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025
diff --git a/docs/mkdocs.yaml b/docs/mkdocs.yaml
@@ -4,78 +4,71 @@ site_name: DataJoint Documentation
 repo_url: https://github.com/datajoint/datajoint-python
 repo_name: datajoint/datajoint-python
 nav:
-  - DataJoint Python: index.md
-  - Quick Start Guide: quick-start.md
+  - Home: index.md
+  - Quick Start: quick-start.md
   - Concepts:
-    - Principles: concepts/principles.md
-    - Data Model: concepts/data-model.md
-    - Data Pipelines: concepts/data-pipelines.md
-    - Teamwork: concepts/teamwork.md
+    - concepts/index.md
     - Terminology: concepts/terminology.md
-  - System Administration:
-    - Database Administration: sysadmin/database-admin.md
-    - Bulk Storage Systems: sysadmin/bulk-storage.md
-    - External Store: sysadmin/external-store.md
-  - Client Configuration:
-    - Install: client/install.md
-    - Credentials: client/credentials.md
-    - Settings: client/settings.md
-    - File Stores: client/stores.md
+  - Getting Started:
+    - Installation: client/install.md
+    - Connection: client/credentials.md
+    - Configuration: client/settings.md
   - Schema Design:
-    - Schema Creation: design/schema.md
-    - Table Definition:
-      - Table Tiers: design/tables/tiers.md
-      - Declaration Syntax: design/tables/declare.md
-      - Primary Key: design/tables/primary.md
-      - Attributes: design/tables/attributes.md
-      - Lookup Tables: design/tables/lookup.md
-      - Manual Tables: design/tables/manual.md
-      - Blobs: design/tables/blobs.md
-      - Attachments: design/tables/attach.md
-      - Filepaths: design/tables/filepath.md
-      - Custom Datatypes: design/tables/customtype.md
-      - Dependencies: design/tables/dependencies.md
-      - Indexes: design/tables/indexes.md
-      - Master-Part Relationships: design/tables/master-part.md
-    - Schema Diagrams: design/diagrams.md
-    - Entity Normalization: design/normalization.md
-    - Data Integrity: design/integrity.md
-    - Schema Recall: design/recall.md
-    - Schema Drop: design/drop.md
-    - Schema Modification: design/alter.md
-  - Data Manipulations:
-    - manipulation/index.md
-    - Insert: manipulation/insert.md
-    - Delete: manipulation/delete.md
-    - Update: manipulation/update.md
-    - Transactions: manipulation/transactions.md
-  - Data Queries:
-    - Principles: query/principles.md
-    - Example Schema: query/example-schema.md
+    - Schemas: design/schema.md
+    - Table Tiers: design/tables/tiers.md
+    - Declaration: design/tables/declare.md
+    - Primary Key: design/tables/primary.md
+    - Attributes: design/tables/attributes.md
+    - Foreign Keys: design/tables/dependencies.md
+    - Indexes: design/tables/indexes.md
+    - Lookup Tables: design/tables/lookup.md
+    - Manual Tables: design/tables/manual.md
+    - Master-Part: design/tables/master-part.md
+    - Diagrams: design/diagrams.md
+    - Alter: design/alter.md
+    - Drop: design/drop.md
+  - Data Types:
+    - Blob: datatypes/blob.md
+    - Attach: datatypes/attach.md
+    - Filepath: datatypes/filepath.md
+    - Object: datatypes/object.md
+    - Adapted Types: datatypes/adapters.md
+  - Data Operations:
+    - operations/index.md
+    - Insert: operations/insert.md
+    - Delete: operations/delete.md
+    - Update: operations/update.md
+    - Transactions: operations/transactions.md
+    - Make Method: operations/make.md
+    - Populate: operations/populate.md
+    - Key Source: operations/key-source.md
+    - Jobs: operations/jobs.md
+    - Distributed: operations/distributed.md
+  - Queries:
+    - query/principles.md
     - Fetch: query/fetch.md
-    - Iteration: query/iteration.md
     - Operators: query/operators.md
     - Restrict: query/restrict.md
-    - Projection: query/project.md
+    - Project: query/project.md
     - Join: query/join.md
     - Aggregation: query/aggregation.md
     - Union: query/union.md
     - Universal Sets: query/universals.md
-    - Query Caching: query/query-caching.md
-  - Computations:
-    - Make Method: compute/make.md
-    - Populate: compute/populate.md
-    - Key Source: compute/key-source.md
-    - Distributed Computing: compute/distributed.md
-  - Publish Data: publish-data.md
-  - Internals:
-    - SQL Transpilation: internal/transpilation.md
+    - Iteration: query/iteration.md
+    - Caching: query/query-caching.md
+  - Administration:
+    - Database: admin/database.md
+    - Storage Backends: admin/storage.md
+    - External Store: admin/external-store.md
   - Tutorials:
-      - JSON Datatype: tutorials/json.ipynb
-  - FAQ: faq.md
-  - Developer Guide: develop.md
-  - Citation: citation.md
-  - Changelog: changelog.md
+    - JSON Datatype: tutorials/json.ipynb
+  - Reference:
+    - FAQ: reference/faq.md
+    - SQL Transpilation: reference/transpilation.md
+    - Publishing Data: reference/publish-data.md
+    - Developer Guide: reference/develop.md
+    - Citation: reference/citation.md
+    - Changelog: changelog.md
   - API: api/ # defer to gen-files + literate-nav
 
 # ---------------------------- STANDARD -----------------------------

diff --git a/docs/src/sysadmin/database-admin.md → docs/src/admin/database.md b/docs/src/sysadmin/database-admin.md → docs/src/admin/database.md
diff --git a/docs/src/sysadmin/external-store.md → docs/src/admin/external-store.md b/docs/src/sysadmin/external-store.md → docs/src/admin/external-store.md
@@ -34,7 +34,7 @@ For example, the following table stores motion-aligned two-photon movies.
 aligned_movie :  blob@external  # motion-aligned movie in 'external' store
 ```
 
-All [insert](../manipulation/insert.md) and [fetch](../query/fetch.md) operations work
+All [insert](../operations/insert.md) and [fetch](../query/fetch.md) operations work
 identically for `external` attributes as they do for `blob` attributes, with the same
 serialization protocol.
 Similar to `blobs`, `external` attributes cannot be used in restriction conditions.
@@ -116,12 +116,12 @@ configured external store.
 [foreign keys](../design/tables/dependencies.md) referencing the
 `~external_<storename>` table (but are not shown as such to the user).
 
-8. The [insert](../manipulation/insert.md) operation encodes and hashes the blob data.
+8. The [insert](../operations/insert.md) operation encodes and hashes the blob data.
 If an external object is not present in storage for the same hash, the object is saved
 and if the save operation is successful, corresponding entities in table
 `~external_<storename>` for that store are created.
 
-9. The [delete](../manipulation/delete.md)  operation first deletes the foreign key
+9. The [delete](../operations/delete.md) operation first deletes the foreign key
 reference in the target table. The external table entry and actual external object is
 not actually deleted at this time (`soft-delete`).
 

diff --git a/docs/src/sysadmin/bulk-storage.md → docs/src/admin/storage.md b/docs/src/sysadmin/bulk-storage.md → docs/src/admin/storage.md
diff --git a/docs/src/client/settings.md b/docs/src/client/settings.md
@@ -152,7 +152,7 @@ dj.config.database.use_tls = None   # Auto (default)
 
 ## External Storage
 
-Configure external stores in the `stores` section. See [External Storage](../sysadmin/external-store.md) for details.
+Configure external stores in the `stores` section. See [External Storage](../admin/external-store.md) for details.
 
 ```json
 {
@@ -164,3 +164,57 @@ Configure external stores in the `stores` section. See [External Storage](../sys
     }
 }
 ```
+
+## Object Storage
+
+Configure object storage for the [`object` type](../design/tables/object.md) in the `object_storage` section. This provides managed file and folder storage with fsspec backend support.
+
+### Local Filesystem
+
+```json
+{
+    "object_storage": {
+        "project_name": "my_project",
+        "protocol": "file",
+        "location": "/data/my_project"
+    }
+}
+```
+
+### Amazon S3
+
+```json
+{
+    "object_storage": {
+        "project_name": "my_project",
+        "protocol": "s3",
+        "bucket": "my-bucket",
+        "location": "my_project",
+        "endpoint": "s3.amazonaws.com"
+    }
+}
+```
+
+### Object Storage Settings
+
+| Setting | Environment Variable | Required | Description |
+|---------|---------------------|----------|-------------|
+| `object_storage.project_name` | `DJ_OBJECT_STORAGE_PROJECT_NAME` | Yes | Unique project identifier |
+| `object_storage.protocol` | `DJ_OBJECT_STORAGE_PROTOCOL` | Yes | Backend: `file`, `s3`, `gcs`, `azure` |
+| `object_storage.location` | `DJ_OBJECT_STORAGE_LOCATION` | Yes | Base path or bucket prefix |
+| `object_storage.bucket` | `DJ_OBJECT_STORAGE_BUCKET` | For cloud | Bucket name |
+| `object_storage.endpoint` | `DJ_OBJECT_STORAGE_ENDPOINT` | For S3 | S3 endpoint URL |
+| `object_storage.partition_pattern` | `DJ_OBJECT_STORAGE_PARTITION_PATTERN` | No | Path pattern with `{attr}` placeholders |
+| `object_storage.token_length` | `DJ_OBJECT_STORAGE_TOKEN_LENGTH` | No | Random suffix length (default: 8) |
+| `object_storage.access_key` | — | For cloud | Access key (use secrets) |
+| `object_storage.secret_key` | — | For cloud | Secret key (use secrets) |
+
+### Object Storage Secrets
+
+Store cloud credentials in the secrets directory:
+
+```
+.secrets/
+├── object_storage.access_key
+└── object_storage.secret_key
+```