Merge im, teamchat and video-voice into real-time-communication

Resolves: #1078

Closes: #746

_config.yml

@@ -5,6 +5,7 @@ sass:
   style: compressed
 plugins:
   - jekyll-sitemap
+  - jekyll-redirect-from
 sitemap:
 file: "/sitemap.xml"
 include: [".well-known"]

_includes/nav.html

@@ -49,14 +49,12 @@
             <a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
-            <a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
-            <a class="dropdown-item" href="/software/teamchat/"><i class="fas fa-users fa-fw"></i> Team chat</a>
             <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
             <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
+            <a class="dropdown-item" href="/software/real-time-communication/"><i class="fas fa-telegram-plane"></i> Real time communication</a>
             <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
             <a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
             <a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
-            <a class="dropdown-item" href="/software/voip/"><i class="fas fa-phone fa-fw"></i> Video & Voice Messenger</a>
           </div>
         </li>
         <li class="nav-item dropdown">

pages/software/im.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/im/
-title: "Instant Messaging"
-description: "Discover secure and private ways to message others online without letting any third parties read your messages."
----
-
-{% include sections/instant-messenger.html %}

pages/software/real-time-communication.html

@@ -0,0 +1,16 @@
+---
+layout: page
+permalink: /software/real-time-communication/
+redirect_from:
+  - /software/im/
+  - /software/voip/
+  - /software/teamchat/
+title: "Real time communication"
+Discover secure and private ways to communicate with others online without letting any third parties read your messages.
+---
+
+{% include sections/instant-messenger.html %}
+
+{% include sections/voice-video-messenger.html %}
+
+{% include sections/teamchat.html %}

pages/software/teamchat.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/teamchat/
-title: "Team chat"
-description: "Discover secure and private ways to communicate with your team online without letting any third parties read your messages."
----
-
-{% include sections/teamchat.html %}

pages/software/video-voice.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/voip/
-title: "VoIP"
-description: "Find a voice and video messenger that supports completely End-to-End encrypted calls."
----
-
-{% include sections/voice-video-messenger.html %}