From 6f5812c4547dd912dd0569330ebdd44a5afd278e Mon Sep 17 00:00:00 2001
From: Darren Garvey <darren.garvey@gmail.com>
Date: Wed, 2 Sep 2015 00:54:06 +0100
Subject: [PATCH] Fix up documentation errors.

Fix some doxygen warnings about an undocumented argument in Blob and
incorrect documentation for SoftmaxWithLossLayer::Forward_cpu().
---
 include/caffe/blob.hpp        | 2 +-
 include/caffe/loss_layers.hpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/caffe/blob.hpp b/include/caffe/blob.hpp
index 9b813e7..dda7b1f 100644
--- a/include/caffe/blob.hpp
+++ b/include/caffe/blob.hpp
@@ -109,7 +109,7 @@ class Blob {
    * @brief Returns the 'canonical' version of a (usually) user-specified axis,
    *        allowing for negative indexing (e.g., -1 for the last axis).
    *
-   * @param index the axis index.
+   * @param axis_index the axis index.
    *        If 0 <= index < num_axes(), return index.
    *        If -num_axes <= index <= -1, return (num_axes() - (-index)),
    *        e.g., the last axis index (num_axes() - 1) if index == -1,
diff --git a/include/caffe/loss_layers.hpp b/include/caffe/loss_layers.hpp
index 02687a9..8d41af3 100644
--- a/include/caffe/loss_layers.hpp
+++ b/include/caffe/loss_layers.hpp
@@ -712,7 +712,6 @@ class SoftmaxWithLossLayer : public LossLayer<Dtype> {
   virtual inline int MaxTopBlobs() const { return 2; }
 
  protected:
-  /// @copydoc SoftmaxWithLossLayer
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       const vector<Blob<Dtype>*>& top);
   virtual void Forward_gpu(const vector<Blob<Dtype>*>& bottom,
-- 
2.7.4