diff --git a/page-appform.php b/page-appform.php
index 71762d9e4..8dd680d79 100644
--- a/page-appform.php
+++ b/page-appform.php
@@ -19,7 +19,7 @@
         <p><label for="appstoreurl">Link to your app on <a href="http://apps.nextcloud.com">the appstore</a><br>
         <input  type="text" name="appstoreurl" maxlength="120" size="40"></label></p>
         <p><label for="appdevurl">Link to the public repository<br />
-        <input  type="text" name="appdevurl" maxlength="120" size="40" placeholder="Where the app is developed (Github for example)"></label></p>
+        <input  type="text" name="appdevurl" maxlength="120" size="40" placeholder="Where the app is developed (GitHub for example)"></label></p>
         <p><label for="collaborators">Fellow authors<br />
         <textarea  type="text" name="collaborators" maxlength="1000" cols="40" rows="4" placeholder="Who else works or has worked with you on the app? Names, ideally also urls to profiles."></textarea></label></p>
         <p><label for="comments">Why is the app ready for users<br />
@@ -28,4 +28,4 @@
         <input type="submit" value=" Submit ">
     </div>
 </div>
-</form>-->
\ No newline at end of file
+</form>-->
diff --git a/page-connect.php b/page-connect.php
index 5aaddfa5f..a396b4b90 100644
--- a/page-connect.php
+++ b/page-connect.php
@@ -34,7 +34,7 @@
         <div class="col-md-12">
         <h3>How about security?</h3>
         <p>All of the security associated with Nextcloud is at work when you use the Nextcloud Proxy service. Nextcloud is still run by you, on your computer. You can monitor what is happening, manage accounts, check the logs, use your own SSL certificates, enable automatic updates and more. The appliance pre-configures much of Nextcloud for you. All you have to do is start the appliance, complete the setup and log into the web URL it provides. The Nextcloud browser wizard at the provided URL will step you through logging in for the first time. Of course, as you configure accounts for others to share on your Nextcloud, we recommend you use secure and complex passwords for all accounts.</p>
-        <p>However, we want to be completely transparent about the nature of Nextcloud Proxy. The Nextcloud Proxy app is distributed and the source code is in the Nextcloud repository for review in Github. The Nextcloud Proxy service is provided by PageKite. All files transferred through the Nextcloud Proxy service do pass through its data centers, and for a brief time are readable as the Nextcloud Proxy service transfers incoming requests from SSL to <a href="https://pagekite.net/wiki/Floss/PageKiteProtocol/">a pageKite protocol</a> on the way to the private Nextcloud Server. In theory, if someone wanted to, all files transferred to and from devices using the Nextcloud Proxy service could – for that brief instant of time that they are being moved from the SSL terminated connection to the tunnel in memory – be read by someone with Nextcloud Proxy service server access. While the risk is small, and our terms and conditions cover this situation, it is something we wanted to be clear about. However, there is no way for the Nextcloud Proxy service to access your data on your private server, it can only broker a connection with your private server.</p>
+        <p>However, we want to be completely transparent about the nature of Nextcloud Proxy. The Nextcloud Proxy app is distributed and the source code is in the Nextcloud repository for review in GitHub. The Nextcloud Proxy service is provided by PageKite. All files transferred through the Nextcloud Proxy service do pass through its data centers, and for a brief time are readable as the Nextcloud Proxy service transfers incoming requests from SSL to <a href="https://pagekite.net/wiki/Floss/PageKiteProtocol/">a pageKite protocol</a> on the way to the private Nextcloud Server. In theory, if someone wanted to, all files transferred to and from devices using the Nextcloud Proxy service could – for that brief instant of time that they are being moved from the SSL terminated connection to the tunnel in memory – be read by someone with Nextcloud Proxy service server access. While the risk is small, and our terms and conditions cover this situation, it is something we wanted to be clear about. However, there is no way for the Nextcloud Proxy service to access your data on your private server, it can only broker a connection with your private server.</p>
         </div>
         <div class="col-md-12">
         <h3>How are Nextcloud Proxy and the Nextcloud Server Appliance different than Nextcloud?</h3>
diff --git a/page-contribute.php b/page-contribute.php
index 305ce99c5..cfcfa429b 100644
--- a/page-contribute.php
+++ b/page-contribute.php
@@ -57,7 +57,7 @@
          <p>Translate Nextcloud to your language. Go to <a href="https://www.transifex.com/projects/p/nextcloud/">Transifex</a> and get going!</p>
         <p>Help us improve the Nextcloud documentation! Find out how to make a difference <a href="https://doc.nextcloud.org/howto_contribute.html">in this contribution guide</a>!</p>
         <p><img src="<?php echo get_template_directory_uri(); ?>/assets/img/misc/contribute-doc.gif" style="width: 100%" alt="front door" class="aligncenter" /></p>
