fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 04:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

man: merge branch 'bg/man-nm-settings-ifcfg-rh'

Browse source 
Some fixes to the nm-settings-ifcfg-rh man page.
This commit is contained in:
Beniamino Galvani 2017-09-05 10:38:27 +02:00
commit 9b208b520d
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnm-core/nm-setting-user.c
View file

@ -597,6 +597,18 @@ nm_setting_user_class_init (NMSettingUserClass *klass)
* *
* Since: 1.8 * Since: 1.8
**/ **/
/* ---ifcfg-rh---
* property: data
* variable: NM_USER_*
* description: each key/value pair is stored as a separate variable with
* name composed by concatenating NM_USER_ with the encoded key. The key is
* encoded by substituting lowercase letters with uppercase and prepending
* uppercase letters with an underscore. A dot is encoded as a double
* underscore. Remaining characters are encoded as underscore followed by a
* 3 digit octal representation of the character.
* example: NM_USER_FOO__BAR=something
* ---end---
*/
obj_properties[PROP_DATA] = obj_properties[PROP_DATA] =
g_param_spec_boxed (NM_SETTING_USER_DATA, "", "", g_param_spec_boxed (NM_SETTING_USER_DATA, "", "",
G_TYPE_HASH_TABLE, G_TYPE_HASH_TABLE,

8
libnm/generate-plugin-docs.pl
View file

@ -75,9 +75,11 @@ write_header();
foreach my $c_file (@source_files) { foreach my $c_file (@source_files) {
my $path = "$srcdir/$c_file"; my $path = "$srcdir/$c_file";
my $setting_name = get_setting_name($path); my $setting_name = get_setting_name($path);
write_item("<setting name=\"$setting_name\">"); if ($setting_name) {
scan_doc_comments($path, $start_tag, $end_tag); write_item("<setting name=\"$setting_name\">");
write_item("</setting>"); scan_doc_comments($path, $start_tag, $end_tag);
write_item("</setting>");
}
} }
# write XML footer # write XML footer

5
man/nm-settings-ifcfg-rh.xsl
View file

@ -17,7 +17,6 @@
/> />
<xsl:template match="nm-ifcfg-rh-docs"> <xsl:template match="nm-ifcfg-rh-docs">
<xsl:variable name="unsupported" select="'adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn'"/>
<refentry id="nm-settings-ifcfg-rh"> <refentry id="nm-settings-ifcfg-rh">
<refentryinfo> <refentryinfo>
<title>nm-settings-ifcfg-rh</title> <title>nm-settings-ifcfg-rh</title>
@ -328,8 +327,8 @@ DEVICETYPE=TeamPort
<xsl:template match="setting"> <xsl:template match="setting">
<xsl:variable name="setting_name" select="../@name"/> <xsl:variable name="setting_name" select="../@name"/>
<xsl:variable name="unsupported" select="'adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn, macvlan, vxlan, tun, ip-tunnel'"/> <xsl:variable name="unsupported" select="'802-11-olpc-mesh, adsl, bluetooth, cdma, dummy, generic, gsm, ip-tunnel, macsec, macvlan, ppp, pppoe, serial, tun, vpn, vxlan, wimax'"/>
<xsl:if test="not (contains($unsupported, @name))"> <xsl:if test="not (contains(concat(' ', $unsupported, ','), concat(' ', @name, ',')))">
<table> <table>
<title><xsl:value-of select="@name"/> setting</title> <title><xsl:value-of select="@name"/> setting</title>
<tgroup cols="4"> <tgroup cols="4">