[networking-guide] master: command-line <blah> is an adjective (ba85655)
stephenw at fedoraproject.org
stephenw at fedoraproject.org
Mon Sep 29 20:57:06 UTC 2014
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit ba85655617823f00bebf4866fa19f2fe6871ccca
Author: Stephen Wadeley <swadeley at redhat.com>
Date: Mon Sep 29 22:56:12 2014 +0200
command-line <blah> is an adjective
>---------------------------------------------------------------
en-US/BIND.xml | 4 ++--
en-US/Configure_Network_Teaming.xml | 4 ++--
en-US/Configure_Networking.xml | 2 +-
en-US/DHCP_Servers.xml | 4 ++--
en-US/Introduction_to_Fedora_Networking.xml | 10 +++++-----
en-US/Preface.xml | 16 ++++++++--------
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/en-US/BIND.xml b/en-US/BIND.xml
index 9da88fa..9da41ff 100644
--- a/en-US/BIND.xml
+++ b/en-US/BIND.xml
@@ -1541,7 +1541,7 @@ $TTL 86400
<tertiary><command>rndc</command></tertiary>
</indexterm>
<para>
- The <command>rndc</command> utility is a command line tool that allows you to administer the <systemitem class="service">named</systemitem> service, both locally and from a remote machine. Its usage is as follows:
+ The <command>rndc</command> utility is a command-line tool that allows you to administer the <systemitem class="service">named</systemitem> service, both locally and from a remote machine. Its usage is as follows:
</para>
<screen><command>rndc</command> [<replaceable>option</replaceable>...] <replaceable>command</replaceable> [<replaceable>command-option</replaceable>]</screen>
<section id="sec-bind-rndc-configuration">
@@ -1724,7 +1724,7 @@ The zone reload and thaw was successful.</screen>
<tertiary><command>dig</command></tertiary>
</indexterm>
<para>
- The <command>dig</command> utility is a command line tool that allows you to perform <systemitem class="protocol">DNS</systemitem> lookups and debug a nameserver configuration. Its typical usage is as follows:
+ The <command>dig</command> utility is a command-line tool that allows you to perform <systemitem class="protocol">DNS</systemitem> lookups and debug a nameserver configuration. Its typical usage is as follows:
</para>
<screen><command>dig</command> [@<replaceable>server</replaceable>] [<replaceable>option</replaceable>...] <replaceable>name</replaceable> <replaceable>type</replaceable></screen>
<para>
diff --git a/en-US/Configure_Network_Teaming.xml b/en-US/Configure_Network_Teaming.xml
index 6a13c4a..b90ebd9 100644
--- a/en-US/Configure_Network_Teaming.xml
+++ b/en-US/Configure_Network_Teaming.xml
@@ -232,7 +232,7 @@ From the available interfaces, determine which are suitable for adding to your n
</para>
<para>
- <emphasis role="bold">To create a network team using the command line tool</emphasis>, <application>nmcli</application>, proceed to <xref linkend="sec-Configure_Network_Teaming_Using_nmcli"/>.
+ <emphasis role="bold">To create a network team using the command-line tool</emphasis>, <application>nmcli</application>, proceed to <xref linkend="sec-Configure_Network_Teaming_Using_nmcli"/>.
</para>
</section>
@@ -490,7 +490,7 @@ runner:
</para>
<para>
- For help on command line options for <systemitem class="daemon">teamd</systemitem>, issue the following command:
+ For help on command-line options for <systemitem class="daemon">teamd</systemitem>, issue the following command:
<screen>~]$ <command>teamd -h</command></screen>
In addition, see the <filename>teamd(8)</filename> man page.
</para>
diff --git a/en-US/Configure_Networking.xml b/en-US/Configure_Networking.xml
index 7ee62e2..680c111 100644
--- a/en-US/Configure_Networking.xml
+++ b/en-US/Configure_Networking.xml
@@ -51,7 +51,7 @@
</listitem>
<listitem>
<para>
- To configure an interface using <application>NetworkManager</application>'s command line tool, <application>nmcli</application>, proceed to <xref linkend="sec-Using_the_NetworkManager_Command_Line_Tool_nmcli" />
+ To configure an interface using <application>NetworkManager</application>'s command-line tool, <application>nmcli</application>, proceed to <xref linkend="sec-Using_the_NetworkManager_Command_Line_Tool_nmcli" />
</para>
</listitem>
</itemizedlist>
diff --git a/en-US/DHCP_Servers.xml b/en-US/DHCP_Servers.xml
index c0de39f..34f4844 100644
--- a/en-US/DHCP_Servers.xml
+++ b/en-US/DHCP_Servers.xml
@@ -241,12 +241,12 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
</indexterm>
<indexterm>
<primary>DHCP</primary>
- <secondary>command line options</secondary>
+ <secondary>command-line options</secondary>
</indexterm>
<para>If more than one network interface is attached to the system, but the <systemitem class="protocol">DHCP</systemitem> server should only listen for <systemitem class="protocol">DHCP</systemitem> requests on one of the interfaces, configure the <systemitem class="protocol">DHCP</systemitem> server to listen only on that device. The <systemitem class="protocol">DHCP</systemitem> daemon will only listen on interfaces for which it finds a subnet declaration in the <filename>/etc/dhcp/dhcpd.conf</filename> file.</para>
<para>This is useful for a firewall machine with two network cards. One network card can be configured as a <systemitem class="protocol">DHCP</systemitem> client to retrieve an <systemitem class="protocol">IP</systemitem> address to the Internet. The other network card can be used as a <systemitem class="protocol">DHCP</systemitem> server for the internal network behind the firewall. Specifying only the network card connected to the internal network makes the system more secure because users can not connect to the daemon via the Internet.</para>
<para>
- To specify command line options, copy and then edit the <filename>dhcpd.service</filename> file as the <systemitem class="username">root</systemitem> user. For example, as follows:
+ To specify command-line options, copy and then edit the <filename>dhcpd.service</filename> file as the <systemitem class="username">root</systemitem> user. For example, as follows:
<screen>~]# <command>cp /usr/lib/systemd/system/dhcpd.service /etc/systemd/system/</command>
~]# <command>vi /etc/systemd/system/dhcpd.service</command></screen>
Edit the line under section [Service]:
diff --git a/en-US/Introduction_to_Fedora_Networking.xml b/en-US/Introduction_to_Fedora_Networking.xml
index bbec4cb..d34a13c 100644
--- a/en-US/Introduction_to_Fedora_Networking.xml
+++ b/en-US/Introduction_to_Fedora_Networking.xml
@@ -15,7 +15,7 @@
The material is grouped according to the goal rather than the method. Instructions on how to achieve a specific task using different methods are grouped together. This is intended to make it easier for you to find the information on how to achieve a particular task or goal, and at the same time allow you to quickly see the different methods available.</para>
<para>
In each chapter, the configuration methods will be presented in the following order:
- A graphical user interface (GUI) method, such as the use of <application>nm-connection-editor</application> or <application>control-network</application> to direct <systemitem class="service">NetworkManager</systemitem>, then <application>NetworkManager</application>'s command line tool <application>nmcli</application>, and then finally methods using the command line and configuration files. The command line can be used to issue commands and to compose or edit configuration files, therefore the use of the <application>ip</application> commands and configuration files will be documented together.
+ A graphical user interface (GUI) method, such as the use of <application>nm-connection-editor</application> or <application>control-network</application> to direct <systemitem class="service">NetworkManager</systemitem>, then <application>NetworkManager</application>'s command-line tool <application>nmcli</application>, and then finally methods using the command line and configuration files. The command line can be used to issue commands and to compose or edit configuration files, therefore the use of the <application>ip</application> commands and configuration files will be documented together.
</para>
@@ -48,7 +48,7 @@
</row>
<row>
<entry><application>nmcli</application></entry>
- <entry>A command line tool provided to allow users and scripts to interact with <application>NetworkManager</application></entry>
+ <entry>A command-line tool provided to allow users and scripts to interact with <application>NetworkManager</application></entry>
</row>
<row>
<entry><application>control-center</application></entry>
@@ -92,7 +92,7 @@ NetworkManager.service - Network Manager
<section
id="sec-Interacting_with_NetworkManager">
<title>Interacting with NetworkManager</title>
- <para>Users do not interact with the <application>NetworkManager</application> system service directly. Instead, users perform network configuration tasks via graphical and command line user interface tools. The following tools are available in Fedora:</para>
+ <para>Users do not interact with the <application>NetworkManager</application> system service directly. Instead, users perform network configuration tasks via graphical and command-line user interface tools. The following tools are available in Fedora:</para>
<para>
<orderedlist>
<listitem>
@@ -103,7 +103,7 @@ NetworkManager.service - Network Manager
<listitem>
<para>
- A command line tool, <application>nmcli</application>, is provided to allow users and scripts to interact with <application>NetworkManager</application>. Note that <application>nmcli</application> can be used on GUI-less systems like servers to control all aspects of <application>NetworkManager</application>. It is on an equal footing with the GUI tools.
+ A command-line tool, <application>nmcli</application>, is provided to allow users and scripts to interact with <application>NetworkManager</application>. Note that <application>nmcli</application> can be used on GUI-less systems like servers to control all aspects of <application>NetworkManager</application>. It is on an equal footing with the GUI tools.
</para>
</listitem>
<listitem>
@@ -151,7 +151,7 @@ ip utility, iproute2-ss130716</screen>
<para>
</para>
<para>
- The <application>NetworkManager</application> command line tool, <application>nmcli</application>, provides a command line way to configure networking by controlling <application>NetworkManager</application>. It is installed, along with <application>NetworkManager</application>, by default. If required, for details on how to verify that <application>NetworkManager</application> is running, see <xref linkend="sec-The_NetworkManager_Daemon" />.</para>
+ The <application>NetworkManager</application> command-line tool, <application>nmcli</application>, provides a command line way to configure networking by controlling <application>NetworkManager</application>. It is installed, along with <application>NetworkManager</application>, by default. If required, for details on how to verify that <application>NetworkManager</application> is running, see <xref linkend="sec-The_NetworkManager_Daemon" />.</para>
<para>
Examples of using the <application>nmcli</application> tool for each task will be included where possible, after explaining the use of graphical user interfaces and other command line methods. See <xref linkend="sec-Using_the_NetworkManager_Command_Line_Tool_nmcli" /> for an introduction to <application>nmcli</application>.
</para>
diff --git a/en-US/Preface.xml b/en-US/Preface.xml
index 1e935e4..073016c 100644
--- a/en-US/Preface.xml
+++ b/en-US/Preface.xml
@@ -49,7 +49,7 @@
<firstterm>Network Teaming</firstterm> has been introduced as an alternative to bonding for link aggregation. It is designed to be easy to maintain, debug and extend. For the user it offers performance and flexibility improvements and should be evaluated for all new installations.
</para>
<para>
- A new command line tool, <application>nmcli</application>, has been introduced to allow users and scripts to interact with <application>NetworkManager</application>. A simple curses-based user interface for <application>NetworkManager</application>, <command>nmtui</command>, is also available.
+ A new command-line tool, <application>nmcli</application>, has been introduced to allow users and scripts to interact with <application>NetworkManager</application>. A simple curses-based user interface for <application>NetworkManager</application>, <command>nmtui</command>, is also available.
</para>
<para>
A number of improvements have been made to <application>NetworkManager</application> to make it more suitable for use in server applications. In particular, <application>NetworkManager</application> no longer watches for configuration file changes by default, such as those made by editors or deployment tools. It allows administrators to make it aware of external changes through the <command>nmcli connection reload</command> command. Changes made through <application>NetworkManager</application>'s D-Bus API or with <application>nmcli</application> are still effective immediately.
@@ -75,30 +75,30 @@
This part describes how to configure the network on &MAJOROS;.
</para>
<para>
- <xref linkend="ch-Introduction_to_Fedora_Networking" /> explains the default networking service, <application>NetworkManager</application>, and the various graphical and command line tools that can be used to interact with <application>NetworkManager</application>. These include, an associated command line configuration tool, <application>nmcli</application>, and two graphical user interface tools, <application>control-center</application> and <application>nm-connection-editor</application>. Read this chapter to learn more about the many ways the <application>NetworkManager</application> daemon can be used.
+ <xref linkend="ch-Introduction_to_Fedora_Networking" /> explains the default networking service, <application>NetworkManager</application>, and the various graphical and command-line tools that can be used to interact with <application>NetworkManager</application>. These include, an associated command-line configuration tool, <application>nmcli</application>, and two graphical user interface tools, <application>control-center</application> and <application>nm-connection-editor</application>. Read this chapter to learn more about the many ways the <application>NetworkManager</application> daemon can be used.
</para>
<para>
- <xref linkend="ch-Configure_Networking" /> covers static and dynamic interface settings, selecting network configuration methods, using <application>NetworkManager</application> with graphical and command line user interfaces. Read this chapter to learn about configuring network connections.
+ <xref linkend="ch-Configure_Networking" /> covers static and dynamic interface settings, selecting network configuration methods, using <application>NetworkManager</application> with graphical and command-line user interfaces. Read this chapter to learn about configuring network connections.
</para>
<para>
<xref linkend="ch-Configure_Host_Names" /> covers static, pretty, and transient host names and their configuration using <application>hostnamectl</application>. Read this chapter to learn more about configuring host names on local and remote systems.
</para>
<para>
- <xref linkend="ch-Configure_Network_Bonding" /> covers the configuring and use of bonded network connections. Read this chapter to learn about the configuring of network bonds using graphical and command line user interfaces.
+ <xref linkend="ch-Configure_Network_Bonding" /> covers the configuring and use of bonded network connections. Read this chapter to learn about the configuring of network bonds using graphical and command-line user interfaces.
</para>
<para>
- <xref linkend="ch-Configure_Network_Teaming" /> covers the configuring and use of teamed network connections. Read this chapter to learn about the configuring of network teams using graphical and command line user interfaces.
+ <xref linkend="ch-Configure_Network_Teaming" /> covers the configuring and use of teamed network connections. Read this chapter to learn about the configuring of network teams using graphical and command-line user interfaces.
</para>
<para>
- <xref linkend="ch-Configure_Network_Bridging" /> covers the configuring and use of network bridges. Read this chapter to learn about the configuring of network bridges using graphical and command line user interfaces.
+ <xref linkend="ch-Configure_Network_Bridging" /> covers the configuring and use of network bridges. Read this chapter to learn about the configuring of network bridges using graphical and command-line user interfaces.
</para>
<para>
- <xref linkend="ch-Configure_802_1Q_VLAN_Tagging" /> covers the configuring and use of virtual private networks, VLANs, according to the 802.1Q standard. Read this chapter to learn about the configuring of VLANs using graphical and command line user interfaces.
+ <xref linkend="ch-Configure_802_1Q_VLAN_Tagging" /> covers the configuring and use of virtual private networks, VLANs, according to the 802.1Q standard. Read this chapter to learn about the configuring of VLANs using graphical and command-line user interfaces.
</para>
<!--<para>
- <xref linkend="ch-Configure_IPoIB" /> covers the configuring and use of IP over InfiniBand network connections. Read this chapter to learn about the configuring of IPoIB connections using graphical and command line user interfaces.
+ <xref linkend="ch-Configure_IPoIB" /> covers the configuring and use of IP over InfiniBand network connections. Read this chapter to learn about the configuring of IPoIB connections using graphical and command-line user interfaces.
</para>-->
<para>
<xref linkend="ch-Consistent_Network_Device_Naming" /> covers consistent network device naming for network interfaces, a feature that changes the name of network interfaces on a system in order to make locating and differentiating the interfaces easier. Read this chapter to learn about this feature and how to enable or disable it.
More information about the docs-commits
mailing list