Merge pull request #564 from nextcloud/mimetype

Combine mimetype page and fix style of prev/next

_shared_assets/themes/nextcloud_com/static/styles.css

@@ -1138,3 +1138,7 @@ a.headerlink {
   box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.3);
   border-radius: 2px;
 }
+
+li.next {
+    float: right;
+}

_shared_assets/themes/nextcloud_release/static/styles.css

@@ -479,3 +479,7 @@ li.next {
   box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.3);
   border-radius: 2px;
 }
+
+li.next {
+  float: right;
+}

admin_manual/configuration_mimetypes/index.rst

@@ -2,12 +2,66 @@
 Mimetypes Management
 ====================
 
+Mimetype Aliases
+----------------
 
-.. toctree::
-    :maxdepth: 2
-    
-    mimetype_aliases
-    mimetype_mapping
+Nextcloud allows you to create aliases for mimetypes, so that you can display 
+custom icons for files. For example, you might want a nice audio icon for audio 
+files instead of the default file icon.
+
+By default Nextcloud is distributed with 
+``nextcloud/resources/config/mimetypealiases.dist.json``.
+Do not modify this file, as it will be replaced when Nextcloud is updated. 
+Instead, create your own ``nextcloud/config/mimetypealiases.json`` 
+file with your custom aliases. Use the same syntax as in 
+``nextcloud/resources/config/mimetypealiases.dist.json``.
+
+Once you have made changes to your ``mimetypealiases.json``, use the ``occ`` 
+command to propagate the changes through the system. This example is for 
+Ubuntu Linux::
+
+  $ sudo -u www-data php occ maintenance:mimetype:update-js
+  
+See :doc:`../configuration_server/occ_command` to learn more about ``occ``.
+
+Some common mimetypes that may be useful in creating aliases are:
+
+image
+  Generic image
+
+image/vector
+  Vector image
+
+audio
+  Generic audio file
+
+x-office/document
+  Word processed document
+
+x-office/spreadsheet
+  Spreadsheet
+
+x-office/presentation
+  Presentation
+
+text
+  Generic text document
+
+text/code
+  Source code
+
+Mimetype mapping
+----------------
+
+Nextcloud allows administrators to specify the mapping of a file extension to a
+mimetype. For example files ending in ``mp3`` map to ``audio/mpeg``. Which 
+then in turn allows Nextcloud to show the audio icon.
+
+By default Nextcloud comes with ``mimetypemapping.dist.json``. This is a
+simple json array.
+Administrators should not update this file as it will get replaced on upgrades
+of Nextcloud. Instead the file ``mimetypemapping.json`` should be created and
+modified, this file has precedence over the shipped file. 
 
 Icon retrieval
 --------------

admin_manual/configuration_mimetypes/mimetype_aliases.rst

@@ -1,48 +0,0 @@
-================
-Mimetype Aliases
-================
-
-Nextcloud allows you to create aliases for mimetypes, so that you can display 
-custom icons for files. For example, you might want a nice audio icon for audio 
-files instead of the default file icon.
-
-By default Nextcloud is distributed with 
-``nextcloud/resources/config/mimetypealiases.dist.json``.
-Do not modify this file, as it will be replaced when Nextcloud is updated. 
-Instead, create your own ``nextcloud/config/mimetypealiases.json`` 
-file with your custom aliases. Use the same syntax as in 
-``nextcloud/resources/config/mimetypealiases.dist.json``.
-
-Once you have made changes to your ``mimetypealiases.json``, use the ``occ`` 
-command to propagate the changes through the system. This example is for 
-Ubuntu Linux::
-
-  $ sudo -u www-data php occ maintenance:mimetype:update-js
-  
-See :doc:`../configuration_server/occ_command` to learn more about ``occ``.
-
-Some common mimetypes that may be useful in creating aliases are:
-
-image
-  Generic image
-
-image/vector
-  Vector image
-
-audio
-  Generic audio file
-
-x-office/document
-  Word processed document
-
-x-office/spreadsheet
-  Spreadsheet
-
-x-office/presentation
-  Presentation
-
-text
-  Generic text document
-
-text/code
-  Source code

admin_manual/configuration_mimetypes/mimetype_mapping.rst

@@ -1,13 +0,0 @@
-Mimetype mapping
-================
-
-Nextcloud allows administrators to specify the mapping of a file extension to a
-mimetype. For example files ending in ``mp3`` map to ``audio/mpeg``. Which 
-then in turn allows Nextcloud to show the audio icon.
-
-By default Nextcloud comes with ``mimetypemapping.dist.json``. This is a
-simple json array.
-Administrators should not update this file as it will get replaced on upgrades
-of Nextcloud. Instead the file ``mimetypemapping.json`` should be created and
-modified, this file has precedence over the shipped file. 
-