Repository :
http://git.fedorahosted.org/cgit/docs/fedora-cookbook.git
On branch : master
---------------------------------------------------------------
commit bc4c11442653b1a50f83a16baba2b482874ecbf2
Author: Glen Rundblom <grundblom(a)fedoraproject.org>
Date: Wed Nov 11 19:53:23 2015 -0600
Fixed my para tags in Networking.xml but had to comment out the preface in
Fedora_cookbook.xml because publican keeps saying it is allready defined elsewhere
---------------------------------------------------------------
en-US/Fedora_Cookbook.xml | 4 ++--
en-US/Networking.xml | 18 +++++++-----------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/en-US/Fedora_Cookbook.xml b/en-US/Fedora_Cookbook.xml
index 4ffc863..2d4d404 100644
--- a/en-US/Fedora_Cookbook.xml
+++ b/en-US/Fedora_Cookbook.xml
@@ -4,8 +4,8 @@
%BOOK_ENTITIES;
]>
<book>
- <xi:include href="Book_Info.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Preface.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include href="Book_Info.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- <xi:include href="Preface.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<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" />
diff --git a/en-US/Networking.xml b/en-US/Networking.xml
index c25b6b0..d021629 100644
--- a/en-US/Networking.xml
+++ b/en-US/Networking.xml
@@ -1,7 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE chapter 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;
]>
<chapter id="Networking">
<title>Networking</title>
@@ -12,9 +10,11 @@
Or it can be a reservation. Having a reservation for a client can effectively mimic
a static IP. This will give the client the same IP address over and over, without having
to manually configure the IP manually on the host.
The advantage to this is less manual configuration on the host.
</para>
- <para>
- <warning> While having a DHCP reservation mimics a static IP, you will be reliant
on the DHCP service to be running for your host to keep getting the same IP
address.</warning>
- </para>
+ <warning>
+ <para>
+ While having a DHCP reservation mimics a static IP, you will be reliant on the DHCP
service to be running for your host to keep getting the same IP address.
+ </para>
+ </warning>
<para>
<emphasis>Static:</emphasis> This way is when you manually assign an IP
address into the computer. You may need to do this on a network that has no DHCP server,
or the DHCP server will not allow you to have reservations for your computer.
Manually assigning a static IP address has the benefit of making some configurations
easier. Especially when configuring a server because in server configuration files
@@ -23,7 +23,6 @@
<para>
If you want to setup your machine with a static IP address there are a few items you
need to know:
</para>
- <para>
<itemizedlist>
<listitem>
<para>
@@ -51,7 +50,6 @@
</para>
</listitem>
</itemizedlist>
- </para>
</section>
<section id="How_to_static_command_line">
<title>How to set up a static IP assignment via the command line </title>
@@ -59,7 +57,6 @@
To setup manual an IP address manually, you must first find which network interface,
or network card you will be assigning the IP
address to.
</para>
- <para>
<procedure>
<title>Find_Your_Interface</title>
<step>
@@ -107,12 +104,12 @@ IPV6_PEERROUTES=no
In this example, there is a lot of extra lines because this file was auto-created
by the system. I marked
lines that are mandatory with #Required.
What is neat in the newer versions of Fedora, is you can set the DNS and Gateway
per interface. Please do not have the #Required comments in your config file
- </para>
- <para>
<note>
+ <para>
What is nice about specifying the gateway and DNS at the
<emphasis>interface</emphasis> level instead of the
<emphasis>system</emphasis> level is so you can have multiple interfaces on a
computer
attached to different networks/routes. This is nice especially for a laptop when
you want the wired interface to have a special configuration but have the wireless
as general DHCP that attaches to many different networks.
+ </para>
</note>
</para>
</step>
@@ -127,6 +124,5 @@ IPV6_PEERROUTES=no
</para>
</step>
</procedure>
- </para>
</section>
</chapter>