qgis · DelazJ · Jul 19, 2017 · May 24, 2017 · Jun 4, 2017 · Jun 4, 2017
diff --git a/resources/en/docs/user_manual/managing_data_source/addpostgistables.png b/resources/en/docs/user_manual/managing_data_source/addpostgistables.png
diff --git a/...king_with_vector/addvectorlayerdialog.png → ...ging_data_source/addvectorlayerdialog.png b/...king_with_vector/addvectorlayerdialog.png → ...ging_data_source/addvectorlayerdialog.png
diff --git a/...er_manual/qgis_browser/browser_panels.png → ...l/managing_data_source/browser_panels.png b/...er_manual/qgis_browser/browser_panels.png → ...l/managing_data_source/browser_panels.png
diff --git a/...ing_with_vector/create_virtual_layers.png → ...ing_data_source/create_virtual_layers.png b/...ing_with_vector/create_virtual_layers.png → ...ing_data_source/create_virtual_layers.png
diff --git a/...al/introduction/delimited_text_dialog.png → ...ing_data_source/delimited_text_dialog.png b/...al/introduction/delimited_text_dialog.png → ...ing_data_source/delimited_text_dialog.png
diff --git a/...working_with_vector/editNewSpatialite.png → ...anaging_data_source/editNewSpatialite.png b/...working_with_vector/editNewSpatialite.png → ...anaging_data_source/editNewSpatialite.png
diff --git a/...ual/working_with_vector/editNewVector.png → ...al/managing_data_source/editNewVector.png b/...ual/working_with_vector/editNewVector.png → ...al/managing_data_source/editNewVector.png
diff --git a/resources/en/docs/user_manual/managing_data_source/newpostgisconnection.png b/resources/en/docs/user_manual/managing_data_source/newpostgisconnection.png
diff --git a/resources/en/docs/user_manual/managing_data_source/saveasraster.png b/resources/en/docs/user_manual/managing_data_source/saveasraster.png
diff --git a/resources/en/docs/user_manual/managing_data_source/saveasvector.png b/resources/en/docs/user_manual/managing_data_source/saveasvector.png
diff --git a/...l/working_with_vector/shapefileloaded.png → .../managing_data_source/shapefileloaded.png b/...l/working_with_vector/shapefileloaded.png → .../managing_data_source/shapefileloaded.png
diff --git a/...rking_with_vector/shapefileopendialog.png → ...aging_data_source/shapefileopendialog.png b/...rking_with_vector/shapefileopendialog.png → ...aging_data_source/shapefileopendialog.png
diff --git a/...working_with_vector/vectorNotWrapping.png → ...anaging_data_source/vectorNotWrapping.png b/...working_with_vector/vectorNotWrapping.png → ...anaging_data_source/vectorNotWrapping.png
diff --git a/...al/working_with_vector/vectorWrapping.png → ...l/managing_data_source/vectorWrapping.png b/...al/working_with_vector/vectorWrapping.png → ...l/managing_data_source/vectorWrapping.png
diff --git a/source/docs/user_manual/grass_integration/grass_integration.rst b/source/docs/user_manual/grass_integration/grass_integration.rst
@@ -215,8 +215,8 @@ exercises in the following GRASS-related sections. It is useful to download and
 install the dataset on your computer (see :ref:`label_sampledata`).
 
 #. Start QGIS and make sure the GRASS plugin is loaded.
-#. Visualize the :file:`alaska.shp` shapefile (see section
-   :ref:`vector_loading_file`) from the QGIS Alaska dataset (see :ref:`label_sampledata`).
+#. Visualize the :file:`alaska.shp` shapefile (see section :ref:`loading_file`)
+   from the QGIS Alaska dataset (see :ref:`label_sampledata`).
 #. In the GRASS toolbar, click on the |grassNewMapset| :sup:`New mapset` icon
    to bring up the :guilabel:`MAPSET` wizard.
 #. Select an existing GRASS database (GISDBASE) folder :file:`grassdata`, or create

diff --git a/source/docs/user_manual/index.rst b/source/docs/user_manual/index.rst
@@ -21,7 +21,7 @@ QGIS User Guide
     introduction/general_tools
     introduction/qgis_configuration
     working_with_projections/working_with_projections
-    qgis_browser/qgis_browser
+    managing_data_source/index
     working_with_vector/index
     working_with_raster/index
     print_composer/index

diff --git a/source/docs/user_manual/introduction/general_tools.rst b/source/docs/user_manual/introduction/general_tools.rst
@@ -1648,119 +1648,6 @@ files. For more information see :ref:`authentication_index`.
 A master password needs to be set up when initializing the authentication
 system and its portable database.
 
