All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH for-2.8] Fix documentation and some comments (article, grammar)
@ 2016-11-19 19:22 Stefan Weil
  2017-01-12 10:28 ` Michael Tokarev
  0 siblings, 1 reply; 2+ messages in thread
From: Stefan Weil @ 2016-11-19 19:22 UTC (permalink / raw)
  To: QEMU Developer; +Cc: QEMU Trivial, Stefan Weil

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 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 5cc58b2..b35deb8 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -86,7 +86,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 023c140..691acf9 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 4a5b29f..3bad94e 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.10.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH for-2.8] Fix documentation and some comments (article, grammar)
  2016-11-19 19:22 [Qemu-devel] [PATCH for-2.8] Fix documentation and some comments (article, grammar) Stefan Weil
@ 2017-01-12 10:28 ` Michael Tokarev
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Tokarev @ 2017-01-12 10:28 UTC (permalink / raw)
  To: Stefan Weil, QEMU Developer; +Cc: QEMU Trivial

19.11.2016 22:22, Stefan Weil wrote:
[]

Applied to -trivial, thank you!

/mjt

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-01-12 10:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-19 19:22 [Qemu-devel] [PATCH for-2.8] Fix documentation and some comments (article, grammar) Stefan Weil
2017-01-12 10:28 ` Michael Tokarev

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.