public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55515 from rycee/wpa_supplicant_citerefentry

Browse Source 
nixos/wpa_supplicant: use `<citerefentry>`
This commit is contained in:
Silvan Mosberger 2019-02-14 20:38:05 +01:00 committed by GitHub
commit 80480598d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/configuration/wireless.xml
View File

@ -29,7 +29,10 @@
networks are set, it will default to using a configuration file at networks are set, it will default to using a configuration file at
<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
yourself to define wireless networks, WPA keys and so on (see yourself to define wireless networks, WPA keys and so on (see
wpa_supplicant.conf(5)). <citerefentry>
<refentrytitle>wpa_supplicant.conf</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>).
</para> </para>
<para> <para>

21
nixos/modules/services/networking/wpa_supplicant.nix
View File

@ -86,7 +86,12 @@ in {
''; '';
description = '' description = ''
Use this option to configure advanced authentication methods like EAP. Use this option to configure advanced authentication methods like EAP.
See wpa_supplicant.conf(5) for example configurations. See
<citerefentry>
<refentrytitle>wpa_supplicant.conf</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>
for example configurations.
Mutually exclusive with <varname>psk</varname> and <varname>pskRaw</varname>. Mutually exclusive with <varname>psk</varname> and <varname>pskRaw</varname>.
''; '';
@ -122,7 +127,12 @@ in {
''; '';
description = '' description = ''
Extra configuration lines appended to the network block. Extra configuration lines appended to the network block.
See wpa_supplicant.conf(5) for available options. See
<citerefentry>
<refentrytitle>wpa_supplicant.conf</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>
for available options.
''; '';
}; };
@ -174,7 +184,12 @@ in {
''; '';
description = '' description = ''
Extra lines appended to the configuration file. Extra lines appended to the configuration file.
See wpa_supplicant.conf(5) for available options. See
<citerefentry>
<refentrytitle>wpa_supplicant.conf</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>
for available options.
''; '';
}; };
}; };