removed deprecated FAM filemonitor

4 files changed, 12 insertions, 14 deletions

diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt
index 5a67d0a37..1b8450603 100644
--- a/doc/appendix/guides/ubuntu.txt
+++ b/doc/appendix/guides/ubuntu.txt
@@ -82,7 +82,7 @@ You are now ready to start your bcfg2 server for the first time.::
     root@lucid:~# tail /var/log/syslog
     Dec 17 22:07:02 lucid bcfg2-server[17523]: serving bcfg2-server at https://lucid:6789
     Dec 17 22:07:02 lucid bcfg2-server[17523]: serve_forever() [start]
-    Dec 17 22:07:02 lucid bcfg2-server[17523]: Processed 16 fam events in 0.502 seconds. 0 coalesced
+    Dec 17 22:07:02 lucid bcfg2-server[17523]: Handled 16 events in 0.502 seconds
 
 Run bcfg2 to be sure you are able to communicate with the server::
 
@@ -256,7 +256,7 @@ Now we restart the bcfg2-server::
     Dec 17 22:37:27 lucid bcfg2-server[17937]: service available at https://lucid:6789
     Dec 17 22:37:27 lucid bcfg2-server[17937]: serving bcfg2-server at https://lucid:6789
     Dec 17 22:37:27 lucid bcfg2-server[17937]: serve_forever() [start]
-    Dec 17 22:37:28 lucid bcfg2-server[17937]: Processed 17 fam events in 0.502 seconds. 0 coalesced
+    Dec 17 22:37:28 lucid bcfg2-server[17937]: Handled 17 events in 0.502 seconds
 
 Start managing packages
 -----------------------
@@ -364,7 +364,7 @@ while, I ended up with a minimal bundle that looks like this
             <Package name='deborphan'/>
             <Package name='diffutils'/>
             <Package name='e2fsprogs'/>
-            <Package name='fam'/>
+            <Package name='gamin'/>
             <Package name='grep'/>
             <Package name='grub-pc'/>
             <Package name='gzip'/>
@@ -379,7 +379,7 @@ while, I ended up with a minimal bundle that looks like this
             <Package name='mlocate'/>
             <Package name='ncurses-base'/>
             <Package name='openssh-server'/>
-            <Package name='python-fam'/>
+            <Package name='python-gamin'/>
             <Package name='tar'/>
             <Package name='ubuntu-minimal'/>
             <Package name='ubuntu-standard'/>
@@ -422,7 +422,7 @@ As you can see below, I no longer have any unmanaged packages. ::
     Incorrect entries:      0
     Total managed entries:  247
     Unmanaged entries:      10
-     Service:bcfg2         Service:fam           Service:killprocs     Service:rc.local      Service:single
+     Service:bcfg2          Service:killprocs     Service:rc.local      Service:single
      Service:bcfg2-server  Service:grub-common   Service:ondemand      Service:rsync         Service:ssh
 
 Manage services
@@ -436,7 +436,6 @@ entries to our bundle...
     <!-- basic services -->
     <Service name='bcfg2'/>
     <Service name='bcfg2-server'/>
-    <Service name='fam'/>
     <Service name='grub-common'/>
     <Service name='killprocs'/>
     <Service name='ondemand'/>
@@ -455,7 +454,6 @@ entries to our bundle...
             <!-- basic services -->
             <Service type='deb' status='on' name='bcfg2'/>
             <Service type='deb' status='on' name='bcfg2-server'/>
-            <Service type='deb' status='on' name='fam'/>
             <Service type='deb' status='on' name='grub-common'/>
             <Service type='deb' status='on' name='killprocs'/>
             <Service type='deb' status='on' name='ondemand'/>
diff --git a/doc/help/troubleshooting.txt b/doc/help/troubleshooting.txt
index 35c1e93a2..5b2a9722f 100644
--- a/doc/help/troubleshooting.txt
+++ b/doc/help/troubleshooting.txt
@@ -69,13 +69,13 @@ included with the source distribution and all packages.
 If the bcfg2 server is not reflecting recent changes, try restarting the bcfg2-server process
 =============================================================================================
 
-If this fixes the problem, it is either a bug in the
-underlying file monitoring system (fam or gamin) or a bug in
-Bcfg2's file monitoring code. In either case, file a `ticket
+If this fixes the problem, it is either a bug in the underlying file
+monitoring system (inotify or gamin) or a bug in Bcfg2's file
+monitoring code. In either case, file a `ticket
 <https://trac.mcs.anl.gov/projects/bcfg2/newticket>`_ in the tracking
 system. In the ticket, include:
 
-* filesystem monitoring system (fam or gamin)
+* filesystem monitoring system (inotify or gamin)
 * kernel version (if on linux)
 * if any messages of the form "Handled N events in M
   seconds" appeared between the modification event and the client
diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt
index 3dcfd7721..eccd6e723 100644
--- a/doc/installation/distributions.txt
+++ b/doc/installation/distributions.txt
@@ -73,7 +73,7 @@ to get it marked as stable.
 If you don't use portage to install Bcfg2, you'll want to make sure you
 have all the prerequisites installed first. For a server, you'll need:
 
-* ``app-admin/gamin`` or ``app-admin/fam``
+* ``app-admin/gamin``
 * ``dev-python/lxml``
 
 Clients will need at least:
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt
index 0cb721bb9..eaa2a0393 100644
--- a/doc/installation/prerequisites.txt
+++ b/doc/installation/prerequisites.txt
@@ -50,9 +50,9 @@ Bcfg2 Server
 +-------------------------------+----------+--------------------------------+
 | lxml                          | 0.9+     | lxml: libxml2, libxslt, python |
 +-------------------------------+----------+--------------------------------+
-| gamin or fam                  | Any      |                                |
+| gamin or inotify              | Any      |                                |
 +-------------------------------+----------+--------------------------------+
-| python-gamin or python-fam    | Any      | gamin or fam, python           |
+| python-gamin or pyinotify     | Any      | gamin or inotify, python       |
 +-------------------------------+----------+--------------------------------+
 | M2crypto or python-ssl (note  | Any      | python, openssl                |
 | that the ssl module is        |          |                                |