From 18009c1ed838030e62f1ca7f074487ca807677d8 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 11 Jan 2011 11:16:24 +0100
Subject: [PATCH] Fix some doc issues introduced in recent commits
The hooks is due to me not checking the recent patch from David, and
the cli.py change is due to the utils.py split.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
doc/hooks.rst | 4 ++--
lib/cli.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/hooks.rst b/doc/hooks.rst
index 284f05bb0..6d218827b 100644
--- a/doc/hooks.rst
+++ b/doc/hooks.rst
@@ -259,7 +259,7 @@ Exports the instance.
:post-execution: master node, primary and secondary nodes
OP_INSTANCE_STARTUP
-+++++++++++++++++
++++++++++++++++++++
Starts an instance.
@@ -289,7 +289,7 @@ Reboots an instance.
:post-execution: master node, primary and secondary nodes
OP_INSTANCE_SET_PARAMS
-++++++++++++++++++
+++++++++++++++++++++++
Modifies the instance parameters.
diff --git a/lib/cli.py b/lib/cli.py
index 0d8faa98c..8e577409f 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -1,7 +1,7 @@
#
#
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -2416,7 +2416,7 @@ def FormatQueryResult(result, unit=None, format_override=None, separator=None,
@param result: result of query operation
@type unit: string
@param unit: Unit used for formatting fields of type L{constants.QFT_UNIT},
- see L{utils.FormatUnit}
+ see L{utils.text.FormatUnit}
@type format_override: dict
@param format_override: Dictionary for overriding field formatting functions,
indexed by field name, contents like L{_DEFAULT_FORMAT_QUERY}
--
GitLab