; Fix typos (don't abbreviate "with" or "without")

11 files changed, 25 insertions, 23 deletions

diff --git a/test/lisp/cedet/semantic-utest.el b/test/lisp/cedet/semantic-utest.el
index b577b198089..4aaa4c5e3c4 100644
--- a/test/lisp/cedet/semantic-utest.el
+++ b/test/lisp/cedet/semantic-utest.el
@@ -593,7 +593,7 @@ INSERTME is the text to be inserted after the deletion."
   )
 
 (ert-deftest semantic-utest-Scheme()
-  (skip-unless nil) ;; There is a bug w/ scheme parser.  Skip this for now.
+  (skip-unless nil) ;; There is a bug with scheme parser.  Skip this for now.
   (semantic-utest-generic (semantic-utest-fname "tst.scm") semantic-utest-Scheme-buffer-contents  semantic-utest-Scheme-name-contents   '("fun2") ";1" ";deleted line")
   )
 
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
index af19c122b9f..05d24a8e35d 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
@@ -308,7 +308,7 @@
     (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
     (eieio-test-match ans)))
 
-;;; Jan's methodinvoke order w/ multiple inheritance and :after methods.
+;;; Jan's methodinvoke order with multiple inheritance and :after methods.
 ;;
 (defclass eitest-Ja ()
   ())
diff --git a/test/lisp/erc/erc-join-tests.el b/test/lisp/erc/erc-join-tests.el
index 8210defbfbd..89521ba4292 100644
--- a/test/lisp/erc/erc-join-tests.el
+++ b/test/lisp/erc/erc-join-tests.el
@@ -335,7 +335,7 @@
               (start-process "true" (current-buffer) "true")
               erc-server-current-nick "tester"
               erc-server-announced-name "foo.gnu.chat"
