summary refs log tree commit diff
diff options
context:
space:
mode:
authorpennae <github@quasiparticle.net>2022-08-29 16:51:16 +0200
committerpennae <github@quasiparticle.net>2022-08-31 16:32:53 +0200
commit5a643387ec1234c5f25357f2ff962a84895436f6 (patch)
tree4cdbf4854abb0cc78cd5c73d8a49855e4037c77b
parente4f876eb7e57f75c52d73b630258e6d85766d8f4 (diff)
downloadnixpkgs-5a643387ec1234c5f25357f2ff962a84895436f6.tar
nixpkgs-5a643387ec1234c5f25357f2ff962a84895436f6.tar.gz
nixpkgs-5a643387ec1234c5f25357f2ff962a84895436f6.tar.bz2
nixpkgs-5a643387ec1234c5f25357f2ff962a84895436f6.tar.lz
nixpkgs-5a643387ec1234c5f25357f2ff962a84895436f6.tar.xz
nixpkgs-5a643387ec1234c5f25357f2ff962a84895436f6.tar.zst
nixpkgs-5a643387ec1234c5f25357f2ff962a84895436f6.zip
nixos/*: normalize more docbook for auto-conversion
-rw-r--r--nixos/lib/systemd-unit-options.nix30
-rw-r--r--nixos/modules/config/mysql.nix33
-rw-r--r--nixos/modules/services/networking/globalprotect-vpn.nix4
3 files changed, 22 insertions, 45 deletions
diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix
index 84388b55503..ae4fa1a3362 100644
--- a/nixos/lib/systemd-unit-options.nix
+++ b/nixos/lib/systemd-unit-options.nix
@@ -192,8 +192,7 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Unit]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.unit</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.
         '';
       };
 
@@ -296,8 +295,7 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Service]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.service</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.
         '';
       };
 
@@ -449,8 +447,7 @@ in rec {
         description = ''
           Automatically start this unit at the given date/time, which
           must be in the format described in
-          <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>7</manvolnum></citerefentry>.  This is equivalent
+          <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>.  This is equivalent
           to adding a corresponding timer unit with
           <option>OnCalendar</option> set to the value given here.
         '';
@@ -497,8 +494,7 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Socket]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.socket</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.
         '';
       };
     };
@@ -530,10 +526,8 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Timer]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.timer</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> and
-          <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>7</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.timer</refentrytitle><manvolnum>5</manvolnum></citerefentry> and
+          <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry> for details.
         '';
       };
 
@@ -565,8 +559,7 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Path]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.path</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.
         '';
       };
 
@@ -627,8 +620,7 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Mount]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.mount</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.
         '';
       };
 
@@ -668,8 +660,7 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Automount]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.automount</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.
         '';
       };
 
@@ -700,8 +691,7 @@ in rec {
         description = ''
           Each attribute in this set specifies an option in the
           <literal>[Slice]</literal> section of the unit.  See
-          <citerefentry><refentrytitle>systemd.slice</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry> for details.
+          <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.
         '';
       };
 
diff --git a/nixos/modules/config/mysql.nix b/nixos/modules/config/mysql.nix
index bef6acb5dbb..d94c62510a6 100644
--- a/nixos/modules/config/mysql.nix
+++ b/nixos/modules/config/mysql.nix
@@ -199,8 +199,7 @@ in
                 description = ''
                   The name of the column in the log table to which the name of the remote
                   host that initiates the session is stored. The value is supposed to be
-                  set by the PAM-aware application with <literal>pam_set_item(PAM_RHOST)
-                  </literal>.
+                  set by the PAM-aware application with <literal>pam_set_item(PAM_RHOST)</literal>.
                 '';
               };
               timeColumn = mkOption {
@@ -234,8 +233,7 @@ in
                 LIMIT 1
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getpwnam.3.html">getpwnam</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getpwnam.3.html">getpwnam</link>
                 syscall.
               '';
             };
@@ -249,8 +247,7 @@ in
                 LIMIT 1
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getpwuid.3.html">getpwuid</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getpwuid.3.html">getpwuid</link>
                 syscall.
               '';
             };
@@ -264,8 +261,7 @@ in
                 LIMIT 1
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getspnam.3.html">getspnam</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getspnam.3.html">getspnam</link>
                 syscall.
               '';
             };
@@ -276,8 +272,7 @@ in
                 SELECT username,'x',uid,'5000','MySQL User', CONCAT('/home/',username),'/run/sw/current-system/bin/bash' FROM users
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getpwent.3.html">getpwent</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getpwent.3.html">getpwent</link>
                 syscall.
               '';
             };
@@ -288,8 +283,7 @@ in
                 SELECT username,password,'1','0','99999','0','0','-1','0' FROM users
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getspent.3.html">getspent</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getspent.3.html">getspent</link>
                 syscall.
               '';
             };
@@ -300,8 +294,7 @@ in
                 SELECT name,password,gid FROM groups WHERE name='%1$s' LIMIT 1
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getgrnam.3.html">getgrnam</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getgrnam.3.html">getgrnam</link>
                 syscall.
               '';
             };
@@ -312,8 +305,7 @@ in
                 SELECT name,password,gid FROM groups WHERE gid='%1$u' LIMIT 1
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getgrgid.3.html">getgrgid</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getgrgid.3.html">getgrgid</link>
                 syscall.
               '';
             };
@@ -324,8 +316,7 @@ in
                 SELECT name,password,gid FROM groups
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/getgrent.3.html">getgrent</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/getgrent.3.html">getgrent</link>
                 syscall.
               '';
             };
@@ -336,8 +327,7 @@ in
                 SELECT username FROM grouplist WHERE gid='%1$u'
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/memsbygid.3.html">memsbygid</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/memsbygid.3.html">memsbygid</link>
                 syscall.
               '';
             };
@@ -348,8 +338,7 @@ in
                 SELECT gid FROM grouplist WHERE username='%1$s'
               '';
               description = ''
-                SQL query for the <link
-                xlink:href="https://man7.org/linux/man-pages/man3/gidsbymem.3.html">gidsbymem</link>
+                SQL query for the <link xlink:href="https://man7.org/linux/man-pages/man3/gidsbymem.3.html">gidsbymem</link>
                 syscall.
               '';
             };
diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix
index bb60916244f..e1b66a76866 100644
--- a/nixos/modules/services/networking/globalprotect-vpn.nix
+++ b/nixos/modules/services/networking/globalprotect-vpn.nix
@@ -19,9 +19,7 @@ in
     settings = mkOption {
       description = ''
         GlobalProtect-openconnect configuration. For more information, visit
-        <link
-        xlink:href="https://github.com/yuezk/GlobalProtect-openconnect/wiki/Configuration"
-        />.
+        <link xlink:href="https://github.com/yuezk/GlobalProtect-openconnect/wiki/Configuration"/>.
       '';
       default = { };
       example = {