summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Steel <jsteel@archlinux.org>2016-03-30 08:30:10 -0500
committerSol Jerome <sol.jerome@gmail.com>2016-03-30 08:30:32 -0500
commit9c5e4199d1118fbf5e6f144a70604fcde1016446 (patch)
tree4733c9f164ed1c49aef17a638169a8659815bb4a
parentf9c60b4c04086a3f653eaa0b5be9d5398a7f27ae (diff)
downloadbcfg2-9c5e4199d1118fbf5e6f144a70604fcde1016446.tar.gz
bcfg2-9c5e4199d1118fbf5e6f144a70604fcde1016446.tar.bz2
bcfg2-9c5e4199d1118fbf5e6f144a70604fcde1016446.zip
doc: Update Arch Linux name and package information
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--README2
-rw-r--r--doc/installation/distributions.txt10
-rw-r--r--doc/introduction/os-support.txt4
-rw-r--r--osx/Introduction.txt2
-rw-r--r--src/lib/Bcfg2/Client/Tools/Pacman.py2
5 files changed, 9 insertions, 11 deletions
diff --git a/README b/README
index bc2f8951c..9c99d31c1 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ Computer Science Division of Argonne National Laboratory.
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 Arch Linux, Blag, CentOS,
Debian, Fedora, Gentoo, gNewSense, Mandriva, openSUSE, Red Hat/RHEL,
SuSE/SLES, Trisquel, and Ubuntu.
diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt
index 5dad4d860..6abf438f0 100644
--- a/doc/installation/distributions.txt
+++ b/doc/installation/distributions.txt
@@ -22,16 +22,14 @@ Just use `apk` to perform the installation ::
.. _Alpine Linux: http://www.alpinelinux.org/
.. _testing: http://git.alpinelinux.org/cgit/aports/tree/testing/bcfg2
-ArchLinux
-=========
+Arch Linux
+==========
Packages for `Arch Linux`_ are available in the Arch User Repository (AUR_).
-Just use `pacman` to perform the installation ::
-
- pacman -S bcfg2 bcfg2-server
+The bcfg2 package includes bcfg2-server.
.. _Arch Linux: http://www.archlinux.org/
-.. _AUR: http://aur.archlinux.org/packages.php?ID=20979
+.. _AUR: http://aur.archlinux.org/packages/bcfg2
Debian
======
diff --git a/doc/introduction/os-support.txt b/doc/introduction/os-support.txt
index 881fdc6dd..42591b627 100644
--- a/doc/introduction/os-support.txt
+++ b/doc/introduction/os-support.txt
@@ -17,13 +17,13 @@ Bcfg2 is fairly portable. It has been successfully run on:
.. _OpenSolaris: http://opensolaris.org/
.. _Solaris: http://www.sun.com/software/solaris/
-* Many `GNU/Linux`_ distributions, including `Archlinux`_, `Blag`_, `CentOS`_,
+* Many `GNU/Linux`_ distributions, including `Arch Linux`_, `Blag`_, `CentOS`_,
`Debian`_, `Fedora`_, `Gentoo`_, `gNewSense`_, `Mandriva`_,
`OpenSUSE`_, `Red Hat/RHEL`_, `Scientific Linux`_, `SuSE/SLES`_, `Trisquel`_,
and `Ubuntu`_.
.. _GNU/Linux: http://www.gnu.org/gnu/Linux-and-gnu.html
-.. _Archlinux: http://www.archlinux.org
+.. _Arch Linux: http://www.archlinux.org
.. _Blag: http://www.blagblagblag.org/
.. _CentOS: http://www.centos.org/
.. _Debian: http://www.debian.org/
diff --git a/osx/Introduction.txt b/osx/Introduction.txt
index 79b935f23..7e43b72e8 100644
--- a/osx/Introduction.txt
+++ b/osx/Introduction.txt
@@ -11,6 +11,6 @@ Finally, due to the rapid pace of updates on modern networks, client systems are
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, Debian, Fedora, Gentoo, gNewSense, Mandriva, openSUSE, Red Hat/RHEL, SuSE/SLES, Trisquel, and Ubuntu.
+ Many GNU/Linux distributions, including Arch Linux, Blag, CentOS, Debian, Fedora, Gentoo, gNewSense, Mandriva, openSUSE, Red Hat/RHEL, SuSE/SLES, Trisquel, and Ubuntu.
Bcfg2 should run on any POSIX compatible operating system, however direct support for an operating system's package and service formats are limited by the currently available client tools (new client tools are pretty easy to add). There is also an incomplete but more exact list of platforms on which Bcfg2 works.
diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index b82b905e7..ee4ef35af 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -5,7 +5,7 @@ import Bcfg2.Client.Tools
class Pacman(Bcfg2.Client.Tools.PkgTool):
- '''Archlinux package support'''
+ '''Arch Linux package support'''
name = 'Pacman'
__execs__ = ["/usr/bin/pacman"]
__handles__ = [('Package', 'pacman')]