diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml
index 6b078bb3b6c..c326785dbe3 100644
--- a/nixos/doc/manual/configuration/networking.xml
+++ b/nixos/doc/manual/configuration/networking.xml
@@ -9,7 +9,7 @@
machine.
-
+
diff --git a/nixos/doc/manual/configuration/ssh.section.md b/nixos/doc/manual/configuration/ssh.section.md
new file mode 100644
index 00000000000..9390108ad8b
--- /dev/null
+++ b/nixos/doc/manual/configuration/ssh.section.md
@@ -0,0 +1,19 @@
+# Secure Shell Access {#sec-ssh}
+
+Secure shell (SSH) access to your machine can be enabled by setting:
+
+```nix
+services.openssh.enable = true;
+```
+
+By default, root logins using a password are disallowed. They can be
+disabled entirely by setting
+[`services.openssh.permitRootLogin`](options.html#opt-services.openssh.permitRootLogin) to `"no"`.
+
+You can declaratively specify authorised RSA/DSA public keys for a user
+as follows:
+
+```nix
+users.users.alice.openssh.authorizedKeys.keys =
+ [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
+```
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
deleted file mode 100644
index 95ad3edff93..00000000000
--- a/nixos/doc/manual/configuration/ssh.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
- Secure Shell Access
-
-
- Secure shell (SSH) access to your machine can be enabled by setting:
-
- = true;
-
- By default, root logins using a password are disallowed. They can be disabled
- entirely by setting to
- "no".
-
-
-
- You can declaratively specify authorised RSA/DSA public keys for a user as
- follows:
-
-
-users.users.alice.openssh.authorizedKeys.keys =
- [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
-
-
-
diff --git a/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml
new file mode 100644
index 00000000000..46046064535
--- /dev/null
+++ b/nixos/doc/manual/from_md/configuration/ssh.section.xml
@@ -0,0 +1,23 @@
+
+ Secure Shell Access
+
+ Secure shell (SSH) access to your machine can be enabled by setting:
+
+
+services.openssh.enable = true;
+
+
+ By default, root logins using a password are disallowed. They can be
+ disabled entirely by setting
+ services.openssh.permitRootLogin
+ to "no".
+
+
+ You can declaratively specify authorised RSA/DSA public keys for a
+ user as follows:
+
+
+users.users.alice.openssh.authorizedKeys.keys =
+ [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
+
+