net-define: update or unify documentation

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1127045

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/libvirt-network.c b/src/libvirt-network.c
index 8769c7965b87791170cd54cca3cad2e1b922511b..e3a36500831cf7163c57f21970968be99557586b 100644 (file)
--- a/src/libvirt-network.c
+++ b/src/libvirt-network.c
@@ -1,7 +1,7 @@
 /*
  * libvirt-network.c: entry points for virNetworkPtr APIs
  *
- * Copyright (C) 2006-2014 Red Hat, Inc.
+ * Copyright (C) 2006-2015 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -433,7 +433,8 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc)
  * @conn: pointer to the hypervisor connection
  * @xml: the XML description for the network, preferably in UTF-8
  *
- * Define a network, but does not create it
+ * Define an inactive persistent virtual network or modify an existing
+ * persistent one from the XML description.
  *
  * virNetworkFree should be used to free the resources after the
  * network object is no longer needed.

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 5f8743c61635aa5c9f6c54d0e42feefd931b5822..62323c4b78ae08051f488ce323c1df839c95eff8 100644 (file)
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -1,7 +1,7 @@
 /*
  * virsh-network.c: Commands to manage network
  *
- * Copyright (C) 2005, 2007-2014 Red Hat, Inc.
+ * Copyright (C) 2005, 2007-2015 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -189,10 +189,11 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd)
  */
 static const vshCmdInfo info_network_define[] = {
     {.name = "help",
-     .data = N_("define (but don't start) a network from an XML file")
+     .data = N_("define an inactive persistent virtual network or modify "
+                "an existing persistent one from an XML file")
     },
     {.name = "desc",
-     .data = N_("Define a network.")
+     .data = N_("Define or modify a persistent virtual network.")
     },
     {.name = NULL}
 };

diff --git a/tools/virsh.pod b/tools/virsh.pod
index 0ff45c6aadc26ea3d01d317cfc7de8c716e83e1a..e65378e550fcfc3a560aa3dd741780c79ba54268 100644 (file)
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -2701,8 +2701,8 @@ to get a description of the XML network format used by libvirt.
 
 =item B<net-define> I<file>
 
-Define a persistent virtual network from an XML I<file>, the network is just
-defined but not instantiated (started).
+Define an inactive persistent virtual network or modify an existing persistent
+one from the XML I<file>.
 
 =item B<net-destroy> I<network>