Patches for minor documentation fixes

Jon Jensen jon at endpoint.com
Thu Mar 20 19:50:59 UTC 2014


I was just taking a first look at firewalld in RHEL 7 beta and found a few 
minor typos etc. that I figured I could send fixes for in the attached 
patches, for what it's worth.

Thanks,
Jon


-- 
Jon Jensen
End Point Corporation
http://www.endpoint.com/
-------------- next part --------------
commit ebb68328d83972394f7b4579047d8eab424dbe5f
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Mar 20 13:30:10 2014 -0600

    Update URL that redirects

diff --git a/doc/xml/notes.xml b/doc/xml/notes.xml
index 8823382..a9ac95b 100644
--- a/doc/xml/notes.xml
+++ b/doc/xml/notes.xml
@@ -28,7 +28,7 @@
       <term>firewalld home page at fedorahosted.org:</term>
       <listitem>
 	<para>
-	  <ulink url="http://fedorahosted.org/firewalld/"></ulink>
+	  <ulink url="https://fedorahosted.org/firewalld/"></ulink>
 	</para>
       </listitem>
     </varlistentry>

commit 2c720617af5ccdc89e1297a54b5b40ae60506dbb
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Mar 20 13:28:20 2014 -0600

    Use standard D-Bus capitalization everywhere

diff --git a/doc/xml/firewalld.xml b/doc/xml/firewalld.xml
index c34f5ea..4ccf4e3 100644
--- a/doc/xml/firewalld.xml
+++ b/doc/xml/firewalld.xml
@@ -117,7 +117,7 @@
   <refsect1 id="concepts">
     <title>Concepts</title>
     <para>
-      firewalld has a D-BUS interface for firewall configuration of services and applications. It also has a command line client for the user. Services or applications already using D-BUS can request changes to the firewall with the D-BUS interface directly.  For more information on the firewalld D-BUS interface, please have a look at <citerefentry><refentrytitle>firewalld.dbus</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+      firewalld has a D-Bus interface for firewall configuration of services and applications. It also has a command line client for the user. Services or applications already using D-Bus can request changes to the firewall with the D-Bus interface directly.  For more information on the firewalld D-Bus interface, please have a look at <citerefentry><refentrytitle>firewalld.dbus</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>
     <para>
       firewalld provides support for zones, predefined services and ICMP types and has a separation of runtime and permanent configuration options. Permanent configuration is loaded from XML files in <filename class="directory">/usr/lib/firewalld</filename> or <filename class="directory">/etc/firewalld</filename> (see <xref linkend="directories"/>).
@@ -164,7 +164,7 @@
     <refsect2>
       <title>Direct interface</title>
       <para>
-	The direct interface is mainly used by services or applications to add specific firewall rules. The rules are not permanent and need to get applied after receiving the <option>start</option>, <option>restart</option> or <option>reload</option> message from firewalld using D-BUS.
+	The direct interface is mainly used by services or applications to add specific firewall rules. The rules are not permanent and need to get applied after receiving the <option>start</option>, <option>restart</option> or <option>reload</option> message from firewalld using D-Bus.
       </para>
     </refsect2>
   </refsect1>
diff --git a/doc/xml/firewalld.zones.xml b/doc/xml/firewalld.zones.xml
index 8451933..fe2be6e 100644
--- a/doc/xml/firewalld.zones.xml
+++ b/doc/xml/firewalld.zones.xml
@@ -210,7 +210,7 @@
       <title>How to configure or add zones?</title>
 
       <para>
-	To configure or add zones you can either use one of the firewalld interfaces to handle and change the configuration: These are the graphical configuration tool firewall-config, the command line tool <command>firewall-cmd</command> or the D-BUS interface. Or you can create or copy a zone file in one of the configuration directories. <filename class="directory"><config.prefix/>/lib/firewalld/zones</filename> is used for default and fallback configurations and <filename class="directory"><config.sysconfdir/>/firewalld/zones</filename> is used for user created and customized configuration files.
+	To configure or add zones you can either use one of the firewalld interfaces to handle and change the configuration: These are the graphical configuration tool firewall-config, the command line tool <command>firewall-cmd</command> or the D-Bus interface. Or you can create or copy a zone file in one of the configuration directories. <filename class="directory"><config.prefix/>/lib/firewalld/zones</filename> is used for default and fallback configurations and <filename class="directory"><config.sysconfdir/>/firewalld/zones</filename> is used for user created and customized configuration files.
       </para>
     </refsect2>
 
diff --git a/firewalld.spec b/firewalld.spec
index 9a6644c..3e6d22b 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,4 +1,4 @@
-Summary: A firewall daemon with D-BUS interface providing a dynamic firewall
+Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
 Version: 0.3.9.3
 Release: 1%{?dist}
@@ -24,7 +24,7 @@ Requires(postun): systemd
 
 %description
 firewalld is a firewall service daemon that provides a dynamic customizable 
-firewall with a D-BUS interface.
+firewall with a D-Bus interface.
 
 %package -n firewall-applet
 Summary: Firewall panel applet
