From 58168b5dc6602181c931c66109225897785b3951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20H=C3=A4drich?=
 <11225821+shaedrich@users.noreply.github.com>
Date: Wed, 18 Oct 2023 15:05:29 +0200
Subject: [PATCH 1/2] Merge topics "test" and "testing" and remove
 "unit-testing" from aliases

---
 topics/test/index.md    | 9 ---------
 topics/testing/index.md | 7 +++----
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 topics/test/index.md

diff --git a/topics/test/index.md b/topics/test/index.md
deleted file mode 100644
index 30e436cc5ae..00000000000
--- a/topics/test/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-aliases: unit-testing, software-testing
-display_name: Test
-short_description: The act of examining the artifacts and the behavior of the software under test.
-topic: test
-wikipedia_url: https://en.wikipedia.org/wiki/Software_testing
----
-
-Software testing is the act of examining the artifacts and the behavior of the software under test by validation and verification. Software testing can also provide an objective, independent view of the software to allow the business to appreciate and understand the risks of software implementation.
\ No newline at end of file
diff --git a/topics/testing/index.md b/topics/testing/index.md
index d1ff99f35e8..1418f7c14cc 100644
--- a/topics/testing/index.md
+++ b/topics/testing/index.md
@@ -1,9 +1,8 @@
 ---
-aliases: testing-tools, testing-framework, testing-practices
+aliases: testing-tools, testing-framework, testing-practices, software-testing, test
 display_name: Testing
-short_description: Eliminate bugs and ship with more confidence by adding these tools to your workflow.
+short_description: The act of examining behavior of the software under test to Eliminate bugs and ship with more confidence.
 topic: testing
 wikipedia_url: https://en.wikipedia.org/wiki/Software_testing
 ---
-Testing is the practice of systematically testing software to make sure it works. Testing can be iterative, and happen multiple times.
-Eliminate bugs and ship with more confidence by adding these tools to your workflow.
+Software **testing** is the act of examining the artifacts and the behavior of the software under test by validation and verification to make sure it works. Software testing can also provide an objective, independent view of the software to allow the business to appreciate and understand the risks of software implementation. Testing can be iterative, and happen multiple times.

From 889e524be79aedddeb40c80de9dd80e81b043d80 Mon Sep 17 00:00:00 2001
From: Katherine Oelsner <49968061+octokatherine@users.noreply.github.com>
Date: Sun, 29 Oct 2023 10:43:49 -0700
Subject: [PATCH 2/2] fix unneeded capitalization

---
 topics/testing/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/topics/testing/index.md b/topics/testing/index.md
index 1418f7c14cc..2a603ee83a5 100644
--- a/topics/testing/index.md
+++ b/topics/testing/index.md
@@ -1,7 +1,7 @@
 ---
 aliases: testing-tools, testing-framework, testing-practices, software-testing, test
 display_name: Testing
-short_description: The act of examining behavior of the software under test to Eliminate bugs and ship with more confidence.
+short_description: The act of examining behavior of the software under test to eliminate bugs and ship with more confidence.
 topic: testing
 wikipedia_url: https://en.wikipedia.org/wiki/Software_testing
 ---