summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2016-11-19 20:22:07 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2017-01-24 23:26:52 +0300
commit736a83fae4e00215537e91bffdde994ad08ec049 (patch)
tree7f6d2bd44420db4d03d4a24a539721e490788015
parentebee9dfd2b7c0ba343294abeb4a7d5e68c6cd5f0 (diff)
downloadqemu-736a83fae4e00215537e91bffdde994ad08ec049.tar.gz
Fix documentation and some comments (article, grammar)
Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--qemu-doc.texi2
-rw-r--r--qemu-options.hx2
-rw-r--r--util/uri.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 0b2746f0b1..3840585e63 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -1037,7 +1037,7 @@ qemu-system-i386 -iscsi initiator-name=iqn.qemu.test:my-initiator \
@node disk_images_gluster
@subsection GlusterFS disk images
-GlusterFS is an user space distributed file system.
+GlusterFS is a user space distributed file system.
You can boot from the GlusterFS disk image with the command:
@example
diff --git a/qemu-options.hx b/qemu-options.hx
index dba09d9b82..8c60bfe2bd 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2589,7 +2589,7 @@ qemu-system-i386 --drive file=sheepdog://192.0.2.1:30000/MyVirtualMachine
See also @url{http://http://www.osrg.net/sheepdog/}.
@item GlusterFS
-GlusterFS is an user space distributed file system.
+GlusterFS is a user space distributed file system.
QEMU supports the use of GlusterFS volumes for hosting VM disk images using
TCP, Unix Domain Sockets and RDMA transport protocols.
diff --git a/util/uri.c b/util/uri.c
index 70a9cbcbd2..21b1828170 100644
--- a/util/uri.c
+++ b/util/uri.c
@@ -342,7 +342,7 @@ rfc3986_parse_port(URI *uri, const char **str)
* @uri: pointer to an URI structure
* @str: the string to analyze
*
- * Parse an user informations part and fills in the appropriate fields
+ * Parse a user information part and fill in the appropriate fields
* of the @uri structure
*
* userinfo = *( unreserved / pct-encoded / sub-delims / ":" )
@@ -508,7 +508,7 @@ rfc3986_parse_authority(URI *uri, const char **str)
cur = *str;
/*
- * try to parse an userinfo and check for the trailing @
+ * try to parse a userinfo and check for the trailing @
*/
ret = rfc3986_parse_user_info(uri, &cur);
if ((ret != 0) || (*cur != '@'))