summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--docs/trouble-shooting.txt2
-rw-r--r--include/synaptics-properties.h4
-rw-r--r--man/synaptics.man4
-rw-r--r--src/alpscomm.c2
-rw-r--r--src/eventcomm.c4
-rw-r--r--src/synapticsstr.h4
7 files changed, 11 insertions, 11 deletions
diff --git a/README.md b/README.md
index 5413628..d86c758 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ Xorg mailing list:
https://lists.x.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/driver/xf86-input-synaptics
diff --git a/docs/trouble-shooting.txt b/docs/trouble-shooting.txt
index 3d2e012..59dd2ff 100644
--- a/docs/trouble-shooting.txt
+++ b/docs/trouble-shooting.txt
@@ -145,7 +145,7 @@ Possible fixes:
On some computers, it is possible to disable the touchpad either with
a special key combination, from the BIOS, or with a special touchpad
on/off button. On some machines, cycling the power doesn't
-automatically reenable the touchpad.
+automatically re-enable the touchpad.
If the touchpad appears to be dead, try to enable it from the BIOS or
using a key combination. One user also reported that he had to remove
diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
index 0f79b64..a0d7524 100644
--- a/include/synaptics-properties.h
+++ b/include/synaptics-properties.h
@@ -149,10 +149,10 @@
/* 32 bit, 4 values, left, right, top, bottom */
#define SYNAPTICS_PROP_AREA "Synaptics Area"
-/* 32 bit, 4 values, left, right, top, buttom */
+/* 32 bit, 4 values, left, right, top, bottom */
#define SYNAPTICS_PROP_SOFTBUTTON_AREAS "Synaptics Soft Button Areas"
-/* 32 bit, 4 values, left, right, top, buttom */
+/* 32 bit, 4 values, left, right, top, bottom */
#define SYNAPTICS_PROP_SECONDARY_SOFTBUTTON_AREAS "Synaptics Secondary Soft Button Areas"
/* 32 Bit Integer, 2 values, horizontal hysteresis, vertical hysteresis */
diff --git a/man/synaptics.man b/man/synaptics.man
index 4f87b01..4432f01 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -408,7 +408,7 @@ from user space.
.
When changing this parameter with the synclient program, the change
will not take effect until the synaptics driver is disabled and
-reenabled.
+re-enabled.
.
This can be achieved by switching to a text console and then switching
back to X.
@@ -714,7 +714,7 @@ when the finger leaves the corner.
The synaptics has a built-in noise cancellation based on hysteresis. This means
that incoming coordinates actually shift a box of predefined dimensions such
that it covers the incoming coordinate, and only the boxes own center is used
-as input. Obviously, the smaller the box the better, but the likelyhood of
+as input. Obviously, the smaller the box the better, but the likelihood of
noise motion coming through also increases.
.SS ClickPad support
diff --git a/src/alpscomm.c b/src/alpscomm.c
index c565636..b19ea6c 100644
--- a/src/alpscomm.c
+++ b/src/alpscomm.c
@@ -130,7 +130,7 @@ ALPS_get_packet(struct CommData *comm, InputInfoPtr pInfo)
}
/*
- * ALPS abolute Mode
+ * ALPS absolute Mode
* byte 0: 1 1 1 1 1 mid0 rig0 lef0
* byte 1: 0 x6 x5 x4 x3 x2 x1 x0
* byte 2: 0 x10 x9 x8 x7 up1 fin ges
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 6862539..b24ed21 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -291,7 +291,7 @@ EventDeviceOffHook(InputInfoPtr pInfo)
}
/**
- * Test if the device on the file descriptior is recognized as touchpad
+ * Test if the device on the file descriptor is recognized as touchpad
* device. Required bits for touchpad recognition are:
* - ABS_X + ABS_Y for absolute axes
* - ABS_PRESSURE or BTN_TOUCH
@@ -418,7 +418,7 @@ event_get_abs(struct libevdev *evdev, int code,
*min = abs->minimum;
*max = abs->maximum;
- /* We dont trust a zero fuzz as it probably is just a lazy value */
+ /* We don't trust a zero fuzz as it probably is just a lazy value */
if (fuzz && abs->fuzz > 0)
*fuzz = abs->fuzz;
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 33524e5..7972a9c 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -296,8 +296,8 @@ struct _SynapticsPrivateRec {
int prevFingers; /* previous numFingers, for transition detection */
int avg_width; /* weighted average of previous fingerWidth values */
#ifndef NO_DRIVER_SCALING
- double horiz_coeff; /* normalization factor for x coordintes */
- double vert_coeff; /* normalization factor for y coordintes */
+ double horiz_coeff; /* normalization factor for x coordinates */
+ double vert_coeff; /* normalization factor for y coordinates */
#endif
int minx, maxx, miny, maxy; /* min/max dimensions as detected */