From aa486e935452c7120582057caf9db0c77b88d68a Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 20 Mar 2013 17:59:47 +0200
Subject: [PATCH] Fix syntax errors
---
docs/man/snf-image-creator.rst | 2 +-
docs/usage.rst | 9 +++++----
image_creator/dialog_menu.py | 4 ++--
image_creator/main.py | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/docs/man/snf-image-creator.rst b/docs/man/snf-image-creator.rst
index 751d42a..f55652d 100644
--- a/docs/man/snf-image-creator.rst
+++ b/docs/man/snf-image-creator.rst
@@ -42,7 +42,7 @@ Options
dump image to FILE
--public
- register image to cyclades as public
+ register image with cyclades as public
--print-sysprep
print the enabled and disabled system preparation operations for this
diff --git a/docs/usage.rst b/docs/usage.rst
index a1c8da6..c43fb29 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -45,7 +45,7 @@ snf-image-creator receives the following options:
media
--no-sysprep don't perform any system preparation operation
--no-shrink don't shrink the image
- --public register image to cyclades as public
+ --public register image with cyclades as public
--tmpdir=DIR create large temporary image files under DIR
Most input options are self-describing. If you want to save a local copy of
@@ -202,10 +202,11 @@ In the *Customize* sub-menu the user can control:
In the *Register* sub-menu the user can provide:
- * The credentials (authentication token) to authenticate on *~okeanos*
+ * The credentials (authentication token) to use when authenticating
+ to *~okeanos*
* A *pithos+* filename for the uploaded *diskdump* image
- * A name for the image to be registered to *~okeanos* with, as well as the
- registration type (*private* or *public*)
+ * A name for the image to use when registering it with *~okeanos*, as well as
+ the registration type (*private* or *public*)
By choosing the *Extract* menu entry, the user can dump the image to the local
file system. Finally, if the user selects *Reset*, the system will ignore
diff --git a/image_creator/dialog_menu.py b/image_creator/dialog_menu.py
index 47e07e2..55bcd4e 100644
--- a/image_creator/dialog_menu.py
+++ b/image_creator/dialog_menu.py
@@ -195,13 +195,13 @@ def register_image(session):
if "account" not in session:
d.msgbox("You need to provide your ~okeanos credentians before you "
- "can register an images to cyclades",
+ "can register an images with cyclades",
width=SMALL_WIDTH)
return False
if "pithos_uri" not in session:
d.msgbox("You need to upload the image to pithos+ before you can "
- "register it to cyclades", width=SMALL_WIDTH)
+ "register it with cyclades", width=SMALL_WIDTH)
return False
while 1:
diff --git a/image_creator/main.py b/image_creator/main.py
index 6d46ae3..567e4c3 100644
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -119,7 +119,7 @@ def parse_options(input_args):
help="don't shrink any partition", action="store_false")
parser.add_option("--public", dest="public", default=False,
- help="register image to cyclades as public",
+ help="register image with cyclades as public",
action="store_true")
parser.add_option("--tmpdir", dest="tmp", type="string", default=None,
--
GitLab