diff --git a/doc/README.md b/doc/README.md
index 91513c4c8..0e6e653fc 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,19 +1,14 @@
# Documentation
-This `doc` folder is the future location of documentation for Subiquity. This
-will be used to migrate the official documentation to readthedocs, and later
-will be the home of that documentation.
+This `doc` folder is the location of documentation for Subiquity.
-The `../documentation` folder is the existing location for this sort of
-documentation. As the RTD version is not yet ready, documentation changes
-should be made to `../documentation` until this README is updated to say
-otherwise. As such, please make any desired documentation changes to
-`../documentation`.
+In the not distant past, there was also a `../documentation` folder, but that
+is now an obsolete copy of what was on Discourse.
# Local preview
To build this documentation, you can run `make install` from this folder to
-create the virtual environment.
+create the virtual environment.
Then run the `make run` command, which will build a html version of the docs,
and serve the docs in the virtual environment. This is very convenient if you
diff --git a/documentation/.gitignore b/documentation/.gitignore
deleted file mode 100644
index 2aa8485c0..000000000
--- a/documentation/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/discourse/
-/html/
diff --git a/documentation/Makefile b/documentation/Makefile
deleted file mode 100644
index dd11234a0..000000000
--- a/documentation/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-SRC = $(wildcard *.md)
-
-DISCOURSE_MD = $(addprefix discourse/, $(SRC))
-HTML_MD = $(addprefix html/, $(SRC))
-HTML = $(HTML_MD:.md=.html)
-
-discourse/%.md: %.md
- @mkdir --parents discourse
- python3 ./substitute-links.py md-to-discourse --input $^ --output $@
-
-html/%.md: %.md
- @mkdir --parents html
- python3 ./substitute-links.py md-to-html --input $^ --output $@
-
-%.html: %.md
- pandoc $^ --standalone --output $@
-
-.PHONY: html
-html: $(HTML)
-
-.PHONY: discourse
-discourse: $(DISCOURSE_MD)
-
-.PHONY: clean
-clean:
- $(RM) $(DISCOURSE_MD)
- $(RM) -d discourse
- $(RM) $(HTML)
- $(RM) -d html
-
-.PHONY: new
-new: clean all
-
-.PHONY: all
-all: discourse html
diff --git a/documentation/autoinstall-quickstart-s390x.md b/documentation/autoinstall-quickstart-s390x.md
deleted file mode 100644
index ab44881f6..000000000
--- a/documentation/autoinstall-quickstart-s390x.md
+++ /dev/null
@@ -1,110 +0,0 @@
-
-The intent of this page is to provide simple instructions to perform an autoinstall in a VM on your machine on s390x.
-
-This page is just a slightly adapted page of [the autoinstall quickstart page](autoinstall-quickstart.md) mapped to s390x.
-
-## Download an ISO
-
-At the time of writing (just after the kinetic release), the best place to go is here:
-
{
- "type": "object",
- "properties": {
- "version": {
- "type": "integer",
- "minimum": 1,
- "maximum": 1
- },
- "early-commands": {
- "type": "array",
- "items": {
- "type": [
- "string",
- "array"
- ],
- "items": {
- "type": "string"
- }
- }
- },
- "reporting": {
- "type": "object",
- "additionalProperties": {
- "type": "object",
- "properties": {
- "type": {
- "type": "string"
- }
- },
- "required": [
- "type"
- ],
- "additionalProperties": true
- }
- },
- "error-commands": {
- "type": "array",
- "items": {
- "type": [
- "string",
- "array"
- ],
- "items": {
- "type": "string"
- }
- }
- },
- "user-data": {
- "type": "object"
- },
- "packages": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "debconf-selections": {
- "type": "string"
- },
- "locale": {
- "type": "string"
- },
- "refresh-installer": {
- "type": "object",
- "properties": {
- "update": {
- "type": "boolean"
- },
- "channel": {
- "type": "string"
- }
- },
- "additionalProperties": false
- },
- "kernel": {
- "type": "object",
- "properties": {
- "package": {
- "type": "string"
- },
- "flavor": {
- "type": "string"
- }
- },
- "oneOf": [
- {
- "type": "object",
- "required": [
- "package"
- ]
- },
- {
- "type": "object",
- "required": [
- "flavor"
- ]
- }
- ]
- },
- "keyboard": {
- "type": "object",
- "properties": {
- "layout": {
- "type": "string"
- },
- "variant": {
- "type": "string"
- },
- "toggle": {
- "type": [
- "string",
- "null"
- ]
- }
- },
- "required": [
- "layout"
- ],
- "additionalProperties": false
- },
- "source": {
- "type": "object",
- "properties": {
- "search_drivers": {
- "type": "boolean"
- },
- "id": {
- "type": "string"
- }
- }
- },
- "network": {
- "oneOf": [
- {
- "type": "object",
- "properties": {
- "version": {
- "type": "integer",
- "minimum": 2,
- "maximum": 2
- },
- "ethernets": {
- "type": "object",
- "properties": {
- "match": {
- "type": "object",
- "properties": {
- "name": {
- "type": "string"
- },
- "macaddress": {
- "type": "string"
- },
- "driver": {
- "type": "string"
- }
- },
- "additionalProperties": false
- }
- }
- },
- "wifis": {
- "type": "object",
- "properties": {
- "match": {
- "type": "object",
- "properties": {
- "name": {
- "type": "string"
- },
- "macaddress": {
- "type": "string"
- },
- "driver": {
- "type": "string"
- }
- },
- "additionalProperties": false
- }
- }
- },
- "bridges": {
- "type": "object"
- },
- "bonds": {
- "type": "object"
- },
- "tunnels": {
- "type": "object"
- },
- "vlans": {
- "type": "object"
- }
- },
- "required": [
- "version"
- ]
- },
- {
- "type": "object",
- "properties": {
- "network": {
- "type": "object",
- "properties": {
- "version": {
- "type": "integer",
- "minimum": 2,
- "maximum": 2
- },
- "ethernets": {
- "type": "object",
- "properties": {
- "match": {
- "type": "object",
- "properties": {
- "name": {
- "type": "string"
- },
- "macaddress": {
- "type": "string"
- },
- "driver": {
- "type": "string"
- }
- },
- "additionalProperties": false
- }
- }
- },
- "wifis": {
- "type": "object",
- "properties": {
- "match": {
- "type": "object",
- "properties": {
- "name": {
- "type": "string"
- },
- "macaddress": {
- "type": "string"
- },
- "driver": {
- "type": "string"
- }
- },
- "additionalProperties": false
- }
- }
- },
- "bridges": {
- "type": "object"
- },
- "bonds": {
- "type": "object"
- },
- "tunnels": {
- "type": "object"
- },
- "vlans": {
- "type": "object"
- }
- },
- "required": [
- "version"
- ]
- }
- },
- "required": [
- "network"
- ]
- }
- ]
- },
- "ubuntu-pro": {
- "type": "object",
- "properties": {
- "token": {
- "type": "string",
- "minLength": 24,
- "maxLength": 30,
- "pattern": "^C[1-9A-HJ-NP-Za-km-z]+$",
- "description": "A valid token starts with a C and is followed by 23 to 29 Base58 characters.\nSee https://pkg.go.dev/github.com/btcsuite/btcutil/base58#CheckEncode"
- }
- }
- },
- "ubuntu-advantage": {
- "type": "object",
- "properties": {
- "token": {
- "type": "string",
- "minLength": 24,
- "maxLength": 30,
- "pattern": "^C[1-9A-HJ-NP-Za-km-z]+$",
- "description": "A valid token starts with a C and is followed by 23 to 29 Base58 characters.\nSee https://pkg.go.dev/github.com/btcsuite/btcutil/base58#CheckEncode"
- }
- },
- "deprecated": true,
- "description": "Compatibility only - use ubuntu-pro instead"
- },
- "proxy": {
- "type": [
- "string",
- "null"
- ],
- "format": "uri"
- },
- "apt": {
- "type": "object",
- "properties": {
- "preserve_sources_list": {
- "type": "boolean"
- },
- "primary": {
- "type": "array"
- },
- "mirror-selection": {
- "type": "object",
- "properties": {
- "primary": {
- "type": "array",
- "items": {
- "anyOf": [
- {
- "type": "string",
- "const": "country-mirror"
- },
- {
- "type": "object",
- "properties": {
- "uri": {
- "type": "string"
- },
- "arches": {
- "type": "array",
- "items": {
- "type": "string"
- }
- }
- },
- "required": [
- "uri"
- ]
- }
- ]
- }
- }
- }
- },
- "geoip": {
- "type": "boolean"
- },
- "sources": {
- "type": "object"
- },
- "disable_components": {
- "type": "array",
- "items": {
- "type": "string",
- "enum": [
- "universe",
- "multiverse",
- "restricted",
- "contrib",
- "non-free"
- ]
- }
- },
- "preferences": {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "package": {
- "type": "string"
- },
- "pin": {
- "type": "string"
- },
- "pin-priority": {
- "type": "integer"
- }
- },
- "required": [
- "package",
- "pin",
- "pin-priority"
- ]
- }
- },
- "fallback": {
- "type": "string",
- "enum": [
- "abort",
- "continue-anyway",
- "offline-install"
- ]
- }
- }
- },
- "storage": {
- "type": "object"
- },
- "identity": {
- "type": "object",
- "properties": {
- "realname": {
- "type": "string"
- },
- "username": {
- "type": "string"
- },
- "hostname": {
- "type": "string"
- },
- "password": {
- "type": "string"
- }
- },
- "required": [
- "username",
- "hostname",
- "password"
- ],
- "additionalProperties": false
- },
- "ssh": {
- "type": "object",
- "properties": {
- "install-server": {
- "type": "boolean"
- },
- "authorized-keys": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "allow-pw": {
- "type": "boolean"
- }
- }
- },
- "snaps": {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "name": {
- "type": "string"
- },
- "channel": {
- "type": "string"
- },
- "classic": {
- "type": "boolean"
- }
- },
- "required": [
- "name"
- ],
- "additionalProperties": false
- }
- },
- "active-directory": {
- "type": "object",
- "properties": {
- "admin-name": {
- "type": "string"
- },
- "domain-name": {
- "type": "string"
- }
- },
- "additionalProperties": false
- },
- "codecs": {
- "type": "object",
- "properties": {
- "install": {
- "type": "boolean"
- }
- }
- },
- "drivers": {
- "type": "object",
- "properties": {
- "install": {
- "type": "boolean"
- }
- }
- },
- "oem": {
- "type": "object",
- "properties": {
- "install": {
- "oneOf": [
- {
- "type": "boolean"
- },
- {
- "type": "string",
- "const": "auto"
- }
- ]
- }
- },
- "required": [
- "install"
- ]
- },
- "timezone": {
- "type": "string"
- },
- "updates": {
- "type": "string",
- "enum": [
- "security",
- "all"
- ]
- },
- "late-commands": {
- "type": "array",
- "items": {
- "type": [
- "string",
- "array"
- ],
- "items": {
- "type": "string"
- }
- }
- },
- "shutdown": {
- "type": "string",
- "enum": [
- "reboot",
- "poweroff"
- ]
- }
- },
- "required": [
- "version"
- ],
- "additionalProperties": true
-}
-
-
-## Regeneration
-
-The schema above can be regenerated by running "make schema" in a Subiquity source checkout.
diff --git a/documentation/autoinstall.md b/documentation/autoinstall.md
deleted file mode 100644
index 3cb1442ec..000000000
--- a/documentation/autoinstall.md
+++ /dev/null
@@ -1,156 +0,0 @@
-## Introduction
-
-Since version 20.04, the server installer supports automated installation mode (autoinstallation for short). You might also know this feature as *unattended*, *hands-off*, or *preseeded* installation.
-
-Autoinstallation lets you answer all those configuration questions ahead of time with an *autoinstall config*, and lets the installation process run without any interaction.
-
-## Differences from debian-installer preseeding
-
-*Preseeds* are the way to automate an installer based on debian-installer (a.k.a. *d-i*).
-
-Autoinstalls for the new server installer differ from preseeds in the following main ways:
-
- * The format is completely different (cloud-init config, usually YAML, vs. `debconf-set-selections` format).
- * When the answer to a question is not present in a preseed, d-i stops and asks the user for input. Autoinstalls are not like this: by default, if there is any autoinstall config at all, the installer takes the default for any unanswered question (and fails if there is no default).
- * You can designate particular sections in the config as "interactive", which means the installer will still stop and ask about those.
-
-## Provide the autoinstall config via cloud-init
-
-The autoinstall config is provided via cloud-init configuration, which is almost endlessly flexible. In most scenarios, the easiest way will be to provide user data [via the NoCloud datasource](https://cloudinit.readthedocs.io/en/latest/reference/datasources/nocloud.html).
-
-The autoinstall config should be provided under the `autoinstall` key in the config. For example:
-
-```yaml
-#cloud-config
-autoinstall:
- version: 1
- ...
-```
-
-## Run a truly automatic autoinstall
-
-Even if a fully non-interactive autoinstall config is found, the server installer will ask for confirmation before writing to the disks unless `autoinstall` is present on the kernel command line. This is to make it harder to accidentally create a USB stick that will reformat the machine it is plugged into at boot. Many autoinstalls will be done via netboot, where the kernel command line is controlled by the netboot config -- just remember to put `autoinstall` in there!
-
-### Quick start
-
-So you just want to try it out? Well we have [the page for you](autoinstall-quickstart.md).
-
-### Create an autoinstall config
-
-When any system is installed using the server installer, an autoinstall file for repeating the install is created at `/var/log/installer/autoinstall-user-data`.
-
-### Translate a preseed file
-
-If you have a preseed file already, the [autoinstall-generator snap](https://snapcraft.io/autoinstall-generator) can help translate that preseed data to an autoinstall file. See this discussion on the [autoinstall generator tool](https://discourse.ubuntu.com/t/autoinstall-generator-tool-to-help-with-creation-of-autoinstall-files-based-on-preseed/21334) for more details on how to set this up.
-
-## The structure of an autoinstall config
-
-The autoinstall config has [full documentation](autoinstall-reference.md).
-
-Technically speaking, the config is not defined as a textual format, but cloud-init config is usually provided as YAML so that is the syntax the documentation uses. A minimal config consists of:
-
-```yaml
-version: 1
-identity:
- hostname: hostname
- username: username
- password: $crypted_pass
-```
-
-However, here is a more complete example file that shows off most features:
-
-version: 1
-reporting:
- hook:
- type: webhook
- endpoint: http://example.com/endpoint/path
-early-commands:
- - ping -c1 198.162.1.1
-locale: en_US
-keyboard:
- layout: gb
- variant: dvorak
-network:
- network:
- version: 2
- ethernets:
- enp0s25:
- dhcp4: yes
- enp3s0: {}
- enp4s0: {}
- bonds:
- bond0:
- dhcp4: yes
- interfaces:
- - enp3s0
- - enp4s0
- parameters:
- mode: active-backup
- primary: enp3s0
-proxy: http://squid.internal:3128/
-apt:
- primary:
- - arches: [default]
- uri: http://repo.internal/
- sources:
- my-ppa.list:
- source: "deb http://ppa.launchpad.net/curtin-dev/test-archive/ubuntu $RELEASE main"
- keyid: B59D 5F15 97A5 04B7 E230 6DCA 0620 BBCF 0368 3F77
-storage:
- layout:
- name: lvm
-identity:
- hostname: hostname
- username: username
- password: $crypted_pass
-ssh:
- install-server: yes
- authorized-keys:
- - $key
- allow-pw: no
-snaps:
- - name: go
- channel: 1.14/stable
- classic: true
-debconf-selections: |
- bind9 bind9/run-resolvconf boolean false
-packages:
- - libreoffice
- - dns-server^
-user-data:
- disable_root: false
-late-commands:
- - sed -ie 's/GRUB_TIMEOUT=.\*/GRUB_TIMEOUT=30/' /target/etc/default/grub
-error-commands:
- - tar c /var/log/installer | nc 192.168.0.1 1000
-
-
-Many keys and values correspond straightforwardly to questions the installer asks (e.g. keyboard selection). See the reference for details of those that do not.
-
-## Error handling
-
-Progress through the installer is reported via [the `reporting` system](/t/automated-server-install-reference/16613#reporting), including errors. In addition, when a fatal error occurs, the [`error-commands`](/t/automated-server-install-reference/16613#error-commands) are executed and the traceback printed to the console. The server then just waits.
-
-## Interactions between Autoinstall and Cloud-init
-
-### Delivery of Autoinstall
-
-Cloud-config can be used to deliver the autoinstall data to the installation environment. The [autoinstall quickstart](/t/automated-server-install-quickstart/16614) has an example of [writing the autoinstall config](/t/automated-server-install-quickstart/16614#write-your-autoinstall-config).
-
-Note that autoinstall is processed by Subiquity (not cloud-init), so please direct defects in autoinstall behavior and [bug reports to Subiquity](https://bugs.launchpad.net/subiquity/+filebug).
-
-### The installation environment
-
-At install time, the live-server environment is just that: a live but ephemeral copy of Ubuntu Server. This means that cloud-init is present and running in that environment, and existing methods of interacting with cloud-init can be used to configure the live-server ephemeral environment. For example, any #cloud-config user data keys are presented to the live-server containing [`ssh_import_id`]( https://cloudinit.readthedocs.io/en/latest/reference/modules.html#ssh-import-id), then SSH keys will be added to the `authorized_keys` list for the ephemeral environment.
-
-### First boot configuration of the target system
-
-Autoinstall data may optionally contain a [user data sub-section](/t/automated-server-install-reference/16613#user-data), which is cloud-config data that is used to configure the target system on first boot.
-
-Subiquity itself delegates some configuration items to cloud-init, and these items are processed on first boot.
-
-Starting with Ubuntu 22.10, once cloud-init has performed this first boot configuration, it will disable itself as cloud-init completes configuration in the target system on first boot.
-
-### Possible future directions
-
-We might want to extend the 'match specs' for disks to cover other ways of selecting disks.
diff --git a/documentation/substitute-links.py b/documentation/substitute-links.py
deleted file mode 100644
index 8a0557cbe..000000000
--- a/documentation/substitute-links.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-from typing import List, Tuple
-
-discourse_substitutions = [
- ("autoinstall.md", "/t/automated-server-installs/16612"),
- ("autoinstall-reference.md", "/t/automated-server-install-reference/16613"),
- ("autoinstall-quickstart.md", "/t/automated-server-install-quickstart/16614"),
- ("autoinstall-schema.md", "/t/automated-server-install-schema/16615"),
- ("autoinstall-quickstart-s390x.md", "/t/automated-server-install-schema/16616"),
-]
-md_to_html_substitutions = [
- ("autoinstall.md", "autoinstall.html"),
- ("autoinstall-reference.md", "autoinstall-reference.html"),
- ("autoinstall-quickstart.md", "autoinstall-quickstart.html"),
- ("autoinstall-schema.md", "autoinstall-schema.html"),
- ("autoinstall-quickstart-s390x.md", "autoinstall-quickstart-s390x.html"),
-]
-
-def perform_substitutions(content: str, substitutions: List[Tuple[str, str]]) -> str:
- for old, new in substitutions:
- content = content.replace(old, new)
- return content
-
-
-def main() -> None:
- parser = argparse.ArgumentParser()
-
- parser.add_argument("--input", "-i", type=argparse.FileType(mode="r"), default="-")
- parser.add_argument("--output", "-o", type=argparse.FileType(mode="w"), default="-")
- parser.add_argument("action", choices=("md-to-discourse", "md-to-html"))
-
- args = vars(parser.parse_args())
-
- if args["action"] == "md-to-discourse":
- substitutions = discourse_substitutions
- else:
- substitutions = md_to_html_substitutions
-
- print(perform_substitutions(
- args["input"].read(),
- substitutions=substitutions),
- file=args["output"])
-
-
-if __name__ == "__main__":
- main()