-              ;; Assume special case w/o known network
+              ;; Assume special case without known network
               erc-networks--id (make-erc-networks--id))
         (set-process-query-on-exit-flag erc-server-process nil)
         (should-not calls)
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index d82e2dae7aa..724cd63e222 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -1590,8 +1590,8 @@ the file watch."
   (unwind-protect
       (progn
 	(write-region "any text" nil file-notify--test-tmpfile1 nil 'no-message)
-        ;; Some systems, like MS Windows w/o sufficient privileges, do
-        ;; not allow creation of symbolic links.
+        ;; Some systems, like MS Windows without sufficient
+        ;; privileges, do not allow creation of symbolic links.
         (condition-case nil
             (make-symbolic-link
              file-notify--test-tmpfile1 file-notify--test-tmpfile)
diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el
index f8a0aa03e32..d9eafc47ad7 100644
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -123,7 +123,7 @@ the origin of the temporary TMPFILE, have no write permissions."
 
 (defun tramp-archive--test-emacs27-p ()
   "Check for Emacs version >= 27.1.
-Some semantics has been changed for there, w/o new functions or
+Some semantics has been changed for there, without new functions or
 variables, so we check the Emacs version directly."
   (>= emacs-major-version 27))
 
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 6ffb8a65292..79b2fc803d6 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6597,20 +6597,20 @@ INPUT, if non-nil, is a string sent to the process."
 
 (defun tramp--test-emacs27-p ()
   "Check for Emacs version >= 27.1.
-Some semantics has been changed for there, w/o new functions or
-variables, so we check the Emacs version directly."
+Some semantics has been changed for there, without new functions
+or variables, so we check the Emacs version directly."
   (>= emacs-major-version 27))
 
 (defun tramp--test-emacs28-p ()
   "Check for Emacs version >= 28.1.
-Some semantics has been changed for there, w/o new functions or
-variables, so we check the Emacs version directly."
+Some semantics has been changed for there, without new functions
+or variables, so we check the Emacs version directly."
   (>= emacs-major-version 28))
 
 (defun tramp--test-emacs29-p ()
   "Check for Emacs version >= 29.1.
-Some semantics has been changed for there, w/o new functions or
-variables, so we check the Emacs version directly."
+Some semantics has been changed for there, without new functions
+or variables, so we check the Emacs version directly."
   (>= emacs-major-version 29))
 
 (defun tramp--test-adb-p ()
diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index b365908c639..2c5ba46855d 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -333,7 +333,8 @@ ERRORCONDITION is some error that may have occurred during testing."
   "Add into the log that the last item is done.
 Apply NOTES to the doneness of the log.
 Apply ERR if there was an error in previous item.
-Optional argument PRECR indicates to prefix the done msg w/ a newline."
+Optional argument PRECR indicates to prefix the done message with
+a newline."
   (if noninteractive
       ;; Non-interactive-mode - show a message.
       (if notes
diff --git a/test/manual/cedet/semantic-tests.el b/test/manual/cedet/semantic-tests.el
index dcdeb45b0a3..1d0e668d96f 100644
--- a/test/manual/cedet/semantic-tests.el
+++ b/test/manual/cedet/semantic-tests.el
@@ -87,7 +87,8 @@ run the test again")))
 (defun semanticdb-test-gnu-global (searchfor &optional standardfile)
   "Test the GNU Global semanticdb.
 Argument SEARCHFOR is the text to search for.
-If optional arg STANDARDFILE is non-nil, use a standard file w/ global enabled."
+If optional arg STANDARDFILE is non-nil, use a standard file with
+global enabled."
   (interactive "sSearch For Tag: \nP")
 
   (require 'data-debug)
diff --git a/test/manual/cedet/tests/testpolymorph.cpp b/test/manual/cedet/tests/testpolymorph.cpp
index ba64e39a7a5..cfe44ecc4d3 100644
--- a/test/manual/cedet/tests/testpolymorph.cpp
+++ b/test/manual/cedet/tests/testpolymorph.cpp
@@ -22,7 +22,7 @@
 
 #include <cmath>
 
-// Test 1 - Functions w/ prototypes
+// Test 1 - Functions with prototypes
 namespace proto {
 
   int pt_func1(int arg1);
@@ -32,7 +32,7 @@ namespace proto {
 
 }
 
-// Test 2 - Functions w/ different arg lists.
+// Test 2 - Functions with different arg lists.
 namespace fcn_poly {
 
   int pm_func(void) {
@@ -50,7 +50,7 @@ namespace fcn_poly {
 
 }
 
-// Test 3 - Methods w/ different arg lists.
+// Test 3 - Methods with different arg lists.
 class meth_poly {
 public:
   int pm_meth(void) {
@@ -68,7 +68,7 @@ public:
 
 };
 
-// Test 4 - Templates w/ partial specifiers.
+// Test 4 - Templates with partial specifiers.
 namespace template_partial_spec {
   template <typename T> class test
   {
@@ -83,7 +83,7 @@ namespace template_partial_spec {
   };
 }
 
-// Test 5 - Templates w/ full specialization which may or may not share
+// Test 5 - Templates with full specialization which may or may not share
 // common functions.
 namespace template_full_spec {
   template <typename T> class test
diff --git a/test/manual/cedet/tests/testsppreplace.c b/test/manual/cedet/tests/testsppreplace.c
index 54ae3f0323e..d255c202d35 100644
--- a/test/manual/cedet/tests/testsppreplace.c
+++ b/test/manual/cedet/tests/testsppreplace.c
@@ -66,7 +66,7 @@ int myFcn3 (int a, int b);
 
 MULTI_ARGS(ma_struct, moose, penguin, emu);
 
-/* TEST: Macro w/ args, but no body. */
+/* TEST: Macro with args, but no body. */
 #define NO_BODY(name)
 
 NO_BODY(Moose);
@@ -78,7 +78,7 @@ int not_with_args_fcn NOT_WITH_ARGS
 {
 }
 
-/* TEST: macro w/ continuation. */
+/* TEST: macro with continuation. */
 #define WITH_CONT \
   continuation_symbol
 
diff --git a/test/manual/cedet/tests/testsppreplaced.c b/test/manual/cedet/tests/testsppreplaced.c
index c359fa7d690..c98349174e5 100644
--- a/test/manual/cedet/tests/testsppreplaced.c
+++ b/test/manual/cedet/tests/testsppreplaced.c
@@ -55,14 +55,14 @@ int myFcn3 (int a, int b);
 /* TEST: Multiple args to a macro. */
 struct ma_struct { int moose; int penguin; int emu; };
 
-/* TEST: Macro w/ args, but no body. */
+/* TEST: Macro with args, but no body. */
 
 /* TEST: Not a macro with args, but close. */
 int not_with_args_fcn (moose)
 {
 }
 
-/* TEST: macro w/ continuation. */
+/* TEST: macro with continuation. */
 int continuation_symbol () { };
 
 /* TEST: macros in a macro - tail processing */