summaryrefslogtreecommitdiffstats
path: root/doc/getting_started
diff options
context:
space:
mode:
Diffstat (limited to 'doc/getting_started')
-rw-r--r--doc/getting_started/index.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/getting_started/index.txt b/doc/getting_started/index.txt
index a9b1b847f..135346e41 100644
--- a/doc/getting_started/index.txt
+++ b/doc/getting_started/index.txt
@@ -21,7 +21,7 @@ Get and Install Bcfg2 Server
We recommend running the server on a Linux machine for ease of
deployment due to the availability of packages for the dependencies.
-First, you need to download and install Bcfg2. The section
+First, you need to download and install Bcfg2. The section
:ref:`installation-index` in this manual describes the steps to take.
To start, you will need to install the server on one machine and the
client on one or more machines. Yes, your server can also be a client
@@ -71,7 +71,7 @@ That can be translated as "bcfg2 quick verbose no-op". The output
should be something similar to::
Loaded tool drivers:
- Chkconfig POSIX YUMng
+ Chkconfig POSIX YUM
Phase: initial
Correct entries: 0
@@ -108,7 +108,7 @@ After the above steps, you should have a toplevel repository structure
that looks like::
bcfg-server:~ # ls /var/lib/bcfg2
- Base/ Bundler/ Cfg/ Metadata/ Pkgmgr/ Rules/ SSHbase/ etc/
+ Bundler/ Cfg/ Metadata/ Pkgmgr/ Rules/ SSHbase/ etc/
The place to start is the Metadata directory, which contains two
files: ``clients.xml`` and ``groups.xml``. Your current
@@ -169,7 +169,7 @@ Next, we create a motd.xml file in the Bundler directory:
.. code-block:: xml
- <Bundle name='motd'>
+ <Bundle>
<Path name='/etc/motd' />
</Bundle>
@@ -206,7 +206,11 @@ real ``/etc/motd`` file to that location, run the client again, and
you will find that we now have a correct entry::
Loaded tool drivers:
+<<<<<<< HEAD
+ Chkconfig POSIX Action RPM
+=======
Chkconfig POSIX YUM
+>>>>>>> maint
Phase: initial
Correct entries: 1