diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | man/Makefile.am | 10 | ||||
-rw-r--r-- | man/NetworkManager.conf.xml (renamed from man/NetworkManager.conf.xml.in) | 16 | ||||
-rw-r--r-- | man/common.ent.in | 4 |
4 files changed, 14 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index d8bf11c6cf..00210f4203 100644 --- a/.gitignore +++ b/.gitignore @@ -215,7 +215,6 @@ test-*.trs /m4/xsize.m4 /man/*.[1785] -/man/NetworkManager.conf.xml /man/nm-settings.xml /man/nm-settings-ifcfg-rh.xml /man/nm-settings-keyfile.xml diff --git a/man/Makefile.am b/man/Makefile.am index ce84194cd6..9338edbbe0 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -31,16 +31,6 @@ if ENABLE_GTK_DOC endif -CLEANFILES += NetworkManager.conf.xml -EXTRA_DIST += NetworkManager.conf.xml.in -NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in - $(AM_V_GEN) sed \ - -e 's|[@]NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT[@]|$(NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT)|g' \ - -e 's|[@]NM_CONFIG_KEYFILE_PATH_DEFAULT[@]|$(nmconfdir)/conf.d|g' \ - -e 's|[@]NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT[@]|$(NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT)|g' \ - -e 's|[@]NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \ - $< >$@ - if BUILD_SETTING_DOCS nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml index 2736065e52..ad5245e2b5 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml @@ -1,6 +1,10 @@ <?xml version='1.0'?> <!--*-nxml-*--> +<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "common.ent" > +%entities; +]> <!-- Copyright 2010 - 2014 Red Hat, Inc. @@ -17,7 +21,7 @@ Copyright 2010 - 2014 Red Hat, Inc. <manvolnum>5</manvolnum> <refmiscinfo class="source">NetworkManager</refmiscinfo> <refmiscinfo class="manual">Configuration</refmiscinfo> - <refmiscinfo class="version">1.2</refmiscinfo> + <refmiscinfo class="version">&NM_VERSION;</refmiscinfo> </refmeta> <refnamediv> @@ -151,7 +155,7 @@ plugins-=remove-me <listitem><para>Whether the system uses PolicyKit for authorization. If <literal>false</literal>, all requests will be allowed. If <literal>true</literal>, non-root requests are authorized using PolicyKit. - The default value is <literal>@NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@</literal>. + The default value is <literal>&NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT;</literal>. </para></listitem> </varlistentry> <varlistentry> @@ -349,7 +353,7 @@ no-auto-default=* <term><varname>path</varname></term> <listitem> <para>The location where keyfiles are read and stored. - This defaults to "<literal>@NM_CONFIG_KEYFILE_PATH_DEFAULT@</literal>". + This defaults to "<filename>&sysconfdir;/NetworkManager/conf.d</filename>". </para> </listitem> </varlistentry> @@ -496,7 +500,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth "<literal>debug</literal>" uses syslog and logs to standard error. If NetworkManager is started in debug mode (<literal>--debug</literal>) this option is ignored and "<literal>debug</literal>" is always used. - Otherwise, the default is "<literal>@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@</literal>". + Otherwise, the default is "<literal>&NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT;</literal>". </para></listitem> </varlistentry> <varlistentry> @@ -505,7 +509,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth auditd, the audit daemon. If <literal>false</literal>, audit records will be sent only to the NetworkManager logging system. If set to <literal>true</literal>, they will be also - sent to auditd. The default value is <literal>@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@</literal>. + sent to auditd. The default value is <literal>&NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT;</literal>. </para></listitem> </varlistentry> </variablelist> diff --git a/man/common.ent.in b/man/common.ent.in index cd43b8d8e9..ae8897eb8a 100644 --- a/man/common.ent.in +++ b/man/common.ent.in @@ -1,2 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <!ENTITY NM_VERSION "@NM_VERSION@"> +<!ENTITY sysconfdir "@sysconfdir@"> +<!ENTITY NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT "@NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@"> +<!ENTITY NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT "@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@"> +<!ENTITY NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT "@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@"> |