From 47387916fb84f8f9c7931eb7162d1663a6023467 Mon Sep 17 00:00:00 2001 From: Sven Joachim Date: Mon, 30 Sep 2019 18:43:13 +0200 Subject: [PATCH] Fix various spelling errors --- hw/dmx/config/man/xdmxconfig.man | 2 +- hw/dmx/man/Xdmx.man | 2 +- hw/kdrive/ephyr/hostx.c | 2 +- hw/kdrive/src/kdrive.c | 10 +++++----- hw/xfree86/drivers/modesetting/vblank.c | 2 +- hw/xfree86/parser/Monitor.c | 2 +- hw/xfree86/vbe/vbe.c | 2 +- hw/xfree86/x86emu/sys.c | 2 +- hw/xfree86/xorg-wrapper.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/dmx/config/man/xdmxconfig.man b/hw/dmx/config/man/xdmxconfig.man index 45b6b9bcc..32731d1db 100644 --- a/hw/dmx/config/man/xdmxconfig.man +++ b/hw/dmx/config/man/xdmxconfig.man @@ -45,7 +45,7 @@ enter more displays. If there is more than one configuration, the configuration name button will bring up a selection menu. .PP -In the right-hand pannel, the left mouse button will move the +In the right-hand panel, the left mouse button will move the highlighted display at "tool resolution"; the middle mouse button will move the highlighted display by a single pixel (at "wall resolution"); and the right mouse button will bring up a menu allowing the highlighted diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man index ef62a02f5..36ae9117f 100644 --- a/hw/dmx/man/Xdmx.man +++ b/hw/dmx/man/Xdmx.man @@ -472,7 +472,7 @@ is the dimension of each display in the wall (e.g., 1280x1024). The first geometry following .B display is the geometry of the screen window on the backend server. The second -geometry, which is always preceeded by a slash, is the geometry of the +geometry, which is always preceded by a slash, is the geometry of the root window. By default, the root window has the same geometry as the screen window. .PP diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index c2f94ed04..5b79407e2 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -975,7 +975,7 @@ hostx_screen_init(KdScreenInfo *screen, * -screen option (WxH+X or WxH+X+Y). Otherwise, accept the * position set by WM. * The trick here is putting this code after xcb_map_window() call, - * so these values won't be overriden by WM. */ + * so these values won't be overridden by WM. */ if (scrpriv->win_explicit_position) { uint32_t mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y; diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 78a8f77d7..8de01ccfa 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -355,11 +355,11 @@ KdUseMsg(void) ("-mouse driver [,n,,options] Specify the pointer driver and its options (n is the number of buttons)\n"); ErrorF ("-keybd driver [,,options] Specify the keyboard driver and its options\n"); - ErrorF("-xkb-rules Set default XkbRules value (can be overriden by -keybd options)\n"); - ErrorF("-xkb-model Set default XkbModel value (can be overriden by -keybd options)\n"); - ErrorF("-xkb-layout Set default XkbLayout value (can be overriden by -keybd options)\n"); - ErrorF("-xkb-variant Set default XkbVariant value (can be overriden by -keybd options)\n"); - ErrorF("-xkb-options Set default XkbOptions value (can be overriden by -keybd options)\n"); + ErrorF("-xkb-rules Set default XkbRules value (can be overridden by -keybd options)\n"); + ErrorF("-xkb-model Set default XkbModel value (can be overridden by -keybd options)\n"); + ErrorF("-xkb-layout Set default XkbLayout value (can be overridden by -keybd options)\n"); + ErrorF("-xkb-variant Set default XkbVariant value (can be overridden by -keybd options)\n"); + ErrorF("-xkb-options Set default XkbOptions value (can be overridden by -keybd options)\n"); ErrorF("-zaphod Disable cursor screen switching\n"); ErrorF("-2button Emulate 3 button mouse\n"); ErrorF("-3button Disable 3 button mouse emulation\n"); diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c index 561229f30..d5799d526 100644 --- a/hw/xfree86/drivers/modesetting/vblank.c +++ b/hw/xfree86/drivers/modesetting/vblank.c @@ -307,7 +307,7 @@ ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint64_t sequence, Bool is64bit) * but update the 32-bit tracking variables with reliable ground truth. * * With 64-Bit api in use, the only !is64bit input is from pageflip events, - * and any pageflip event is usually preceeded by some is64bit input from + * and any pageflip event is usually preceded by some is64bit input from * swap scheduling, so this should provide reliable mapping for pageflip * events based on true 64-bit input as baseline as well. */ diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index a33c968bc..1d63a441c 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -381,7 +381,7 @@ xf86parseVerboseMode(void) Error(UNEXPECTED_EOF_MSG); break; default: - Error("Unexepcted token in verbose \"Mode\" entry\n"); + Error("Unexpected token in verbose \"Mode\" entry\n"); } } if (!had_dotclock) diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index d23e0f589..a37975ddf 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -309,7 +309,7 @@ vbeReadEDID(vbeInfoPtr pVbe) xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC read failed\n"); break; default: - xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unkown failure %i\n", + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unknown failure %i\n", pVbe->pInt10->ax & 0xff00); break; } diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c index ccce540e7..c9d463f3b 100644 --- a/hw/xfree86/x86emu/sys.c +++ b/hw/xfree86/x86emu/sys.c @@ -35,7 +35,7 @@ * Description: This file includes subroutines which are related to * programmed I/O and memory access. Included in this module * are default functions with limited usefulness. For real -* uses these functions will most likely be overriden by the +* uses these functions will most likely be overridden by the * user library. * ****************************************************************************/ diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c index c5e4a278b..6c1022358 100644 --- a/hw/xfree86/xorg-wrapper.c +++ b/hw/xfree86/xorg-wrapper.c @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) } #ifdef WITH_LIBDRM - /* Detect if we need root rights, except when overriden by the config */ + /* Detect if we need root rights, except when overridden by the config */ if (needs_root_rights == -1) { for (i = 0; i < 16; i++) { snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, i);