resolve conflicts

Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/psutil/arch/freebsd/sensors.c b/psutil/arch/freebsd/sensors.c
index ce7b2d92..0042adbe 100644
--- a/psutil/arch/freebsd/sensors.c
+++ b/psutil/arch/freebsd/sensors.c
@@ -64,7 +64,7 @@ psutil_sensors_cpu_temperature(PyObject *self, PyObject *args) {
         goto error;
     current = DECIKELVIN_2_CELCIUS(current);
 
-    // Return -273 in case of faliure.
+    // Return -273 in case of failure.
     sprintf(sensor, "dev.cpu.%d.coretemp.tjmax", core);
     if (sysctlbyname(sensor, &tjmax, &size, NULL, 0))
         tjmax = 0;
diff --git a/psutil/arch/solaris/environ.c b/psutil/arch/solaris/environ.c
index 482fe1fc..58afd63a 100644
--- a/psutil/arch/solaris/environ.c
+++ b/psutil/arch/solaris/environ.c
@@ -227,7 +227,7 @@ is_ptr_dereference_possible(psinfo_t info) {
 
 /*
  * Return pointer size according to psinfo_t structure
- * @param info a ponter to process info (psinfo_t) structure of the
+ * @param info a pointer to process info (psinfo_t) structure of the
  *             interesting process.
  * @return pointer size (4 or 8).
  */
@@ -284,9 +284,9 @@ search_pointers_vector_size_offt(int fd, off_t offt, size_t ptr_size) {
 
 
 /*
- * Derefence and read array of strings by psinfo_t.pr_argv pointer from
+ * Dereference and read array of strings by psinfo_t.pr_argv pointer from
  * remote process.
- * @param info a ponter to process info (psinfo_t) structure of the
+ * @param info a pointer to process info (psinfo_t) structure of the
  *             interesting process
  * @param procfs_path a cstring with path to mounted procfs filesystem.
  * @param count a pointer to variable where to store amount of elements in
@@ -333,7 +333,7 @@ psutil_read_raw_args(psinfo_t info, const char *procfs_path, size_t *count) {
 /*
  * Dereference and read array of strings by psinfo_t.pr_envp pointer
  * from remote process.
- * @param info a ponter to process info (psinfo_t) structure of the
+ * @param info a pointer to process info (psinfo_t) structure of the
  *             interesting process.
  * @param procfs_path a cstring with path to mounted procfs filesystem.
  * @param count a pointer to variable where to store amount of elements in
diff --git a/psutil/arch/windows/cpu.c b/psutil/arch/windows/cpu.c
index 20c01a0d..9d89e5bb 100644
--- a/psutil/arch/windows/cpu.c
+++ b/psutil/arch/windows/cpu.c
@@ -100,7 +100,7 @@ psutil_per_cpu_times(PyObject *self, PyObject *args) {
         goto error;
     }
 
-    // gets cpu time informations
+    // gets cpu time information
     status = NtQuerySystemInformation(
         SystemProcessorPerformanceInformation,
         sppi,
@@ -172,7 +172,7 @@ psutil_cpu_count_logical(PyObject *self, PyObject *args) {
     if (ncpus != 0)
         return Py_BuildValue("I", ncpus);
     else
-        Py_RETURN_NONE;  // mimick os.cpu_count()
+        Py_RETURN_NONE;  // mimic os.cpu_count()
 }
 
 
@@ -248,7 +248,7 @@ psutil_cpu_count_cores(PyObject *self, PyObject *args) {
     }
     else {
         psutil_debug("GetLogicalProcessorInformationEx() count was 0");
-        Py_RETURN_NONE;  // mimick os.cpu_count()
+        Py_RETURN_NONE;  // mimic os.cpu_count()
     }
 
 return_none: