diff -r 501a70f3ae96 docs/src/user.tex
--- a/docs/src/user.tex	Thu Jul 28 12:34:45 2005
+++ b/docs/src/user.tex	Fri Jul 29 14:06:14 2005
@@ -930,12 +930,12 @@
 \subsection{Setting memory footprints from dom0}
 
 The machine administrator can request that a domain alter its memory
-footprint using the \path{xm balloon} command.  For instance, we can
+footprint using the \path{xm set-mem} command.  For instance, we can
 request that our example ttylinux domain reduce its memory footprint
 to 32 megabytes.
 
 \begin{verbatim}
-# xm balloon ttylinux 32
+# xm set-mem ttylinux 32
 \end{verbatim}
 
 We can now see the result of this in the output of \path{xm list}:
@@ -951,16 +951,16 @@
 can restore the domain to its original size using the command line:
 
 \begin{verbatim}
-# xm balloon ttylinux 64
+# xm set-mem ttylinux 64
 \end{verbatim}
 
 \subsection{Setting memory footprints from within a domain}
 
-The virtual file \path{/proc/xen/memory\_target} allows the owner of a
+The virtual file \path{/proc/xen/balloon} allows the owner of a
 domain to adjust their own memory footprint.  Reading the file
-(e.g. \path{cat /proc/xen/memory\_target}) prints out the current
+(e.g. \path{cat /proc/xen/balloon}) prints out the current
 memory footprint of the domain.  Writing the file
-(e.g. \path{echo new\_target > /proc/xen/memory\_target}) requests
+(e.g. \path{echo new\_target > /proc/xen/balloon}) requests
 that the kernel adjust the domain's memory footprint to a new value.
 
 \subsection{Setting memory limits}
@@ -1285,7 +1285,7 @@
 The available commands are as follows:
 
 \begin{description}
-\item[balloon] Request a domain to adjust its memory footprint.
+\item[set-mem] Request a domain to adjust its memory footprint.
 \item[create] Create a new domain.
 \item[destroy] Kill a domain immediately.
 \item[list] List running domains.
diff -r 501a70f3ae96 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py	Thu Jul 28 12:34:45 2005
+++ b/tools/python/xen/xm/main.py	Fri Jul 29 14:06:14 2005
@@ -561,9 +561,9 @@
 
 xm.prog(ProgMaxmem)
 
-class ProgBalloon(Prog):
-    group = 'domain'
-    name  = 'balloon'
+class ProgSetMem(Prog):
+    group = 'domain'
+    name  = 'set-mem'
     info  = """Set the domain's memory footprint using the balloon driver."""
 
     def help(self, args):
@@ -577,7 +577,7 @@
         mem_target = int_unit(args[2], 'm')
         server.xend_domain_mem_target_set(dom, mem_target)
 
-xm.prog(ProgBalloon)
+xm.prog(ProgSetMem)
 
 class ProgVcpuhotplug(Prog):
     group = 'domain'