Merge branch 'llantones/webwml-master'

2 files changed, 19 insertions, 19 deletions

diff --git a/english/users/edu/max_planck.wml b/english/users/edu/max_planck.wml
index 0802db38388..cd92f7911fc 100644
--- a/english/users/edu/max_planck.wml
+++ b/english/users/edu/max_planck.wml
@@ -1,23 +1,22 @@
 # From: Wolfram Wagner <ww@mpi-sb.mpg.de>
 
 <define-tag pagetitle>Max-Planck-Institut f&uuml;r Informatik, Saarbr&uuml;cken, Germany</define-tag>
-<define-tag webpage>https://www.mpi-sb.mpg.de/</define-tag>
+<define-tag webpage>https://www.mpi-inf.mpg.de</define-tag>
 
+                    
 #use wml::debian::users
 
 <p>
-  We power our linux workstations, notebooks and servers (a total of
-  130 at the moment, growing fast) with a self-made
-  autoinstallation of Debian (just converting to woody, we plan to
-  publish it when it is ready). Our conf-update package handles the
-  initial installation and hardware detection and configuration as
-  well as upgrades, all non-interactive. Several servers (e.g.
-  mail, a compute server) are also handled this way.
+    We power our Linux workstations, notebooks and servers  with a 
+   self-made autoinstallation of Debian. Our "confupdate" package handles 
+   the initial installation and hardware detection and configuration as 
+   well as upgrades, all non-interactive. Almost all servers (file service, 
+   IDM, mail, compute server an SLURM cluster) are also handled this way. 
 </p>
 <p>
-  We chose Debian years ago, because we have the full possibility to
-  change everything to our needs and because it is relatively easy
-  to do upgrades (security,...). The well tested state of each
-  release gives us a reassuring stable base to build our additions
-  and upgrades (e.g for new hardware) on.
+   We chose Debian years ago, because we have the full possibility to 
+   change everything to our needs and because it is relatively easy to do 
+   upgrades (security,...). The well tested state of each release gives us 
+   a reassuring stable base to build our additions and upgrades (e.g for 
+   new hardware) on.
 </p>
diff --git a/english/users/edu/mrt-uni-kassel.wml b/english/users/edu/mrt-uni-kassel.wml
index 62dea295d30..2a60e4d1e17 100644
--- a/english/users/edu/mrt-uni-kassel.wml
+++ b/english/users/edu/mrt-uni-kassel.wml
@@ -6,13 +6,14 @@
 #use wml::debian::users
 
 <p>
-    We are using Debian/squeeze for our firewall/packet filter, our department 
-    server (Samba file server and domain controller, WWW, FTP, SVN) and five 
-    desktop computers for developing software in C/C++/Python/Maxima/Matlab and 
-    typesetting with LaTeX/OpenOffice.
+We use Debian/stable for our firewall/packet filter, on
+our department server (Samba file server and domain controller,
+WWW, NFS, Git) and on numerous desktop computers for software development 
+in C/C++/Python/Maxima/Matlab and for typesetting with
+LaTeX and LibreOffice.
 </p>
 
 <p>
-    We chose Debian because of its easy maintance and updating capabilities, and 
-    because of its stability.
+We chose Debian because of its capabilities for simple
+maintenance and updating, as well as for its stability.
 </p>