[fedora-cookbook] master: added a productivity chapter, and Ankur's first draft of a taskd recipe (93c9346)
by Pete Travis
Repository : http://git.fedorahosted.org/cgit/docs/fedora-cookbook.git
On branch : master
>---------------------------------------------------------------
commit 93c9346aaf50248cd2262e65ea652e6277cbbc6e
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Thu Aug 21 23:23:23 2014 -0600
added a productivity chapter, and Ankur's first draft of a taskd recipe
>---------------------------------------------------------------
en-US/Fedora_Cookbook.xml | 3 +-
en-US/{Cloud.xml => Productivity.xml} | 9 +++---
en-US/Productivity/taskd.xml | 47 +++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/en-US/Fedora_Cookbook.xml b/en-US/Fedora_Cookbook.xml
index dc3864b..4ffc863 100644
--- a/en-US/Fedora_Cookbook.xml
+++ b/en-US/Fedora_Cookbook.xml
@@ -9,6 +9,8 @@
<xi:include href="Documenting_Fedora.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<xi:include href="Productivity.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Communications.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Multimedia.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -16,7 +18,6 @@
<xi:include href="Cloud.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Virtualization.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Security.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
<index />
</book>
diff --git a/en-US/Cloud.xml b/en-US/Productivity.xml
similarity index 58%
copy from en-US/Cloud.xml
copy to en-US/Productivity.xml
index 5122196..0b3f3ab 100644
--- a/en-US/Cloud.xml
+++ b/en-US/Productivity.xml
@@ -3,7 +3,8 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Cookbook.ent">
%BOOK_ENTITIES;
]>
-<chapter id="Cloud">
-<title>Cloud</title>
-
-<para /> </chapter>
+<chapter id="Productivity">
+<title>Productivity</title>
+ <para />
+<xi:include href="Productivity/taskd.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
diff --git a/en-US/Productivity/taskd.xml b/en-US/Productivity/taskd.xml
new file mode 100644
index 0000000..16a33ac
--- /dev/null
+++ b/en-US/Productivity/taskd.xml
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='utf-8' ?>
+ <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Cookbook.ent">
+ %BOOK_ENTITIES;
+]>
+<!-- Do not edit above this line -->
+<!--
+ Please provide some information so we can give you credit:
+ name: Ankur_Sinha
+ fas_id: ankursinha
+ email: ankursinha(a)fedoraproject.org
+ article_category: user
+-->
+
+<section id="task_managing">
+ <title>Managing tasks using Taskwarrior</title>
+ <para>
+ Taskwarrior is an open-source cross platform command-line task management tool that allows you to easily capture, annotate, manipulate and present your tasks as well as sync them among your devices. In this recipe, we see how to set up a Taskwarrior server and a set of clients.
+ </para>
+ <section id="task_managing-ingredients">
+ <title>Required Ingredients</title>
+ <!-- list packages, services, other recipes etc that are required -->
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>taskd</emphasis> from the Fedora repositories - sudo yum install taskd
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>task</emphasis> from the Fedora repositories - sudo yum install task
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>vit</emphasis> - optional - from the Fedora repositories - sudo yum install vit
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>Your favorite text editor.</emphasis> You can use whatever you prefer, but please save them as a plain text file instead of a binary format such as <literal>ODF</literal>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ </section>
9 years, 8 months
[networking-guide] master: link to ���Using Channel Bonding��� (927ed44)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 927ed444e5cdef3bab4810081f2ac0914d1222b2
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 20 23:06:24 2014 +0200
link to “Using Channel Bonding”
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index 08b4e94..7180cae 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -371,7 +371,7 @@ BONDING_OPTS="<replaceable>bonding parameters separated by spaces</replaceable>"
<important>
<title>Put all Bonding Module Parameters in ifcfg-bondN Files</title>
<para>
- Parameters for the bonding kernel module must be specified as a space-separated list in the <option>BONDING_OPTS="<replaceable>bonding parameters</replaceable>"</option> directive in the <filename>ifcfg-bond<replaceable>N</replaceable></filename> interface file. Do <emphasis>not</emphasis> specify options for the bonding device in <filename>/etc/modprobe.d/<replaceable>bonding</replaceable>.conf</filename>, or in the deprecated <filename>/etc/modprobe.conf</filename> file. For further instructions and advice on configuring the bonding module and to view the list of bonding parameters, see <citetitle pubwork="book">&MAJOROSVER; System Administrator's Reference Guide</citetitle>.
+ Parameters for the bonding kernel module must be specified as a space-separated list in the <option>BONDING_OPTS="<replaceable>bonding parameters</replaceable>"</option> directive in the <filename>ifcfg-bond<replaceable>N</replaceable></filename> interface file. Do <emphasis>not</emphasis> specify options for the bonding device in <filename>/etc/modprobe.d/<replaceable>bonding</replaceable>.conf</filename>, or in the deprecated <filename>/etc/modprobe.conf</filename> file. For further instructions and advice on configuring the bonding module and to view the list of bonding parameters, see <xref linkend="sec-Using_Channel_Bonding"/>.
</para>
</important>
9 years, 8 months
[networking-guide] master: Path to grub config file was incorrect (a27f666)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit a27f666b6ac910aba158228cdac1c9ea66ee01d5
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 20 23:02:00 2014 +0200
Path to grub config file was incorrect
>---------------------------------------------------------------
en-US/Consistent_Network_Device_Naming.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/en-US/Consistent_Network_Device_Naming.xml b/en-US/Consistent_Network_Device_Naming.xml
index c509d62..4d046ee 100644
--- a/en-US/Consistent_Network_Device_Naming.xml
+++ b/en-US/Consistent_Network_Device_Naming.xml
@@ -259,7 +259,7 @@ The name of the parent interface plus the VLAN ID with out padding by means of a
<section id="sec-Consistent_Network_Device_Naming_Using_biosdevname">
<title>Consistent Network Device Naming Using biosdevname</title>
<para>
- This feature, implemented via the <application>biosdevname</application> <application>udev</application> helper utility, will change the name of all embedded network interfaces, PCI card network interfaces, and virtual function network interfaces from the existing <interfacename>eth[0123…]</interfacename> to the new naming convention as shown in <xref linkend="tabl-Consistent_Network_Device_Naming_biosdevname" />. Note that unless the system is a Dell system, or <application>biosdevname</application> explicitly enabled as described in <xref linkend="sec-Consistent_Network_Device_Naming-Enabling_and_Disabling" />, the <systemitem class="daemon">systemd</systemitem> naming scheme will take precedence.
+ This feature, implemented via the <application>biosdevname</application> <application>udev</application> helper utility, will change the name of all embedded network interfaces, PCI card network interfaces, and virtual function network interfaces from the existing <interfacename>eth[0123…]</interfacename> to the new naming convention as shown in <xref linkend="tabl-Consistent_Network_Device_Naming_biosdevname" />. Note that unless the system is a Dell system, or <application>biosdevname</application> is explicitly enabled as described in <xref linkend="sec-Consistent_Network_Device_Naming-Enabling_and_Disabling" />, the <systemitem class="daemon">systemd</systemitem> naming scheme will take precedence.
</para>
<table id="tabl-Consistent_Network_Device_Naming_biosdevname">
<title>The biosdevname Naming Convention</title>
@@ -352,7 +352,7 @@ The name of the parent interface plus the VLAN ID with out padding by means of a
<section id="sec-Consistent_Network_Device_Naming-Notes">
<title>Notes for Administrators</title>
<para>
- Many system customization files can include network interface names, and thus will require updates if moving a system from the old convention to the new convention. If you use the new naming convention, you will also need to update network interface names in areas such as custom iptables rules, scripts altering irqbalance, and other similar configuration files. Also, enabling this change for installation will require modification to existing kickstart files that use device names via the <option>ksdevice</option> parameter; these kickstart files will need to be updated to use the network device's MAC address or the network device's new name.
+ Many system customization files can include network interface names, and thus will require updates if moving a system from the old convention to the new convention. If you use the new naming convention, you will also need to update network interface names in areas such as custom <application>iptables</application> rules, scripts altering <systemitem class="daemon">irqbalance</systemitem>, and other similar configuration files. Also, enabling this change for installation will require modification to existing <application>kickstart</application> files that use device names via the <option>ksdevice</option> parameter; these <application>kickstart</application> files will need to be updated to use the network device's MAC address or the network device's new name.
</para>
<note>
<para>
@@ -423,7 +423,7 @@ The name provided by <systemitem class="daemon">systemd-udev</systemitem> will b
</listitem>
<listitem>
<para>
- Add the following line to the <filename>/etc/grub.conf</filename> file:
+ Add the following line to the <filename>/etc/default/grub</filename> file:
<synopsis>net.ifnames=0</synopsis>
or pass it to the kernel at boot time using the GRUB2 command line interface. For more information about GRUB2 see <ulink url="https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Lin..."><citetitle pubwork="book">&MAJOROSVER; System Administrator's Guide</citetitle></ulink>.</para>
</listitem>
9 years, 8 months
[networking-guide] master: BIND: formatting improvement (55bc9b1)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 55bc9b1b8424d8c640a0966b1dc9d2879ad40dd2
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 20 22:54:49 2014 +0200
BIND: formatting improvement
>---------------------------------------------------------------
en-US/BIND.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/en-US/BIND.xml b/en-US/BIND.xml
index d324577..9da88fa 100644
--- a/en-US/BIND.xml
+++ b/en-US/BIND.xml
@@ -174,7 +174,7 @@
</note>
<important>
<para>
- Editing files which have been mounted in a chroot environment requires creating a backup copy and then editing the original file. Alternatively, use an editor with <quote>edit-a-copy</quote> mode disabled. For example, to edit the BIND's configuration file, <filename>/etc/named.conf</filename>, with Vim while it is running in a chroot environment, issue the following command as <systemitem class="username">root</systemitem>:
+ Editing files which have been mounted in a <command>chroot</command> environment requires creating a backup copy and then editing the original file. Alternatively, use an editor with <quote>edit-a-copy</quote> mode disabled. For example, to edit the BIND's configuration file, <filename>/etc/named.conf</filename>, with Vim while it is running in a <command>chroot</command> environment, issue the following command as <systemitem class="username">root</systemitem>:
<screen>~]# <command>vim -c "set backupcopy=yes" /etc/named.conf</command></screen>
</para>
</important>
9 years, 8 months
[networking-guide] master: Improve: BIND in chroot environment (e7db71e)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit e7db71e09bfa00401c3735e93dea0ab5beb7d93c
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 20 22:52:35 2014 +0200
Improve: BIND in chroot environment
>---------------------------------------------------------------
en-US/BIND.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/en-US/BIND.xml b/en-US/BIND.xml
index 8c0a08a..d324577 100644
--- a/en-US/BIND.xml
+++ b/en-US/BIND.xml
@@ -99,8 +99,8 @@
<note>
<title>Running BIND in a chroot environment</title>
<para>
- If you have installed the <package>bind-chroot</package> package, the BIND service will run in the <filename class="directory">/var/named/chroot</filename> environment. In that case, the initialization script will mount the above configuration files using the <command>mount --bind</command> command, so that you can manage the configuration outside this environment. There is no need to copy anything into the <filename class="directory">/var/named/chroot</filename> directory because it is mounted automatically. This simplifies maintenance since you do not need to take any special care of <systemitem class="service">BIND</systemitem> configuration files if it is run in a <filename class="directory">chroot</filename> environment. You can organize everything as you would with <systemitem class="service">BIND</systemitem> not running in a <filename>chroot</filename> environment.</para>
- <para>The following directories are automatically mounted into <filename class="directory">/var/named/chroot</filename> if they are empty in the <filename class="directory">/var/named/chroot</filename> directory. They must be kept empty if you want them to be mounted into <filename class="directory">/var/named/chroot</filename>:
+ If you have installed the <package>bind-chroot</package> package, the BIND service will run in the <command>chroot</command> environment. In that case, the initialization script will mount the above configuration files using the <command>mount --bind</command> command, so that you can manage the configuration outside this environment. There is no need to copy anything into the <filename class="directory">/var/named/chroot/</filename> directory because it is mounted automatically. This simplifies maintenance since you do not need to take any special care of <systemitem class="service">BIND</systemitem> configuration files if it is run in a <command>chroot</command> environment. You can organize everything as you would with <systemitem class="service">BIND</systemitem> not running in a <command>chroot</command> environment.</para>
+ <para>The following directories are automatically mounted into <filename class="directory">/var/named/chroot/</filename> if they are empty in the <filename class="directory">/var/named/chroot/</filename> directory. They must be kept empty if you want them to be mounted into <filename class="directory">/var/named/chroot/</filename>:
<itemizedlist>
<listitem>
<para>
@@ -131,7 +131,7 @@
</para>
<para>
- The following files are also mounted if the target file does not exist in <filename class="directory">/var/named/chroot</filename>.
+ The following files are also mounted if the target file does not exist in <filename class="directory">/var/named/chroot/</filename>:
<itemizedlist>
<listitem>
<para>
@@ -182,7 +182,7 @@
<section id="sec-Installing_Bind_In_A_Chroot_Environment">
<title>Installing BIND in a chroot Environment</title>
<para>
-To install <application>BIND</application> to run in a chroot environment, issue the following command as <systemitem class="username">root</systemitem>:
+To install <application>BIND</application> to run in a <command>chroot</command> environment, issue the following command as <systemitem class="username">root</systemitem>:
<screen>~]# <command>yum install bind-chroot</command></screen>
</para>
<para>
@@ -198,7 +198,7 @@ Then, to enable the <systemitem class="daemon">named-chroot</systemitem> service
<screen>~]# <command>systemctl start named-chroot</command></screen>
</para>
<para>
- To check the status of the named-chroot service, issue the following command as <systemitem class="username">root</systemitem>:
+ To check the status of the <systemitem class="daemon">named-chroot</systemitem> service, issue the following command as <systemitem class="username">root</systemitem>:
<screen>~]# <command>systemctl status named-chroot</command></screen>
</para>
</section>
9 years, 8 months
[networking-guide] master: Bug 1118849 - Editing named-chroot config files (16de32f)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 16de32f235946a13a48c6195c7f22bfdcb7609f3
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Mon Aug 4 11:48:23 2014 +0200
Bug 1118849 - Editing named-chroot config files
Thank you Jim N. and thozza.
https://bugzilla.redhat.com/show_bug.cgi?id=1118849#c10
>---------------------------------------------------------------
en-US/BIND.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/en-US/BIND.xml b/en-US/BIND.xml
index 53a8dda..8c0a08a 100644
--- a/en-US/BIND.xml
+++ b/en-US/BIND.xml
@@ -172,6 +172,13 @@
</itemizedlist>
</para>
</note>
+<important>
+ <para>
+ Editing files which have been mounted in a chroot environment requires creating a backup copy and then editing the original file. Alternatively, use an editor with <quote>edit-a-copy</quote> mode disabled. For example, to edit the BIND's configuration file, <filename>/etc/named.conf</filename>, with Vim while it is running in a chroot environment, issue the following command as <systemitem class="username">root</systemitem>:
+ <screen>~]# <command>vim -c "set backupcopy=yes" /etc/named.conf</command></screen>
+ </para>
+</important>
+
<section id="sec-Installing_Bind_In_A_Chroot_Environment">
<title>Installing BIND in a chroot Environment</title>
<para>
9 years, 8 months
[system-administrators-guide] Example virtual host configuration
by stephenw
commit 923da75a34a3578837120a715326adf0614b5fd1
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 13 23:09:07 2014 +0200
Example virtual host configuration
en-US/The_Apache_HTTP_Server.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index d04554d..dc40ac8 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -3794,19 +3794,19 @@ ErrorDocument 404 /404-not_found.html</programlisting>
The Apache HTTP Server's built in virtual hosting allows the server to provide different information based on which IP address, hostname, or port is being requested.
</para>
<para>
- To create a name-based virtual host, find the virtual host container provided in <filename>/etc/httpd/conf/httpd.conf</filename> as an example, remove the hash sign (that is, <literal>#</literal>) from the beginning of each line, and customize the options according to your requirements as shown in <xref linkend="example-apache-virtualhosts-config" />.
+ To create a name-based virtual host, copy the example configuration file <filename>/usr/share/doc/httpd-<replaceable>VERSION</replaceable>/httpd-vhosts.conf</filename> into the <filename class="directory">/etc/httpd/conf.d/</filename> directory, and replace the <literal>@@Port@@</literal> and <literal>@@ServerRoot@@</literal> placeholder values. Customize the options according to your requirements as shown in <xref linkend="example-apache-virtualhosts-config"/>.
</para>
<example id="example-apache-virtualhosts-config">
- <title>Sample virtual host configuration</title>
- <programlisting>NameVirtualHost penguin.example.com:80
-
-<VirtualHost penguin.example.com:80>
+ <title>Example virtual host configuration</title>
+ <screen>
+<VirtualHost *:80>
ServerAdmin webmaster(a)penguin.example.com
- DocumentRoot /www/docs/penguin.example.com
- ServerName penguin.example.com:80
- ErrorLog logs/penguin.example.com-error_log
- CustomLog logs/penguin.example.com-access_log common
-</VirtualHost></programlisting>
+ DocumentRoot "/www/docs/penguin.example.com"
+ ServerName penguin.example.com
+ ServerAlias www.penguin.example.com
+ ErrorLog "/var/log/httpd/dummy-host.example.com-error_log"
+ CustomLog "/var/log/httpd/dummy-host.example.com-access_log" common
+</VirtualHost></screen>
</example>
<para>
Note that <option>ServerName</option> must be a valid DNS name assigned to the machine. The <option><VirtualHost></option> container is highly customizable, and accepts most of the directives available within the main server configuration. Directives that are <emphasis>not</emphasis> supported within this container include <option>User</option> and <option>Group</option>, which were replaced by <option>SuexecUserGroup</option>.
9 years, 9 months
[system-administrators-guide] Add man page and path to builtin docs
by stephenw
commit c4d56999d6f9214b8177b9687f9d269ed19ea836
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 13 23:02:19 2014 +0200
Add man page and path to builtin docs
en-US/The_Apache_HTTP_Server.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 148f94b..d04554d 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -4233,7 +4233,17 @@ SSLCertificateKeyFile /etc/pki/tls/private/<replaceable>hostname</replaceable>.k
</listitem>
</varlistentry>
<varlistentry>
- <term><command>man httpd</command></term>
+ <term><filename>/usr/share/doc/httpd/</filename></term>
+ <listitem>
+ <para>
+ The directory containing a number of example configurations files.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <command>man httpd</command>
+ </term>
<listitem>
<para>
The manual page for the <systemitem class="service">httpd</systemitem> service containing the complete list of its command line options.
@@ -4241,7 +4251,19 @@ SSLCertificateKeyFile /etc/pki/tls/private/<replaceable>hostname</replaceable>.k
</listitem>
</varlistentry>
<varlistentry>
- <term><command>man genkey</command></term>
+ <term>
+ <command>man apachectl</command>
+ </term>
+ <listitem>
+ <para>
+ The manual page for the Apache HTTP Server Control Interface.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <command>man genkey</command>
+ </term>
<listitem>
<para>
The manual page for <command>genkey</command> containing the full documentation on its usage.
9 years, 9 months
[system-administrators-guide] Change two examples to apachectl configtest
by stephenw
commit cfef84fc02344dccd20db8b73f672009d0b06311
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 13 22:59:11 2014 +0200
Change two examples to apachectl configtest
thank you Kwan for reporting this ommission
en-US/The_Apache_HTTP_Server.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 32f2422..148f94b 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -275,7 +275,7 @@ List of <systemitem class="daemon">httpd</systemitem> modules removed in &MAJORO
<para>
Note that you can check the configuration for possible errors by using the following command:
</para>
- <screen>~]# <command>service httpd configtest</command>
+ <screen>~]# <command>apachectl configtest</command>
Syntax OK</screen>
<para>
For more information on upgrading the Apache HTTP Server configuration from version 2.2 to 2.4, see <ulink url="http://httpd.apache.org/docs/2.4/upgrading.html"/>.
@@ -443,7 +443,7 @@ active</screen>
<para>
To check the configuration for possible errors, type the following at a shell prompt:
</para>
- <screen>~]# <command>service httpd configtest</command>
+ <screen>~]# <command>apachectl configtest</command>
Syntax OK</screen>
<para>
To make the recovery from mistakes easier, it is recommended that you make a copy of the original file before editing it.
9 years, 9 months
[system-administrators-guide] Improve language and style
by stephenw
commit 7dae5c820dbc412abdf3e0b5b6251f2df46c9d7f
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Aug 13 22:55:11 2014 +0200
Improve language and style
en-US/Opening_GUI_Applications.xml | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/en-US/Opening_GUI_Applications.xml b/en-US/Opening_GUI_Applications.xml
index b4c90bb..1591d3a 100644
--- a/en-US/Opening_GUI_Applications.xml
+++ b/en-US/Opening_GUI_Applications.xml
@@ -20,7 +20,7 @@
<note>
<title>File names vs Application names</title>
<para>
- Programs are opened from the command line using the name of executable file provided in the program's package. An entry in the desktop menu will often be named differently from the file it executes. For example, the GNOME disk management utility appears in the menu as <application>Disks</application>, and the file it executes is <filename>/usr/bin/gnome-disks</filename>.
+ Programs are opened from the command line using the name of the executable file provided in the program's package. An entry in the desktop menu will often be named differently from the file it executes. For example, the GNOME disk management utility appears in the menu as <application>Disks</application>, and the file it executes is <filename>/usr/bin/gnome-disks</filename>.
</para>
</note>
<para>
@@ -42,29 +42,29 @@
Font initialized: DATA/FONT/LiberationMono-Bold.ttf
- Current Video Mode: 3200x1080 32bit
-
+ Current Video Mode: 3200x1080 32bit
+
Xinerama/TwinView detected.
Screen count: 2
Screen #0: (0, 0) x (1920, 1080)
Screen #1: (1920, 0) x (1280, 1024)
-
+
Supported resolutions list:
- 640x480 16bit
- 640x480 32bit
- 640x480 0bit
+ 640x480 16bit
+ 640x480 32bit
+ 640x480 0bit
768x480 16bit
<output truncated></screen>
</example>
<para>
- To launch a graphical application, but fork the additional output into the background and return the terminal for immediate use, use the shell's <function>job control</function> feature.
+ To launch a graphical application, but fork the additional output into the background and return the terminal for immediate use, use the shell's <function>job control</function> feature.
<screen>
[fedorauser@localhost]$ <command>emacs foo.txt &</command></screen>
</para>
<important>
<title>Ending a session</title>
<para>
- Applications that hold the command line prompt until they complete will close when the terminal session ends, even if they are forked into the background.
+ Applications that hold the command line prompt until they complete will close when the terminal session ends, even if they are forked into the background.
</para>
</important>
<para>
@@ -98,18 +98,18 @@ root 23874 0.0 0.0 109184 900 pts/21 S+ 15:35 0:00 grep --color=au
Switch back to the TTY the graphical session is running on. Since the example above shows <application>X</application> running on <literal>vt1</literal>, pressing <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F1</keycap></keycombo> will return to the desktop environment.
</para>
</step>
- </procedure>
+ </procedure>
</section>
-
+
<section id="gui-alt_f2">
<title>
Launching Applications with <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>
</title>
- <para>
- Most desktop environments follow the convention of using the key combination <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> for opening new applications. Pressing <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> brings up a prompt for a command to be entered into.
+ <para>
+ Most desktop environments follow the convention of using the key combination <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> for opening new applications. Pressing <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> brings up a prompt for a command to be entered into.
</para>
<para>
- Commands entered into this dialog box function much as they would if entered in a terminal. Applications are known by their file name, and can accept arguments.
+ Commands entered into this dialog box function much as they would if entered in a terminal. Applications are known by their file name, and can accept arguments.
</para>
<figure id="fig-alt_f2-gnome">
<title>
@@ -218,7 +218,7 @@ root 23874 0.0 0.0 109184 900 pts/21 S+ 15:35 0:00 grep --color=au
</mediaobject>
</figure>
<para>
- The <guilabel>overview</guilabel> can also be browsed. The bar on the left, called the <guilabel>dash</guilabel>, shows frequently used applications and grid icon. Clicking on the grid icon brings up a grid in the center of the window that displays more frequent applications. The grid will display all available applications if selected using the <guilabel>All</guilabel> button at the bottom of the screen.
+ The <guilabel>overview</guilabel> can also be browsed. The bar on the left, called the <guilabel>dash</guilabel>, shows frequently used applications and a grid icon. Clicking on the grid icon brings up a grid in the center of the window that displays frequently used applications. The grid will display all available applications if selected using the <guilabel>All</guilabel> button at the bottom of the screen.
</para>
<figure id="fig-menu-gnome">
<title>
@@ -333,6 +333,3 @@ root 23874 0.0 0.0 109184 900 pts/21 S+ 15:35 0:00 grep --color=au
</section>
</section>
</chapter>
-
-
-
9 years, 9 months