[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 04/31] Fix documentation and some comments (article
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 04/31] Fix documentation and some comments (article, grammar) |
Date: |
Tue, 24 Jan 2017 12:39:08 +0300 |
From: Stefan Weil <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
arch_init.c | 2 +-
qemu-doc.texi | 2 +-
qemu-options.hx | 2 +-
util/uri.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 6c4e287..13d6c56 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -85,7 +85,7 @@ const uint32_t arch_type = QEMU_ARCH;
static struct defconfig_file {
const char *filename;
- /* Indicates it is an user config file (disabled by -no-user-config) */
+ /* Indicates it is a user config file (disabled by -no-user-config) */
bool userconfig;
} default_config_files[] = {
{ CONFIG_QEMU_CONFDIR "/qemu.conf", true },
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 0b2746f..3840585 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 232f737..82b9991 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 70a9cbc..21b1828 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 != '@'))
--
2.1.4
- [Qemu-trivial] [PULL 22/31] util/mmap-alloc: check parameter before using, (continued)
- [Qemu-trivial] [PULL 22/31] util/mmap-alloc: check parameter before using, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 16/31] doc/usb2: fix typo, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 21/31] vfio: remove a duplicated word in comments, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 05/31] include: Fix typos found by codespell, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 07/31] qemu-options: cleanup duplicated help message for kernel_irqchip, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 29/31] gdbstub.c: update old error report statements, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 27/31] scsi-disk: add 'fall through' comment to switch VERIFY cases, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 18/31] lm32: milkymist-tmu2: fix another integer overflow, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 08/31] usb: Fix typo in documentation, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 23/31] util/mmap-alloc: refactor a little bit for readability, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 04/31] Fix documentation and some comments (article, grammar),
Michael Tokarev <=
- [Qemu-trivial] [PULL 20/31] docs: sync pci-ids.txt, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 26/31] Drop duplicate display option documentation, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 24/31] win32: use glib gpoll if glib >= 2.50, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 14/31] block: remove dead check, Michael Tokarev, 2017/01/24
- [Qemu-trivial] [PULL 10/31] object: make some funcs static, Michael Tokarev, 2017/01/24
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24, no-reply, 2017/01/24
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24, Peter Maydell, 2017/01/24
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24, Peter Maydell, 2017/01/24
- [Qemu-trivial] [PULL 00/31] Trivial patches for 2017-01-24, Michael Tokarev, 2017/01/24