Merge lp:~clissold345/ubuntu-docs/minor-changes-to-firewall-page into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

Proposed by Chris Perry
Status: Merged
Merged at revision: 564
Proposed branch: lp:~clissold345/ubuntu-docs/minor-changes-to-firewall-page
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 43 lines (+11/-8)
1 file modified
ubuntu-help/C/net-firewall-on-off.page (+11/-8)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/minor-changes-to-firewall-page
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+309256@code.launchpad.net

Description of the change

I've made some minor (mainly clarification) changes to net-firewall-on-off.page.

My main change is probably changing the page title. The old title was simply wrong in my opinion. What does "block firewall access" mean?

I've corrected a few inconsistencies and made a few clarifications. Perhaps my only contentious change is to mention that other firewalls are available?

To post a comment you must log in.
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Looks good, thanks for your work.

I made a tiny change when merging: Surrounding SSH with <app></app> seems not to be right, since SSH in this context is reasonably the protocol rather than a specific application, so I dropped those.

You can find out about the meaning of various inline elements at <http://projectmallard.org/1.0/>.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/net-firewall-on-off.page'
2--- ubuntu-help/C/net-firewall-on-off.page 2016-09-14 18:26:42 +0000
3+++ ubuntu-help/C/net-firewall-on-off.page 2016-10-25 12:06:36 +0000
4@@ -4,7 +4,7 @@
5
6 <info>
7 <link type="guide" xref="net-security"/>
8- <desc>You can control which programs can access the network. This helps to keep your computer secure.</desc>
9+ <desc>You can control network traffic in and out of your computer. This helps to keep your computer secure.</desc>
10
11 <revision pkgversion="3.4.0" date="2012-02-20" status="final"/>
12 <revision version="16.10" date="2016-09-14" status="review"/>
13@@ -21,20 +21,23 @@
14 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
15 </info>
16
17- <title>Enable or block firewall access</title>
18-
19- <p>Ubuntu comes equipped with the <app>Uncomplicated Firewall</app> (<app>ufw</app>) but the firewall is not enabled by default. Because Ubuntu does not have any open network services (except for basic network infrastructure) in the default installation, a firewall is not needed to block incoming attempted malicious connections.</p>
20-
21- <p>For more information about how to use ufw, see the <link href="https://wiki.ubuntu.com/UncomplicatedFirewall">online documentation</link>.</p>
22+ <title>Control network traffic in and out of your computer</title>
23+
24+ <p>You can use a firewall to control network traffic in and out of your computer. Ubuntu comes equipped with the <app>Uncomplicated Firewall</app> (<app>ufw</app>) - other firewalls are available - but the firewall is not enabled by default. Because Ubuntu does not have any open network services (except for basic network infrastructure) in the default installation, a firewall is not needed to block incoming attempted malicious connections.</p>
25+
26+ <p>For detailed information about how to use ufw, see the <link href="https://wiki.ubuntu.com/UncomplicatedFirewall">online documentation</link>.</p>
27
28 <section id="ufw-enable">
29 <title>Turn the firewall on or off</title>
30- <p>To turn on the firewall, enter <cmd>sudo ufw enable</cmd> in a terminal. To turn off ufw, enter <cmd>sudo ufw disable</cmd>.</p>
31+ <p>To turn on the firewall, enter <cmd>sudo ufw enable</cmd> in a terminal. To turn off the firewall, enter <cmd>sudo ufw disable</cmd>.</p>
32 </section>
33
34 <section id="ufw-filter">
35 <title>Allow or block specific network activity</title>
36- <p>Many programs are built to offer network services. For instance, you can share content, or let someone view your desktop remotely. Depending on which additional programs you install, you may need to adjust the firewall to allow these services to work as intended. UfW comes with a number of rules already pre-configured. For instance, to allow <app>SSH</app> connections, enter <cmd>sudo ufw allow ssh</cmd> in a terminal. To block ssh, enter <cmd>sudo ufw deny ssh</cmd>.</p>
37+ <p>Many programs are built to offer network services. For instance, you can share content, or let someone view your desktop remotely. Depending on which additional programs you install, you may need to adjust the firewall to allow these services to work as intended. ufw comes with a number of rules already pre-configured
38+and you can add your own rules. For instance, to allow <app>SSH</app> connections, enter <cmd>sudo ufw allow ssh</cmd> in a terminal.
39+To block <app>SSH</app> connections, enter <cmd>sudo ufw deny ssh</cmd>.</p>
40+
41 <p>Each program that provides services uses a specific <em>network port</em>. To enable access to that program's services, you may need to allow access to its assigned port on the firewall. To allow connections on port 53, enter <cmd>sudo ufw allow 53</cmd> in a terminal. To block port 53, enter <cmd>sudo ufw deny 53</cmd>.</p>
42 <p>To check the current status of ufw, enter <cmd>sudo ufw status</cmd> in a terminal.</p>
43 </section>

Subscribers

People subscribed via source and target branches