diff --git a/admin_manual/configuration_server/custom_client_repos.rst b/admin_manual/configuration_server/custom_client_repos.rst
new file mode 100644
index 000000000..a8acb288f
--- /dev/null
+++ b/admin_manual/configuration_server/custom_client_repos.rst
@@ -0,0 +1,26 @@
+===================================
+Custom Client Download Repositories
+===================================
+
+You may configure the URLs to your own download repositories for your ownCloud 
+desktop clients and mobile apps in :file:`config/config.php`. This example shows 
+the default download locations:
+
+.. code-block:: php
+
+  <?php
+
+    "customclient_desktop" => "https://owncloud.org/sync-clients/",
+    "customclient_android" => "https://play.google.com/store/apps/details?id=com.owncloud.android",
+    "customclient_ios"     => "https://itunes.apple.com/us/app/owncloud/id543672169?mt=8",
+
+Simply replace the URLs with the links to your own preferred download repos.
+
+You may test alternate URLs without editing :file:`config/config.php` by setting a test URL as an environment variable::
+
+ export OCC_UPDATE_URL=https://test.example.com
+  
+When you're finished testing you can disable the environment variable::
+
+ unset OCC_UPDATE_URL
+ 
\ No newline at end of file
diff --git a/admin_manual/configuration_server/index.rst b/admin_manual/configuration_server/index.rst
index f123a48cc..c38176240 100644
--- a/admin_manual/configuration_server/index.rst
+++ b/admin_manual/configuration_server/index.rst
@@ -14,6 +14,7 @@ ownCloud Server Configuration
    config_sample_php_parameters
    email_configuration
    external_sites
+   custom_client_repos
    knowledgebase_configuration
    language_configuration
    logging_configuration
diff --git a/admin_manual/enterprise_clients/custom_client_repos.rst b/admin_manual/enterprise_clients/custom_client_repos.rst
index 87769362f..8b52616ef 100644
--- a/admin_manual/enterprise_clients/custom_client_repos.rst
+++ b/admin_manual/enterprise_clients/custom_client_repos.rst
@@ -2,16 +2,5 @@
 Custom Client Download Repositories
 ===================================
 
-You may set up your own download repositories for your ownCloud desktop 
-clients and mobile apps in :file:`config/config.php`. This example shows 
-the default download locations:
-
-.. code-block:: php
-
-  <?php
-
-    "customclient_desktop" => "https://owncloud.org/sync-clients/",
-    "customclient_android" => "https://play.google.com/store/apps/details?id=com.owncloud.android",
-    "customclient_ios"     => "https://itunes.apple.com/us/app/owncloud/id543672169?mt=8",
-
-Simply replace the URLs with the links to your own preferred download repos.
\ No newline at end of file
+See :doc:`../configuration_server/custom_client_repos` to learn how test and
+configure custom download repository URLs for your branded clients.