summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-20 10:38:38 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-20 10:38:38 -0500
commit69ebf49d54aac70a42142d0d04e562496bce58ea (patch)
treead0f346ff95a14ad49440128ff76d7e2b3f0816a /README
parent602ba6af6bd1c9b3910940dee766660ab8e81a19 (diff)
parente17e41dcff096ead7e129a0db063f75de44aaa2b (diff)
downloadbcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.gz
bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.bz2
bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.zip
Merge branch 'master' into 1.4.x
Conflicts: doc/appendix/contributors.txt schemas/bundle.xsd src/lib/Bcfg2/Client/Tools/__init__.py src/lib/Bcfg2/Server/Encryption.py src/lib/Bcfg2/Server/Lint/Genshi.py src/lib/Bcfg2/Server/Plugins/Bundler.py src/lib/Bcfg2/Server/Plugins/Decisions.py src/lib/Bcfg2/Server/Plugins/TemplateHelper.py src/sbin/bcfg2-test testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py tools/bcfg2-profile-templates.py
Diffstat (limited to 'README')
-rw-r--r--README14
1 files changed, 7 insertions, 7 deletions
diff --git a/README b/README
index 1d55387ff..c836961f7 100644
--- a/README
+++ b/README
@@ -1,26 +1,26 @@
Bcfg2 - A Configuration Management System
-----------------------------------------
-Bcfg2 (bee-config two) helps system administrators produce a
+Bcfg2 (bee-config two) helps system administrators produce a
consistent, reproducible, and verifiable description of their
environment, and offers visualization and reporting tools to aid
in day-to-day administrative tasks. It is the fifth generation of
configuration management tools developed in the Mathematics and
-Computer Science Division of Argonne National Laboratory.
+Computer Science Division of Argonne National Laboratory.
* Homepage: http://bcfg2.org
Bcfg2 is fairly portable. It has been successfully run on:
* AIX, FreeBSD, OpenBSD Mac OS X, OpenSolaris, Solaris
-* Many GNU/Linux distributions, including ArchLinux, Blag, CentOS,
+* Many GNU/Linux distributions, including ArchLinux, Blag, CentOS,
Debian, Fedora, Gentoo, gNewSense, Mandriva, openSUSE, Red Hat/RHEL,
SuSE/SLES, Trisquel, and Ubuntu.
-
+
Installation
------------
-For details about the installation of Bcfg2 please refer to the
+For details about the installation of Bcfg2 please refer to the
following pages in the Bcfg2 wiki.
* Prerequisites: http://bcfg2.org/wiki/Prereqs
@@ -46,5 +46,5 @@ Want to help
* Wiki: http://bcfg2.org/wiki/Contribute
-Bcfg2 is licensed under a Simplified (2-clause) BSD license, for more
-details check COPYRIGHT.
+Bcfg2 is licensed under a Simplified (2-clause) BSD license. For more
+details check LICENSE.