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: cb279c604618
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a46cac5b6fb
Choose a head ref
  • 2 commits
  • 8 files changed
  • 2 contributors

Commits on Oct 5, 2019

  1. nixos/doc: fix manpage format 

    Spaces inside <refname> cause stray double underscore in generated manual pages.

Fixes #70468
    @xzfc
    xzfc committed Oct 5, 2019
    Copy the full SHA
    0eaf294 View commit details

  2. Merge pull request #70475 from xzfc/manpages 

    nixos/doc: fix manpage format
    @matthewbauer
    matthewbauer authored Oct 5, 2019
    Copy the full SHA
    5a46cac View commit details
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
</refmeta>
<refnamediv>
<refname><filename>configuration.nix</filename>
</refname><refpurpose>NixOS system configuration specification</refpurpose>
<refname><filename>configuration.nix</filename></refname>
<refpurpose>NixOS system configuration specification</refpurpose>
</refnamediv>
<refsection>
<title>Description</title>
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-nixos-build-vms.xml
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
</refmeta>
<refnamediv>
<refname><command>nixos-build-vms</command>
</refname><refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
<refname><command>nixos-build-vms</command></refname>
<refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-nixos-enter.xml
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
</refmeta>
<refnamediv>
<refname><command>nixos-enter</command>
</refname><refpurpose>run a command in a NixOS chroot environment</refpurpose>
<refname><command>nixos-enter</command></refname>
<refpurpose>run a command in a NixOS chroot environment</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-nixos-generate-config.xml
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
</refmeta>
<refnamediv>
<refname><command>nixos-generate-config</command>
</refname><refpurpose>generate NixOS configuration modules</refpurpose>
<refname><command>nixos-generate-config</command></refname>
<refpurpose>generate NixOS configuration modules</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-nixos-install.xml
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
</refmeta>
<refnamediv>
<refname><command>nixos-install</command>
</refname><refpurpose>install bootloader and NixOS</refpurpose>
<refname><command>nixos-install</command></refname>
<refpurpose>install bootloader and NixOS</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-nixos-option.xml
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
</refmeta>
<refnamediv>
<refname><command>nixos-option</command>
</refname><refpurpose>inspect a NixOS configuration</refpurpose>
<refname><command>nixos-option</command></refname>
<refpurpose>inspect a NixOS configuration</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-nixos-rebuild.xml
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@
</refmeta>

<refnamediv>
<refname><command>nixos-rebuild</command>
</refname><refpurpose>reconfigure a NixOS machine</refpurpose>
<refname><command>nixos-rebuild</command></refname>
<refpurpose>reconfigure a NixOS machine</refpurpose>
</refnamediv>

<refsynopsisdiv>
4 changes: 2 additions & 2 deletions nixos/doc/manual/man-nixos-version.xml
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@
<refmiscinfo class="source">NixOS</refmiscinfo>
</refmeta>
<refnamediv>
<refname><command>nixos-version</command>
</refname><refpurpose>show the NixOS version</refpurpose>
<refname><command>nixos-version</command></refname>
<refpurpose>show the NixOS version</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>