From 64ce32ddcf5c8e242e99ff74f82958338112afb8 Mon Sep 17 00:00:00 2001
From: janEbert <janpublicebert@posteo.net>
Date: Sat, 4 Apr 2020 22:55:14 +0200
Subject: [PATCH] Fix problems due to rebase

---
 docs/make.jl                        |  1 -
 docs/src/training/loss_functions.md | 13 -------------
 src/layers/basic.jl                 |  7 +++----
 src/utils.jl                        |  8 +++++++-
 4 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 docs/src/training/loss_functions.md

diff --git a/docs/make.jl b/docs/make.jl
index 0ee0ccab..be4522eb 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -17,7 +17,6 @@ makedocs(modules=[Flux, NNlib],
                      "DataLoader" => "data/dataloader.md"],
                   "Training Models" =>
                     ["Optimisers" => "training/optimisers.md",
-                     "Loss Functions" => "training/loss_functions.md",
                      "Training" => "training/training.md"],
                   "GPU Support" => "gpu.md",
                   "Saving & Loading" => "saving.md",
diff --git a/docs/src/training/loss_functions.md b/docs/src/training/loss_functions.md
deleted file mode 100644
index ed002a41..00000000
--- a/docs/src/training/loss_functions.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Loss Functions
-
-The following functions provide basic loss (or cost) functions.
-
-```@docs
-Flux.mse
-Flux.crossentropy
-Flux.logitcrossentropy
-Flux.binarycrossentropy
-Flux.logitbinarycrossentropy
-Flux.normalise
-```
-
diff --git a/src/layers/basic.jl b/src/layers/basic.jl
index 4b0b4726..4c58b9d7 100644
--- a/src/layers/basic.jl
+++ b/src/layers/basic.jl
@@ -98,10 +98,9 @@ julia> d = Dense(5, 2)
 Dense(5, 2)
 
 julia> d(rand(5))
-Array{Float64,1}:
-  0.00257447
-  -0.00449443
-```
+2-element Array{Float32,1}:
+  -0.16210233
+   0.12311903```
 """
 struct Dense{F,S,T}
   W::S
diff --git a/src/utils.jl b/src/utils.jl
index 40f0ae9c..c666caca 100644
--- a/src/utils.jl
+++ b/src/utils.jl
@@ -128,7 +128,13 @@ Split `xs` into `n` parts.
 # Examples
 ```jldoctest
 julia> Flux.chunk(1:10, 3)
-3-element Array{Array{Int64,1},1}:
+3-element Array{UnitRange{Int64},1}:
+ 1:4
+ 5:8
+ 9:10
+
+julia> Flux.chunk(collect(1:10), 3)
+3-element Array{SubArray{Int64,1,Array{Int64,1},Tuple{UnitRange{Int64}},true},1}:
  [1, 2, 3, 4]
  [5, 6, 7, 8]
  [9, 10]