summary refs log tree commit diff
path: root/nixos/doc/manual/man-nixos-version.xml
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-09-19 19:17:30 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-09-19 19:17:30 +0200
commitb0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30 (patch)
treeee6367837650bb97dc5117d518217b11294900fe /nixos/doc/manual/man-nixos-version.xml
parentdb3d31b903da12bc471e91d811d231dfe5b662ef (diff)
downloadnixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar
nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.gz
nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.bz2
nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.lz
nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.xz
nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.tar.zst
nixpkgs-b0ccd6dd16909c8639c2d9bee7dd2a2a0ac74c30.zip
Revert "nixos/doc: re-format"
This reverts commit ea6e8775bd69e4676c623a85c39f1da540d29ad1. The new
format is not an improvement.
Diffstat (limited to 'nixos/doc/manual/man-nixos-version.xml')
-rw-r--r--nixos/doc/manual/man-nixos-version.xml23
1 files changed, 17 insertions, 6 deletions
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml
index cb844da10f0..931c4a5ad02 100644
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixos/doc/manual/man-nixos-version.xml
@@ -25,7 +25,8 @@
  <refsection>
   <title>Description</title>
   <para>
-   This command shows the version of the currently active NixOS configuration. For example:
+   This command shows the version of the currently active NixOS configuration.
+   For example:
 <screen>$ nixos-version
 16.03.1011.6317da4 (Emu)
 </screen>
@@ -37,7 +38,8 @@
      </term>
      <listitem>
       <para>
-       The NixOS release, indicating the year and month in which it was released (e.g. March 2016).
+       The NixOS release, indicating the year and month in which it was
+       released (e.g. March 2016).
       </para>
      </listitem>
     </varlistentry>
@@ -47,7 +49,12 @@
      </term>
      <listitem>
       <para>
-       The number of commits in the Nixpkgs Git repository between the start of the release branch and the commit from which this version was built. This ensures that NixOS versions are monotonically increasing. It is <literal>git</literal> when the current NixOS configuration was built from a checkout of the Nixpkgs Git repository rather than from a NixOS channel.
+       The number of commits in the Nixpkgs Git repository between the start of
+       the release branch and the commit from which this version was built.
+       This ensures that NixOS versions are monotonically increasing. It is
+       <literal>git</literal> when the current NixOS configuration was built
+       from a checkout of the Nixpkgs Git repository rather than from a NixOS
+       channel.
       </para>
      </listitem>
     </varlistentry>
@@ -57,7 +64,8 @@
      </term>
      <listitem>
       <para>
-       The first 7 characters of the commit in the Nixpkgs Git repository from which this version was built.
+       The first 7 characters of the commit in the Nixpkgs Git repository from
+       which this version was built.
       </para>
      </listitem>
     </varlistentry>
@@ -67,7 +75,9 @@
      </term>
      <listitem>
       <para>
-       The code name of the NixOS release. The first letter of the code name indicates that this is the N'th stable NixOS release; for example, Emu is the fifth release.
+       The code name of the NixOS release. The first letter of the code name
+       indicates that this is the N'th stable NixOS release; for example, Emu
+       is the fifth release.
       </para>
      </listitem>
     </varlistentry>
@@ -89,7 +99,8 @@
     </term>
     <listitem>
      <para>
-      Show the full SHA1 hash of the Git commit from which this configuration was built, e.g.
+      Show the full SHA1 hash of the Git commit from which this configuration
+      was built, e.g.
 <screen>$ nixos-version --hash
 6317da40006f6bc2480c6781999c52d88dde2acf
 </screen>