From 9c36c57bda8b6bc58c750e020fcaa8f7f2e2f01c Mon Sep 17 00:00:00 2001
From: John Carr <john.carr@unrouted.co.uk>
Date: Wed, 10 Sep 2014 22:34:06 +0100
Subject: [PATCH] Some minor doc updates (for #2)

---
 README.rst                      | 6 ++----
 docs/defining_configuration.rst | 5 -----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 9be3db5f..b51501c1 100644
--- a/README.rst
+++ b/README.rst
@@ -36,9 +36,9 @@ You can write simple deployment scripts with Fabric by adding this to your fabfi
             name='/var/local/minecraft',
         )
         yield Execute(
-            name='wget https://s3.amazonaws.com/Minecraft.Download/versions/1.6.2/minecraft_server.1.6.2.jar',
+            command='wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8/minecraft_server.1.8.jar',
             cwd="/var/local/minecraft",
-            creates="/var/local/minecraft/minecraft_server.1.6.2.jar",
+            creates="/var/local/minecraft/minecraft_server.1.8.jar",
         )
         yield File(
             name='/var/local/minecraft/server.properties',
@@ -49,12 +49,10 @@ You can write simple deployment scripts with Fabric by adding this to your fabfi
             contents=open("etc_systemd_system_minecraft.service"),
         )
         yield Execute(
-            name="systemctl-daemon-reload-minecraft",
             command="systemctl daemon-reload",
             watches=['/etc/systemd/system/minecraft.service'],
         )
         yield Execute(
-            name="systemctl-restart-minecraft",
             command="systemctl restart minecraft.service",
             watches=[
                 "/var/local/minecraft/server.properties",
diff --git a/docs/defining_configuration.rst b/docs/defining_configuration.rst
index 985c555a..9cd662fe 100644
--- a/docs/defining_configuration.rst
+++ b/docs/defining_configuration.rst
@@ -40,7 +40,6 @@ For example::
     ))
 
     bundle.add(Execute(
-        name="install-requirements",
         command="/var/sites/myapp/bin/pip install -r /usr/local/src/mycheckout/requirements.txt",
         watches=['/usr/local/src/mycheckout'],
     ))
@@ -55,7 +54,6 @@ You can do the same for monitoring file changes too::
     ))
 
     bundle.add(Execute(
-        name="restart-apache",
         command="apache2ctl graceful",
         watches=['/etc/apache2/security.conf'],
     ))
@@ -63,13 +61,11 @@ You can do the same for monitoring file changes too::
 Sometimes you can't use ``File`` (perhaps ``buildout`` or ``maven`` or similar generates a config file for you), but you still want to trigger a command when a file changes during deployment::
 
     bundle.add(Execute(
-        name="buildout",
         command="buildout -c production.cfg",
         changes=['/var/sites/mybuildout/parts/apache.cfg'],
     ))
 
     bundle.add(Execute(
-        name="restart-apache",
         command="apache2ctl graceful",
         watches=['/var/sites/mybuildout/parts/apache.cfg'],
     ))
@@ -87,7 +83,6 @@ All of these examples use a trigger system. When a trigger has been set fuselage
     ))
 
     bundle.add(Execute(
-        name="restart-apache2",
         command="/etc/init.d/apache2 restart",
         watches=['/etc/apache2/sites-enabled/mydemosite'],
     ))