better organization

Author: Conengmo

docs/installing.rst docs/getting_started.rstdocs/installing.rst renamed to docs/getting_started.rst

@@ -1,5 +1,16 @@
+Getting started
+===============
+
+.. toctree::
+   :hidden:
+
+   Quickstart <getting_started/quickstart.md>
+
+
+
 Installation
-============
+------------
+
 Folium can be installed using
 
 ::
@@ -14,7 +25,7 @@ $ conda install folium -c conda-forge
 
 
 Dependencies
-============
+^^^^^^^^^^^^
 
 Folium has the following dependencies, all of which are installed automatically
 with the above installation commands:
@@ -26,3 +37,9 @@ with the above installation commands:
 
 Additional packages may be necessary for some functionality. It will say so in
 the documentation where that's the case.
+
+
+What's next
+-----------
+
+Check out the :doc:`Quickstart <getting_started/quickstart>`

docs/quickstart.md docs/getting_started/quickstart.mddocs/quickstart.md renamed to docs/getting_started/quickstart.md

@@ -1,9 +1,5 @@
 Quickstart
-==========
-
-Folium is a geographical visualization library for Python, based on
-[Leaflet.js](https://leafletjs.com/).
-
+===============
 
 Creating a map
 ---------------

docs/index.rst

@@ -5,8 +5,7 @@ Folium
 
 .. image:: _static/folium_logo.jpg
 
-Python data, leaflet.js maps
-****************************
+**Python data, leaflet.js maps**
 
 ``folium`` builds on the data wrangling strengths of the Python ecosystem and
 the mapping strengths of the ``leaflet.js`` library.
@@ -25,29 +24,13 @@ Mapbox, and Stamen, and supports custom tilesets with Mapbox or Cloudmade API ke
 ``folium`` supports both Image, Video, GeoJSON and TopoJSON overlays.
 
 
-Contents
-==================================
-
 .. toctree::
-   :maxdepth: 1
-   :caption: Getting Started
-
-   installing
-   quickstart.md
+   :hidden:
 
+   Home <self>
+   Getting started <getting_started>
+   API reference <reference>
 
-.. toctree::
-   :maxdepth: 1
-   :caption: User guide
-
-   flask
-
-.. toctree::
-   :maxdepth: 1
-   :caption: API reference
-
-   modules
-   plugins
 
 
 Indices and tables

docs/plugins.rst

@@ -1,28 +1,36 @@
-:mod:`folium`
--------------
+API reference
+=============
+
+Map
+--------------------
 
 .. automodule:: folium.folium
 
 
-:mod:`map`
-----------
+UI elements
+--------------------
 
 .. automodule:: folium.map
 
 
-:mod:`Vector Layers`
+Raster Layers
 --------------------
 
-.. automodule:: folium.vector_layers
+.. automodule:: folium.raster_layers
 
 
-:mod:`Raster Layers`
+Vector Layers
 --------------------
 
-.. automodule:: folium.raster_layers
+.. automodule:: folium.vector_layers
 
 
-:mod:`Extra Features`
+Other map features
 ---------------------
 
 .. automodule:: folium.features
+
+
+Plugins
+--------------------
+.. automodule:: folium.plugins

docs/modules.rst docs/reference.rstdocs/modules.rst renamed to docs/reference.rst

@@ -0,0 +1,24 @@
+User guide
+==========
+
+The user guide covers different parts of basic usage of Folium. Each page focuses on a single topic and outlines how it is implemented in Folium, with reproducible examples.
+
+If you don't know anything about Folium, start with the :doc:`Introduction to GeoPandas <../getting_started/introduction>`.
+
+Advanced topics can be found in the :doc:`Advanced Guide <advanced_guide>` and further specification in the :doc:`API Reference <reference>`.
+
+.. toctree::
+  :maxdepth: 2
+
+  Data structures <user_guide/data_structures>
+  Reading and writing files <user_guide/io>
+  Indexing and selecting data <user_guide/indexing>
+  Making maps and plots <user_guide/mapping>
+  Interactive mapping <user_guide/interactive_mapping>
+  Projections <user_guide/projections>
+  Geometric manipulations <user_guide/geometric_manipulations>
+  Set operations with overlay <user_guide/set_operations>
+  Aggregation with dissolve <user_guide/aggregation_with_dissolve>
+  Merging data <user_guide/mergingdata>
+  Geocoding <user_guide/geocoding>
+  Sampling points <user_guide/sampling>