-21
.github/workflows/compare-manuals.sh
-21
.github/workflows/compare-manuals.sh
···
+1
-9
.github/workflows/manual-nixos.yml
+1
-9
.github/workflows/manual-nixos.yml
···run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux
-64
.github/workflows/manual-rendering.yml
-64
.github/workflows/manual-rendering.yml
···
+1
-1
lib/default.nix
+1
-1
lib/default.nix
···
+7
-17
lib/modules.nix
+7
-17
lib/modules.nix
············
+8
-25
lib/options.nix
+8
-25
lib/options.nix
·········-literalExample = lib.warn "literalExample is deprecated, use literalExpression instead, or use literalDocBook for a non-Nix description." literalExpression;+literalExample = lib.warn "literalExample is deprecated, use literalExpression instead, or use literalMD for a non-Nix description." literalExpression;
+23
-177
nixos/doc/manual/default.nix
+23
-177
nixos/doc/manual/default.nix
············-<d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-nixos-manual"><?dbhtml filename="index.html"?>······-grep "^ID recommended on" xsltproc.out &>/dev/null && echo "error: some IDs are missing" && false······
-46
nixos/doc/manual/man-pages.xml
-46
nixos/doc/manual/man-pages.xml
···-<copyright><year>2007-2022</year><holder>Eelco Dolstra and the Nixpkgs/NixOS contributors</holder>-<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+2
nixos/doc/manual/release-notes/rl-2311.section.md
+2
nixos/doc/manual/release-notes/rl-2311.section.md
···- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.+- DocBook option documentation is no longer supported, all module documentation now uses markdown.- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.
+31
-38
nixos/lib/make-options-doc/default.nix
+31
-38
nixos/lib/make-options-doc/default.nix
···-# !!! when this is eventually flipped to true, `lib.doRename` should also default to emitting Markdown······+optionsDocBook = lib.warn "optionsDocBook is deprecated since 23.11 and will be removed in 24.05"
-60
nixos/lib/make-options-doc/mergeJSON.py
-60
nixos/lib/make-options-doc/mergeJSON.py
·········-print("Explanation: The documentation contains descriptions, examples, or defaults written in DocBook. " +-" imports = [ (mkAliasOptionModuleMD [ \"example\" \"args\" ] [ \"example\" \"settings\" ]) ];",
-115
nixos/lib/make-options-doc/postprocess-option-descriptions.xsl
-115
nixos/lib/make-options-doc/postprocess-option-descriptions.xsl
···
+4
-26
nixos/modules/misc/documentation.nix
+4
-26
nixos/modules/misc/documentation.nix
······(mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])······-echo -e "\e[31;1mwarning\e[0m: This configuration contains option documentation in docbook." \
+1
-5
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+1
-5
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
···-{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash, withManOptDedupPatch ? false }:+{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:···
-11
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch
-11
pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch
···-<xsl:template match="d:variablelist[ancestor::d:listitem or ancestor::d:step or ancestor::d:glossdef]|
+2
-2
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
+2
-2
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
······
+25
-106
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
+25
-106
pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
·········-return (self._renderer._manpage_urls, self._revision, self._markdown_by_default, self._document_type,···-return ((self._revision, self._markdown_by_default), { '_options_by_id': self._options_by_id })······-def __init__(self, manpage_urls: Mapping[str, str], revision: str, markdown_by_default: bool):···-def __init__(self, manpage_urls: Mapping[str, str], revision: str, markdown_by_default: bool):·····················
+1
-1
pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py
+1
-1
pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py
···