diff --git a/src/firewall/dbus_utils.py b/src/firewall/dbus_utils.py
index af83401..72075c3 100644
--- a/src/firewall/dbus_utils.py
+++ b/src/firewall/dbus_utils.py
@@ -84,7 +84,7 @@ def context_of_sender(bus, sender):
     return "".join(map(chr, dbus_to_python(context)))
 
 def command_of_sender(bus, sender):
-    """ Return command of D-BUS sender """
+    """ Return command of D-Bus sender """
 
     return command_of_pid(pid_of_sender(bus, sender))
 
diff --git a/src/firewall/server/decorators.py b/src/firewall/server/decorators.py
index 457d43a..4b2d726 100644
--- a/src/firewall/server/decorators.py
+++ b/src/firewall/server/decorators.py
@@ -34,7 +34,7 @@ from firewall.errors import *
 @decorator
 def handle_exceptions(func, *args, **kwargs):
     """Decorator to handle exceptions and log them. Used if not conneced 
-    to D-BUS.
+    to D-Bus.
     """
     try:
         return func(*args, **kwargs)
@@ -45,7 +45,7 @@ def handle_exceptions(func, *args, **kwargs):
 
 @decorator
 def dbus_handle_exceptions(func, *args, **kwargs):
-    """Decorator to handle exceptions, log and report them into D-BUS
+    """Decorator to handle exceptions, log and report them into D-Bus
 
     :Raises DBusException: on a firewall error code problems.
     """
diff --git a/src/firewall/server/server.py b/src/firewall/server/server.py
index f4263ae..c90c87d 100644
--- a/src/firewall/server/server.py
+++ b/src/firewall/server/server.py
@@ -60,7 +60,7 @@ def sigterm(mainloop):
 ############################################################################
 
 def run_server(debug_gc=False):
-    """ Main function for firewall server. Handles D-BUS and GLib mainloop.
+    """ Main function for firewall server. Handles D-Bus and GLib mainloop.
     """
     service = None
     if debug_gc:

commit 32faf1630ca6832f08d4159fc5cb56074aee1354
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Mar 20 13:28:12 2014 -0600

    Fix typo

diff --git a/README b/README
index 5d09d7b..e53e742 100644
--- a/README
+++ b/README
@@ -57,7 +57,7 @@ Use
 
 to create the documentation and to update the po files.
 
-Now your are done.
+Now you are done.
 
 
 Links:

commit 5c75f17cd9888091d80c4cf6c15e280d7b946e5c
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Mar 20 13:27:34 2014 -0600

    Tidy up English

diff --git a/config/org.fedoraproject.FirewallD1.policy.in b/config/org.fedoraproject.FirewallD1.policy.in
index bb52607..ff23b1b 100644
--- a/config/org.fedoraproject.FirewallD1.policy.in
+++ b/config/org.fedoraproject.FirewallD1.policy.in
@@ -9,7 +9,7 @@
 
    <action id="org.fedoraproject.FirewallD1.info">
     <description>General firewall information</description>
-    <message>System policy prevents to get general firewall information</message>
+    <message>System policy prevents getting general firewall information</message>
     <defaults>
       <allow_any>yes</allow_any>
       <allow_inactive>yes</allow_inactive>
@@ -19,7 +19,7 @@
 
    <action id="org.fedoraproject.FirewallD1.config">
     <description>Firewall configuration</description>
-    <message>System policy prevents to change the firewall configuration</message>
+    <message>System policy prevents changing the firewall configuration</message>
     <defaults>
       <allow_any>auth_admin_keep</allow_any>
       <allow_inactive>auth_admin_keep</allow_inactive>
@@ -29,7 +29,7 @@
 
    <action id="org.fedoraproject.FirewallD1.direct">
     <description>Firewall direct interface</description>
-    <message>System policy prevents to use the firewall direct interface</message>
+    <message>System policy prevents using the firewall direct interface</message>
     <defaults>
       <allow_any>auth_admin_keep</allow_any>
       <allow_inactive>auth_admin_keep</allow_inactive>
@@ -39,7 +39,7 @@
 
    <action id="org.fedoraproject.FirewallD1.policies">
     <description>Firewall policies interface</description>
-    <message>System policy prevents to use the firewall policies interface</message>
+    <message>System policy prevents using the firewall policies interface</message>
     <defaults>
       <allow_any>auth_admin_keep</allow_any>
       <allow_inactive>auth_admin_keep</allow_inactive>

commit b8c4cd96d11cc0ea71a51319bf330f595e24c4f8
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Mar 20 13:06:41 2014 -0600

    Fix typo

diff --git a/config/firewalld.sysconfig b/config/firewalld.sysconfig
index 524b4b9..08196b9 100644
--- a/config/firewalld.sysconfig
+++ b/config/firewalld.sysconfig
@@ -1,3 +1,3 @@
 # firewalld command line args
-# possile values: --debug
+# possible values: --debug
 FIREWALLD_ARGS=


More information about the firewalld-devel mailing list