-        <p>The animation shows the easiest way to contribute to the Nextcloud documentation. Go to the <a href="https://github.com/nextcloud/documentation">documentation in Github</a>, click the
+        <p>The animation shows the easiest way to contribute to the Nextcloud documentation. Go to the <a href="https://github.com/nextcloud/documentation">documentation in GitHub</a>, click the
         'edit' icon on a page, make the changes and create a pull request. This will notify the documentation maintainers of your proposed change and after review, it can be included!</p>
     </div>-->
 <!--    <div class="col-md-6">
diff --git a/page-faq.php b/page-faq.php
index 1ed03d011..a3e81481e 100644
--- a/page-faq.php
+++ b/page-faq.php
@@ -294,7 +294,7 @@
 <h3>How can I get started writing mobile (Android, iOS) clients or third party (web) apps?</h3>
 <ul>
 	<li>First of all, awesome you want to bring Nextcloud support to your app or build an app entirely for Nextcloud, rocking!</li>
-	<li>If you're interested in writing an Android or iOS app with Nextcloud support, you can use our MIT licensed libraries on those platforms. Find them on Github: <a href="https://github.com/nextcloud/ios-library">iOS</a>, <a href="https://github.com/nextcloud/android-library">Android</a>. You can then use the <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>ios_library">iOS</a> and <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>android_library">Android</a> developer docs.</li>
+	<li>If you're interested in writing an Android or iOS app with Nextcloud support, you can use our MIT licensed libraries on those platforms. Find them on GitHub: <a href="https://github.com/nextcloud/ios-library">iOS</a>, <a href="https://github.com/nextcloud/android-library">Android</a>. You can then use the <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>ios_library">iOS</a> and <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>android_library">Android</a> developer docs.</li>
 	<li>To build a third party application accessing Nextcloud data through its external API, <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>core/ocs-share-api.html">find the documentation here</a>.
 </ul>
 
diff --git a/page-install.php b/page-install.php
index e4c5566a9..54f9c6347 100644
--- a/page-install.php
+++ b/page-install.php
@@ -84,7 +84,7 @@
 			<i class="icon-rocket"></i>
 		</div>
 		<h2>Get Involved</h2>
-		<p>If you want to help out with <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>" target="_blank" rel="tooltip" title="Developer Documentation">developing</a> and <!--<a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>testing/index.html" target="_blank"  rel="tooltip" title="Testing Documentation">-->testing<!--</a>-->, grab a daily build. Our <a href="https://github.com/nextcloud" target="_blank">Github project is here</a> and the <a href="https://github.com/nextcloud/server/issues" target="_blank">issue tracker for the server here</a>.</p>
+		<p>If you want to help out with <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>" target="_blank" rel="tooltip" title="Developer Documentation">developing</a> and <!--<a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>testing/index.html" target="_blank"  rel="tooltip" title="Testing Documentation">-->testing<!--</a>-->, grab a daily build. Our <a href="https://github.com/nextcloud" target="_blank">GitHub project is here</a> and the <a href="https://github.com/nextcloud/server/issues" target="_blank">issue tracker for the server here</a>.</p>
 		<p><a href="<?php echo $DOWNLOAD_SERVER_DAILY_TAR; ?>" class="btn btn-lg btn-default"><i class="icon-archive"></i>  Daily build</a></p>
 		<?php if(!empty($SERVER_TESTING_VERSION)) { ?>
 			    <p>Latest testing version: <span class="label label-blue"><?php echo $SERVER_TESTING_VERSION; ?></span></p>
diff --git a/page-webrtc.php b/page-webrtc.php
index f6178ed63..5ce8b34da 100644
--- a/page-webrtc.php
+++ b/page-webrtc.php
@@ -126,7 +126,7 @@
 You should now have Spreed WebRTC installed.</p>
 
 <h3>2. Install the Spreed.ME Nextcloud app</h2>
-<p>We'll now install the Spreed.ME app. This can be done either from the Nextcloud App Store (if it is available there for your version of Nextcloud) or, as we'll show here, directly from Github.
+<p>We'll now install the Spreed.ME app. This can be done either from the Nextcloud App Store (if it is available there for your version of Nextcloud) or, as we'll show here, directly from GitHub.
 <ol>
  	<li><code>cd /srv/www/htdocs/nextcloud/apps</code><br/>
  	Go to the Nextcloud app folder on your server</li>