[system-administrators-guide] Typos and style improvements for consistency
by stephenw
commit 970e96029adafa9a6326e0e2fc48614fe88ce188
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Thu Nov 20 23:19:06 2014 +0100
Typos and style improvements for consistency
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 dc40ac8..0b3ff4d 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -340,7 +340,7 @@ rm '/etc/systemd/system/multi-user.target.wants/httpd.service'</screen>
<orderedlist>
<listitem>
<para>
- To restart the service completely, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
+ To restart the service completely, enter the following command as <systemitem class="username">root</systemitem>:
</para>
<screen>~]# <command>systemctl restart httpd.service</command></screen>
<para>
@@ -358,7 +358,7 @@ rm '/etc/systemd/system/multi-user.target.wants/httpd.service'</screen>
</listitem>
<listitem>
<para>
- To reload the configuration without affecting active requests, run the following command as <systemitem class="username">root</systemitem>:
+ To reload the configuration without affecting active requests, enter the following command as <systemitem class="username">root</systemitem>:
</para>
<screen>~]# <command>service httpd graceful</command></screen>
<para>
@@ -3765,7 +3765,7 @@ ErrorDocument 404 /404-not_found.html</programlisting>
<tertiary>developing</tertiary>
</indexterm>
<para>
- If you intend to create a new DSO module, make sure you have the <package>httpd-devel</package> package installed. To do so, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
+ If you intend to create a new DSO module, make sure you have the <package>httpd-devel</package> package installed. To do so, enter the following command as <systemitem class="username">root</systemitem>:
</para>
<screen>~]# <command>yum install httpd-devel</command></screen>
<para>
@@ -3939,7 +3939,7 @@ ErrorDocument 404 /404-not_found.html</programlisting>
<section id="s3-apache-mod_ssl-enabling">
<title>Enabling the mod_ssl Module</title>
<para>
- If you intend to set up an SSL server, make sure you have the <package>mod_ssl</package> (the <systemitem class="resource">mod_ssl</systemitem> module) and <package>openssl</package> (the OpenSSL toolkit) packages installed. To do so, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
+ If you intend to set up an SSL server, make sure you have the <package>mod_ssl</package> (the <systemitem class="resource">mod_ssl</systemitem> module) and <package>openssl</package> (the OpenSSL toolkit) packages installed. To do so, enter the following command as <systemitem class="username">root</systemitem>:
</para>
<screen>~]# <command>yum install mod_ssl openssl</command></screen>
<indexterm>
@@ -3988,7 +3988,7 @@ ErrorDocument 404 /404-not_found.html</programlisting>
In either of the above cases, you will need to obtain a new certificate. For more information on this topic, see <xref linkend="s3-apache-mod_ssl-genkey"/>.
</para>
<para>
- If you wish to use an existing key and certificate, move the relevant files to the <filename class="directory">/etc/pki/tls/private/</filename> and <filename class="directory">/etc/pki/tls/certs/</filename> directories respectively. You can do so by running the following commands as <systemitem class="username">root</systemitem>:
+ If you want to use an existing key and certificate, move the relevant files to the <filename class="directory">/etc/pki/tls/private/</filename> and <filename class="directory">/etc/pki/tls/certs/</filename> directories respectively. You can do so by issuing the following commands as <systemitem class="username">root</systemitem>:
</para>
<screen>~]# <command>mv</command> <filename><replaceable>key_file</replaceable>.key</filename> <filename>/etc/pki/tls/private/<replaceable>hostname</replaceable>.key</filename>
~]# <command>mv</command> <filename><replaceable>certificate</replaceable>.crt</filename> <filename>/etc/pki/tls/certs/<replaceable>hostname</replaceable>.crt</filename></screen>
@@ -4019,7 +4019,7 @@ SSLCertificateKeyFile /etc/pki/tls/private/<replaceable>hostname</replaceable>.k
<tertiary>certificate</tertiary>
</indexterm>
<para>
- In order to generate a new key and certificate pair, you must to have the <package>crypto-utils</package> package installed in your system. As <systemitem class="username">root</systemitem>, you can install it by typing the following at a shell prompt:
+ In order to generate a new key and certificate pair, you must to have the <package>crypto-utils</package> package installed on your system. As <systemitem class="username">root</systemitem>, it can be installed by entering the following command:
</para>
<screen>~]# <command>yum install crypto-utils</command></screen>
<para>
@@ -4028,19 +4028,19 @@ SSLCertificateKeyFile /etc/pki/tls/private/<replaceable>hostname</replaceable>.k
<important>
<title>Replacing an existing certificate</title>
<para>
- If the server already has a valid certificate and you are replacing it with a new one, specify a different serial number. This ensures that client browsers are notified of this change, update to this new certificate as expected, and do not fail to access the page. To create a new certificate with a custom serial number, as <systemitem class="username">root</systemitem>, use the following command instead of <application>genkey</application>:
+ If the server already has a valid certificate and you are replacing it with a new one, specify a different serial number. This ensures that client browsers are notified of this change, update to this new certificate as expected, and do not fail to access the page. To create a new certificate with a custom serial number, use the following command instead of <application>genkey</application>:
</para>
<screen>~]# <command>openssl req -x509 -new -set_serial <replaceable>number</replaceable> -key <replaceable>hostname</replaceable>.key -out <replaceable>hostname</replaceable>.crt</command></screen>
</important>
<note>
<title>Remove a previously created key</title>
<para>
- If there already is a key file for a particular hostname in your system, <application>genkey</application> will refuse to start. In this case, remove the existing file using the following command as <systemitem class="username">root</systemitem>:
+ If there already is a key file for a particular host name on your system, <application>genkey</application> will refuse to start. In this case, remove the existing file using the following command as <systemitem class="username">root</systemitem>:
</para>
<screen>~]# <command>rm /etc/pki/tls/private/<replaceable>hostname</replaceable>.key</command></screen>
</note>
<para>
- To run the utility, as <systemitem class="username">root</systemitem>, run the <command>genkey</command> command followed by the appropriate host name (for example, <systemitem class="domainname">penguin.example.com</systemitem>):
+ To run the utility, as <systemitem class="username">root</systemitem>, enter the <command>genkey</command> command followed by the appropriate host name (for example, <systemitem class="domainname">penguin.example.com</systemitem>):
</para>
<screen>~]# <command>genkey</command> <replaceable>hostname</replaceable></screen>
<para>
@@ -4091,7 +4091,7 @@ SSLCertificateKeyFile /etc/pki/tls/private/<replaceable>hostname</replaceable>.k
</step>
<step>
<para>
- Decide whether you wish to send a certificate request to a certificate authority.
+ Decide whether you want to send a certificate request to a certificate authority.
</para>
<figure id="figure-apache-mod_ssl-genkey-03">
<title>Generating a certificate request</title>
9 years, 5 months
[musicians-guide: 1/2] Replacing contractions in SuperCollider/SuperCollider.xml
by Eduardo A. Mayorga
commit 80ce19a796ba4a37e92dc03e6db7e6c65425cc7f
Author: Eduardo Mayorga <mayorga(a)fedoraproject.org>
Date: Sun Nov 23 13:11:39 2014 -0600
Replacing contractions in SuperCollider/SuperCollider.xml
en-US/SuperCollider/SuperCollider.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/en-US/SuperCollider/SuperCollider.xml b/en-US/SuperCollider/SuperCollider.xml
index 5778567..625d4a7 100644
--- a/en-US/SuperCollider/SuperCollider.xml
+++ b/en-US/SuperCollider/SuperCollider.xml
@@ -42,7 +42,7 @@
Because <application>SuperCollider</application> involves actual programming, a rudimentary understanding of some principles and concepts of computer science will provide huge benefits to somebody learning the language. The following articles from Wikipedia are not mandatory reading, but you should refer to them as necessary while learning the language.
<itemizedlist>
- <listitem><para><citetitle>Computer Programming</citetitle> at <ulink url="http://en.wikipedia.org/wiki/Computer_programming" />: You probably know what this is; it's what you'll be doing.</para></listitem>
+ <listitem><para><citetitle>Computer Programming</citetitle> at <ulink url="http://en.wikipedia.org/wiki/Computer_programming" />: You probably know what this is; it is what you will be doing.</para></listitem>
<listitem><para><citetitle>Programming Language</citetitle> at <ulink url="http://en.wikipedia.org/wiki/Programming_language" />: <application>SuperCollider</application> is a programming language.</para></listitem>
<listitem><para><citetitle>Interpreter</citetitle> at <ulink url="http://en.wikipedia.org/wiki/Interpreter_%28computing%29" />: This reads your code, and sends commands to the server, which causes it to produce sound.</para></listitem>
<listitem><para><citetitle>Server</citetitle> at <ulink url="http://en.wikipedia.org/wiki/Server_%28computing%29" />: <application>SuperCollider</application> has a 'server' component, which is operated by the interpreter.</para></listitem>
@@ -123,7 +123,7 @@
If you have never used <application>SuperCollider</application> before, then we recommend installing the smallest number of packages possible. This will allow you to start learning with the core classes, available on all <application>SuperCollider</application> installations. Installing the bare minimum requirements will not prevent you from installing optional libraries in the future, of course.
</para>
<para>
- The recommended installation also avoids installing the <application>emacs</application> or <application>vim</application> components, which - unless you are already a programmer - you probably don't know how to use. The <application>emacs</application> and <application>vim</application> text editors are extremely powerful and extensible, but they can be difficult to learn. Furthermore, there's no reason to learn them just for <application>SuperCollider</application>, because the component for <application>GEdit</application> is more than sufficient.
+ The recommended installation also avoids installing the <application>emacs</application> or <application>vim</application> components, which - unless you are already a programmer - you probably do not know how to use. The <application>emacs</application> and <application>vim</application> text editors are extremely powerful and extensible, but they can be difficult to learn. Furthermore, there is no reason to learn them just for <application>SuperCollider</application>, because the component for <application>GEdit</application> is more than sufficient.
</para>
<para>
To install the minimum recommended installation for <application>SuperCollider</application>:
@@ -201,7 +201,7 @@ notification is on
<itemizedlist>
<listitem><para>If you close <application>GEdit</application> while the <application>SuperCollider</application> server is running, then <application>GEdit</application> will automatically shut down the server.</para></listitem>
<listitem><para>If <systemitem>JACK</systemitem> is started by <application>SuperCollider</application>, then it will automatically terminate when the <application>SuperCollider</application> server terminates.</para></listitem>
- <listitem><para><application>SuperCollider</application> will automatically attempt to connect its outputs to the system's outputs. If your audio output doesn't work, then you should use <application>QjackCtl</application> to verify that it is correctly connected.</para></listitem>
+ <listitem><para><application>SuperCollider</application> will automatically attempt to connect its outputs to the system's outputs. If your audio output does not work, then you should use <application>QjackCtl</application> to verify that it is correctly connected.</para></listitem>
<listitem><para>Other functions available in the <application>SuperCollider</application> menu include:
<itemizedlist>
<listitem><para>Find Help (Opens the <application>SuperCollider</application> help file for currently-selected object).</para></listitem>
@@ -220,4 +220,4 @@ notification is on
<xi:include href="SuperCollider-Composing.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="SuperCollider-Exporting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>
\ No newline at end of file
+</chapter>
9 years, 5 months
[release-notes] cockpit port
by Pete Travis
commit ee6c4d40e4807b16b78284f96fe5fbbff752b893
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Thu Nov 20 12:36:35 2014 -0700
cockpit port
en-US/Products-Server.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/en-US/Products-Server.xml b/en-US/Products-Server.xml
index f43876f..04cbec4 100644
--- a/en-US/Products-Server.xml
+++ b/en-US/Products-Server.xml
@@ -65,7 +65,10 @@
Adding and removing local users
</para>
</listitem>
- </itemizedlist>
+ </itemizedlist>
+ <para>
+ Any user known to the server can log in to the <application>Cockpit</application> console by opening <systemitem class="ipaddress" >http://<replaceable>server-ip-address</replaceable>:9090</systemitem>.
+ </para>
</section>
</section>
9 years, 5 months
[install-guide/f21-branch] dd is not complex
by Pete Travis
commit 931cb8552c08ac676640a4a49ffad4006911c0b6
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Wed Nov 19 22:42:26 2014 -0700
dd is not complex
en-US/Preparing_for_Installation.xml | 43 +++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/en-US/Preparing_for_Installation.xml b/en-US/Preparing_for_Installation.xml
index 0a5c095..68d9f4b 100644
--- a/en-US/Preparing_for_Installation.xml
+++ b/en-US/Preparing_for_Installation.xml
@@ -214,12 +214,7 @@ Mode LastWriteTime Length Name
</warning>
<procedure>
<title>Creating USB Media on Windows</title>
- <step>
- <para>
- Download the Fedora image of your choice from <ulink url="https://fedoraproject.org/get-fedora" /> and the corresponding checksum file from <ulink url="https://fedoraproject.org/verify " />.
- </para>
- </step>
- <step>
+ <step>
<para>
Download and run the <ulink url="https://github.com/downloads/openSUSE/kiwi/ImageWriter.exe"><application>SUSE Studio ImageWriter</application></ulink> or <ulink url="http://www.netbsd.org/~martin/rawrite32/"><application>Rawrite32</application></ulink>.
</para>
@@ -267,6 +262,42 @@ Mode LastWriteTime Length Name
</step>
</procedure>
+ <procedure>
+ <title>Creating USB Media on the Linux command line</title>
+ <step>
+ <para>
+ Open a terminal window and insert the usb drive.
+ </para>
+ </step>
+ <step>
+ <para>
+ Find the <systemitem class="resource">device node</systemitem> assigned to the drive. In the example below, the drive is given <literal>sdd</literal>.
+ </para>
+ <programlisting>
+<prompt>$ </prompt><command>dmesg|tail</command>
+[288954.686557] usb 2-1.8: New USB device strings: Mfr=0, Product=1, SerialNumber=2
+[288954.686559] usb 2-1.8: Product: USB Storage
+[288954.686562] usb 2-1.8: SerialNumber: 000000009225
+[288954.712590] usb-storage 2-1.8:1.0: USB Mass Storage device detected
+[288954.712687] scsi host6: usb-storage 2-1.8:1.0
+[288954.712809] usbcore: registered new interface driver usb-storage
+[288954.716682] usbcore: registered new interface driver uas
+[288955.717140] scsi 6:0:0:0: Direct-Access Generic STORAGE DEVICE 9228 PQ: 0 ANSI: 0
+[288955.717745] sd 6:0:0:0: Attached scsi generic sg4 type 0
+[288961.876382] sd 6:0:0:0: <literal>[sdd]</literal> Attached SCSI removable disk
+ </programlisting>
+ </step>
+ <step>
+ <para>
+ Use the <command>dd</command> utility to write the image. <emphasis>Make sure you have the right drive!</emphasis>
+ </para>
+ <screen>
+ <prompt># </prompt>dd if=<replaceable>/path/to/Fedora-Live-Security-x86_64-21.iso</replaceable> of=<replaceable>/dev/sdd</replaceable>
+ </screen>
+ </step>
+ </procedure>
+
+
9 years, 5 months
[install-guide/f21-branch] verification for linux and osx users too
by Pete Travis
commit b508255b26c1fb977e139c03a47a6a431f1a3dfe
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Wed Nov 19 21:09:22 2014 -0700
verification for linux and osx users too
en-US/Preparing_for_Installation.xml | 39 +++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/en-US/Preparing_for_Installation.xml b/en-US/Preparing_for_Installation.xml
index ad7673c..0a5c095 100644
--- a/en-US/Preparing_for_Installation.xml
+++ b/en-US/Preparing_for_Installation.xml
@@ -56,7 +56,7 @@
<section id="sect-preparing-obtaining-images">
<title>Downloading Boot and Installation Images</title>
<para>
- The Fedora Project offers different flavors for tailored for some specific use cases. Choose the Fedora flavor best for you, or you can build your own using a <xref linkend="sect-kickstart-file-create">kickstart</xref> file or by customizing after the installation.
+ The Fedora Project offers different flavors for tailored for some specific use cases. Choose the Fedora flavor best for you, or you can build your own by customizing after the installation, or by using a kickstart file as described in <xref linkend="sect-kickstart-file-create" />.
</para>
<para>
Learn more about Fedora Workstation, Fedora Cloud, and Fedora Server at <ulink url="http://getfedora.org" />.
@@ -135,6 +135,43 @@ Mode LastWriteTime Length Name
</programlisting>
</step>
</procedure>
+
+ <procedure>
+ <title>Verifying checksums on Linux and OSX systems</title>
+ <step>
+ <para>
+ Download the Fedora image of your choice from <ulink url="https://fedoraproject.org/get-fedora" /> and the corresponding checksum file from <ulink url="https://fedoraproject.org/verify " />
+ </para>
+ </step>
+ <step>
+ <para>
+ Open a terminal window, and navigate to the directory with the downloaded files.
+ </para>
+ <screen>
+<prompt>$ </prompt><command>cd ~/Downloads</command>
+ </screen>
+ </step>
+ <step>
+ <para>
+ Use the appropriate utility to verify the image checksum.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>For Linux:</para>
+ <screen>
+<prompt>$ </prompt><command>sha256sum -c *CHECKSUM</command>
+ </screen>
+ </listitem>
+ <listitem>
+ <para>For OSX:</para>
+ <screen>
+<prompt>$ </prompt><command>shasum -a 256 -c *CHECKSUM</command>
+ </screen>
+ </listitem>
+ </itemizedlist>
+ </step>
+ </procedure>
+
9 years, 5 months
[install-guide/f21-branch] Downloading
by Pete Travis
commit b77bafdb858ede3ad1cdff1f1ea012ea64792449
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Wed Nov 19 20:27:39 2014 -0700
Downloading
The 'get' sites do a good job of walking users through the process of
choosing a flavor or spin and clicking on the download link, so let's
just refer to them.
en-US/Preparing_for_Installation.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/en-US/Preparing_for_Installation.xml b/en-US/Preparing_for_Installation.xml
index a72106d..ad7673c 100644
--- a/en-US/Preparing_for_Installation.xml
+++ b/en-US/Preparing_for_Installation.xml
@@ -56,9 +56,16 @@
<section id="sect-preparing-obtaining-images">
<title>Downloading Boot and Installation Images</title>
<para>
- TODO
+ The Fedora Project offers different flavors for tailored for some specific use cases. Choose the Fedora flavor best for you, or you can build your own using a <xref linkend="sect-kickstart-file-create">kickstart</xref> file or by customizing after the installation.
</para>
- </section>
+ <para>
+ Learn more about Fedora Workstation, Fedora Cloud, and Fedora Server at <ulink url="http://getfedora.org" />.
+ </para>
+ <para>
+ You can also choose a Fedora <literal>Spin</literal> featuring favorite alternative desktops or tools for specialized tasks at <ulink url="http://spins.fedoraproject.org" />
+ </para>
+ </section>
+
<section id="sect-verifying-images">
<title>Verifying the Downloaded Image</title>
<para>
9 years, 5 months
[install-guide/f21-branch] Say 'reinstall' instead of 'upgrade' when referring to anaconda based upgrades; this method requires
by Pete Travis
commit 1bbeeb829fc2a2eb6959f8dcc0c9be25c23e95a9
Author: Pete Travis <immanetize(a)fedoraproject.org>
Date: Wed Nov 19 19:10:16 2014 -0700
Say 'reinstall' instead of 'upgrade' when referring to anaconda based upgrades; this method requires the root partition to be wiped and does not attempt to replicate the existign package set or configuration, so we should not imply that.
en-US/Preparing_for_Installation.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/en-US/Preparing_for_Installation.xml b/en-US/Preparing_for_Installation.xml
index 4c01be1..a72106d 100644
--- a/en-US/Preparing_for_Installation.xml
+++ b/en-US/Preparing_for_Installation.xml
@@ -31,10 +31,10 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Manual upgrade</term>
+ <term>Manual Reinstallation</term>
<listitem>
<para>
- You can upgrade your Fedora installation manually instead of relying on <application>FedUp</application>. This involves booting the installer as if you were performing a clean installation, letting it detect your existing Fedora system, and overwriting the root partition while preserving data on other partitions and volumes. The same process can also be used to reinstall the system, if you need to. For detailed information, see <xref linkend="sect-upgrading-fedora-manual-reinstall" />.
+ You can upgrade to the latest version of Fedora manually instead of relying on <application>FedUp</application>. This involves booting the installer as if you were performing a clean installation, letting it detect your existing Fedora system, and overwriting the root partition while preserving data on other partitions and volumes. The same process can also be used to reinstall the system, if you need to. For detailed information, see <xref linkend="sect-upgrading-fedora-manual-reinstall" />.
</para>
</listitem>
</varlistentry>
9 years, 5 months