Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2debad92f0df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 777e94d90379
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Feb 8, 2019

  1. nixos/manual: add dummy ids to silence warnings

    @layus
    layus committed Feb 8, 2019
    Copy the full SHA
    473a3ef View commit details

  2. nixos/manual: error out on missing IDs

    @layus
    layus committed Feb 8, 2019
    Copy the full SHA
    a65974c View commit details

Commits on Mar 9, 2019

  1. Merge pull request #55436 from layus/warn-manual-ids 

    Nixos manual: error out on missing IDs
    @grahamc
    grahamc authored Mar 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    777e94d View commit details
2 changes: 1 addition & 1 deletion nixos/doc/manual/administration/running.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
version="5.0"
xml:id="ch-running">
<title>Administration</title>
<partintro>
<partintro xml:id="ch-running-intro">
<para>
This chapter describes various aspects of managing a running NixOS system,
such as how to use the <command>systemd</command> service manager.
2 changes: 1 addition & 1 deletion nixos/doc/manual/configuration/configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
version="5.0"
xml:id="ch-configuration">
<title>Configuration</title>
<partintro>
<partintro xml:id="ch-configuration-intro">
<para>
This chapter describes how to configure various aspects of a NixOS machine
through the configuration file
5 changes: 4 additions & 1 deletion nixos/doc/manual/default.nix
View file
Original file line number Diff line number Diff line change
@@ -268,7 +268,10 @@ in rec {
--stringparam id.warnings "1" \
--nonet --output $dst/ \
${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${manual-combined}/manual-combined.xml
${manual-combined}/manual-combined.xml \
|& tee xsltproc.out
grep "^ID recommended on" xsltproc.out &>/dev/null && echo "error: some IDs are missing" && false
rm xsltproc.out
mkdir -p $dst/images/callouts
cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/
2 changes: 1 addition & 1 deletion nixos/doc/manual/development/development.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
version="5.0"
xml:id="ch-development">
<title>Development</title>
<partintro>
<partintro xml:id="ch-development-intro">
<para>
This chapter describes how you can modify and extend NixOS.
</para>
2 changes: 1 addition & 1 deletion nixos/doc/manual/installation/installation.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
version="5.0"
xml:id="ch-installation">
<title>Installation</title>
<partintro>
<partintro xml:id="ch-installation-intro">
<para>
This section describes how to obtain, install, and configure NixOS for
first-time use.