Merge de766cb into 86c6145

JuliaData · Oct 17, 2017 · 0658622 · 0658622
2 parents 86c6145 + de766cb
commit 0658622
Show file tree

Hide file tree

Showing 19 changed files with 1,154 additions and 333 deletions.
diff --git a/docs/make.jl b/docs/make.jl
@@ -19,16 +19,11 @@ makedocs(
             "Reshaping" => "man/reshaping_and_pivoting.md",
             "Sorting" => "man/sorting.md",
             "Categorical Data" => "man/categorical.md",
-            "Querying frameworks" => "man/querying_frameworks.md",
+            "Querying frameworks" => "man/querying_frameworks.md"
         ],
         "API" => Any[
-            "Main types" => "lib/maintypes.md",
-            "Utilities" => "lib/utilities.md",
-            "Data manipulation" => "lib/manipulation.md",
-        ],
-        "About" => Any[
-            "Release Notes" => "NEWS.md",
-            "License" => "LICENSE.md",
+            "Types" => "lib/types.md",
+            "Functions" => "lib/functions.md"
         ]
     ]
 )

diff --git a/docs/src/LICENSE.md b/docs/src/LICENSE.md
diff --git a/docs/src/NEWS.md b/docs/src/NEWS.md
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -1,21 +1,40 @@
-# DataFrames Documentation Outline
+# DataFrames.jl
+
+Welcome to the DataFrames documentation! This resource aims to teach you everything you need
+to know to get up and running with tabular data manipulation using the DataFrames.jl package
+and the Julia language. If there is something you expect DataFrames to be capable of, but
+cannot figure out how to do, please reach out with questions in Domains/Data on
+[Discourse](https://discourse.julialang.org/new-topic?title=[DataFrames%20Question]:%20&body=%23%20Question:%0A%0A%23%20Dataset%20(if%20applicable):%0A%0A%23%20Minimal%20Working%20Example%20(if%20applicable):%0A&category=Domains/Data&tags=question).
+Please report bugs by
+[opening an issue](https://github.com/JuliaData/DataFrames.jl/issues/new). You can follow
+the [**source**]() links throughout the documentation to jump right to the
+source files on GitHub to make pull requests for improving the documentation and function
+capabilities. Please review
+[DataFrames contributing guidelines](https://github.com/JuliaData/DataFrames.jl/blob/master/CONTRIBUTING.md)
+before submitting your first PR! Information on specific versions can be found on the [Release page](https://github.com/JuliaData/DataFrames.jl/releases).
 
 ## Package Manual
 
 ```@contents
-Pages = ["man/getting_started.md", "man/joins.md", "man/split_apply_combine.md", "man/reshaping_and_pivoting.md", "man/sorting.md", "man/categorical.md", "man/querying_frameworks.md"]
+Pages = ["man/getting_started.md",
+         "man/joins.md",
+         "man/split_apply_combine.md",
+         "man/reshaping_and_pivoting.md",
+         "man/sorting.md",
+         "man/categorical.md",
+         "man/querying_frameworks.md"]
 Depth = 2
 ```
 
 ## API
 
 ```@contents
-Pages = ["lib/maintypes.md", "lib/manipulation.md", "lib/utilities.md"]
+Pages = ["lib/types.md", "lib/functions.md"]
 Depth = 2
 ```
 
-## Documentation Index
+## Index
 
 ```@index
-Pages = ["lib/maintypes.md", "lib/manipulation.md", "lib/utilities.md"]
+Pages = ["lib/types.md", "lib/functions.md"]
 ```
diff --git a/docs/src/lib/functions.md b/docs/src/lib/functions.md
@@ -0,0 +1,54 @@
+```@meta
+CurrentModule = DataFrames
+```
+
+# Functions
+
+```@index
+Pages = ["functions.md"]
+```
+
+## Grouping, Joining, and Split-Apply-Combine
+
+```@docs
+aggregate
+by
+colwise
+groupby
+join
+melt
+stack
+unstack
+stackdf
+meltdf
+```
+
+## Basics
+
+```@docs
+categorical!
+combine
+completecases
+deleterows!
+describe
+dropnull
+dropnull!
+eachcol
+eachrow
+eltypes
+head
+names
+names!
+nonunique
+nullable!
+order
+rename!
+rename
+show
+showcols
+size
+sort
+sort!
+tail
+unique!
+```
diff --git a/docs/src/lib/manipulation.md b/docs/src/lib/manipulation.md
diff --git a/docs/src/lib/maintypes.md → docs/src/lib/types.md b/docs/src/lib/maintypes.md → docs/src/lib/types.md
@@ -3,14 +3,17 @@
 CurrentModule = DataFrames
 ```
 
-# Main Types
+# Types
 
 ```@index
-Pages = ["maintypes.md"]
+Pages = ["types.md"]
 ```
 
 ```@docs
 AbstractDataFrame
 DataFrame
+DataFrameRow
+GroupApplied
+GroupedDataFrame
 SubDataFrame
 ```
diff --git a/docs/src/lib/utilities.md b/docs/src/lib/utilities.md