-.. index:: Save layer
-.. _general_saveas:
-
-Save layer into file
-=====================
-
-Layers (raster or vector) can be saved in another format with the
-:guilabel:`Save As...` feature in the layer contextual menu (by right-clicking
-in the layer in the layer tree) or in the :menuselection:`Layer --> Save As...`
-menu.
-
-Common parameters
------------------
-
-The :guilabel:`Save As` dialog shows several parameters to change the behavior
-when saving the layer. Common parameters (raster and vector) are:
-
-* :guilabel:`Format`
-* :guilabel:`File name`
-* :guilabel:`CRS`
-* :guilabel:`Add saved file to map` to add the new layer to the canvas
-* :guilabel:`Extent` (possible values are **layer**, **Map view** or **user-defined**
-  extent)
-
-However, some parameters are specific to raster and vector formats:
-
-Raster specific parameters
---------------------------
-
-* :guilabel:`Output mode` (it can be **raw data** or **rendered image**)
-* :guilabel:`Resolution`
-* :guilabel:`Create Options`: advanced options (file compression, block sizes, colorimetry...)
-  to fine tune the output file. See the `gdal-ogr <http://gdal.org>`_ driver documentation.
-* :guilabel:`Pyramids` creation
-* :guilabel:`VRT Tiles`
-* :guilabel:`No data values`
-
-
-Vector specific parameters
---------------------------
-
-Depending on the format of export, some of these options are available or not:
-
-* :guilabel:`Encoding`
-* :guilabel:`Save only selected features`
-* :guilabel:`Select fields to export and their export options`. In case you set your
-  fields behavior with some :ref:`Edit widgets <configure_field>`, e.g. ``value
-  map``, you can keep the displayed values in the layer by checking |checkbox|
-  :guilabel:`Replace all selected raw fields values by displayed values`.
-* :guilabel:`Symbology export`: can be used mainly for DXF export and for all file
-  formats who manage OGR feature styles (see note below) as DXF, KML, tab
-  file formats:
-
-  * **No symbology**: default style of the application that reads the data
-  * **Feature symbology**: save style with OGR Feature Styles (see note below)
-  * **Symbol Layer symbology**: save with OGR Feature Styles (see note below)
-    but export the same geometry multiple times if there are multiple symbology
-    symbol layers used
-  * A **Scale** value can be applied to the latest options.
-
-.. _ogr_features_note:
-
-.. note:: *OGR Feature Styles* are a way to store style directly in
-     the data as a hidden attribute. Only some formats can handle this kind of
-     information. KML, DXF and TAB file formats are such formats. For advanced
-     users, you can read the `OGR Feature Styles specification
-     <http://www.gdal.org/ogr_feature_style.html>`_ document.
-
-* :guilabel:`Geometry`: you can configure the geometry capabilities of the output layer
-
-  * :guilabel:`geometry type`: keep the original geometry of the features when set to 
-    **Automatic**, otherwise removes or overrides it with any type. You can add
-    an empty geometry column to an attribute table, remove the geometry column
-    of a spatial layer.
-  * :guilabel:`Force multi-type`: force creation of multi-geometry features in the layer
-  * :guilabel:`Include z-dimension` to geometries.
-
-.. tip::
-
-  Overriding layer geometry type makes it possible to do things like save a
-  geometryless table (e.g. :file:`.csv` file) into a shapefile WITH any type of
-  geometry (point, line, polygon), so that geometries can then be manually added
-  to rows with the |addPart| :sup:`Add Part` tool .
-
-* :guilabel:`Datasources Options`, :guilabel:`Layer Options` or :guilabel:`Custom Options`
-  which allow you to configure some advanced parameters. See the `gdal-ogr <http://gdal.org>`_
-  driver documentation.
-
-.. index:: Overwrite file, Append features
-
-When saving a vector layer into an existing file, depending on the capabilities
-of the output format (Geopackage, SpatiaLite, FileGDB...), the user can
-decide whether to:
-
-* overwrite the whole file
-* overwrite only the target layer (the layer name is configurable)
-* append features to the existing target layer
-* append features, add new fields if there are any.
-
-For formats like Shapefile, MapInfo .tab, feature append is also available.
-
-.. note:: **About DXF files**
-
-   Vector layers can be exported to DXF files using another tool, the
-   :guilabel:`DXF Export...` in :menuselection:`Project`. The windows allow the
-   user to choose the layer file, the symbology mode (see the `OGR Feature Styles
-   <ogr_features_note>`_ note), the symbology scale, the encoding, the visibility
-   preset and the layers to include in the DXF file.
-
-
-   As an option, you can |checkbox| :guilabel:`Use the layer title as name if set`
-   or :guilabel:`Export features intersecting the current map extent`.
-
 .. index:: Variables, Expressions
 
 .. _`general_tools_variables`:

diff --git a/source/docs/user_manual/introduction/qgis_gui.rst b/source/docs/user_manual/introduction/qgis_gui.rst
@@ -259,7 +259,7 @@ Vector
 ==============================================================  ====================  ==========================================  ===============================
 Menu Option                                                     Shortcut              Reference                                   Toolbar
 ==============================================================  ====================  ==========================================  ===============================
-:menuselection:`OpenStreetMap -->`                              \                     see :ref:`open_street_map`                  \
+:menuselection:`OpenStreetMap -->`                              \                     see :ref:`openstreetmap`                    \
 |analysis| :menuselection:`Analysis Tools -->`                  \                     see :ref:`vector_menu`                      \
 |sampling| :menuselection:`Research Tools -->`                  \                     see :ref:`vector_menu`                      \
 |geoprocessing| :menuselection:`Geoprocessing Tools -->`        \                     see :ref:`vector_menu`                      \
@@ -463,7 +463,7 @@ Also called **Map canvas**, this is the "business end" of QGIS ---
 maps are displayed in this area. The map displayed in this window
 will depend on the vector and raster layers you have chosen to load.
 
-When you add a layer (see e.g. :ref:`vector_loading_file`), QGIS automatically
+When you add a layer (see e.g. :ref:`opening_data`), QGIS automatically
 looks for its Coordinate Reference System (CRS) and zooms to its extent if you
 work in a blank QGIS project. The layer's CRS is then applied to the project.
 If there are already layers in the project, and in the case the new layer has