From 079f5faad88353ec64d44bbe08d612e514fc0819 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzychb@gazeta.pl>
Date: Sat, 29 Oct 2016 23:15:27 +0200
Subject: [PATCH] Fixed confused Sphinx

Sphinx failed to phrase esp_log_timestamp
reorderdering esp_log_write and esp_log_timestamp fixed this issue
---
 components/log/include/esp_log.h | 23 +++++++++++------------
 docs/api/log.rst                 |  3 +--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/components/log/include/esp_log.h b/components/log/include/esp_log.h
index 2878dc5015..6716f6e10f 100644
--- a/components/log/include/esp_log.h
+++ b/components/log/include/esp_log.h
@@ -29,7 +29,7 @@ extern "C" {
  */
 typedef enum {
     ESP_LOG_NONE,       /*!< No log output */
-    ESP_LOG_ERROR,      /*!<  Critical errors, software module can not recover on its own */
+    ESP_LOG_ERROR,      /*!< Critical errors, software module can not recover on its own */
     ESP_LOG_WARN,       /*!< Error conditions from which recovery measures have been taken */
     ESP_LOG_INFO,       /*!< Information messages which describe normal flow of events */
     ESP_LOG_DEBUG,      /*!< Extra information which is not necessary for normal use (values, pointers, sizes, etc). */
@@ -60,17 +60,6 @@ void esp_log_level_set(const char* tag, esp_log_level_t level);
  */
 void esp_log_set_vprintf(vprintf_like_t func);
 
-/**
- * @brief Write message into the log
- *
- * This function is not intended to be used directly. Instead, use one of
- * ESP_LOGE, ESP_LOGW, ESP_LOGI, ESP_LOGD, ESP_LOGV macros.
- *
- * This function or these macros should not be used from an interrupt.
- */
-void esp_log_write(esp_log_level_t level, const char* tag, const char* format, ...) __attribute__ ((format (printf, 3, 4)));
-
-
 /**
  * @brief Function which returns timestamp to be used in log output
  *
@@ -85,6 +74,16 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, .
  */
 uint32_t esp_log_timestamp(void);
 
+/**
+ * @brief Write message into the log
+ *
+ * This function is not intended to be used directly. Instead, use one of
+ * ESP_LOGE, ESP_LOGW, ESP_LOGI, ESP_LOGD, ESP_LOGV macros.
+ *
+ * This function or these macros should not be used from an interrupt.
+ */
+void esp_log_write(esp_log_level_t level, const char* tag, const char* format, ...) __attribute__ ((format (printf, 3, 4)));
+
 
 #if CONFIG_LOG_COLORS
 #define LOG_COLOR_BLACK   "30"
diff --git a/docs/api/log.rst b/docs/api/log.rst
index 8e0f2d85da..dc76a30470 100644
--- a/docs/api/log.rst
+++ b/docs/api/log.rst
@@ -13,8 +13,7 @@ Functions
 
 .. doxygenfunction:: esp_log_level_set
 .. doxygenfunction:: esp_log_set_vprintf
+.. doxygenfunction:: esp_log_timestamp
 .. doxygenfunction:: esp_log_write
 
-.. FIXME esp_log_timestamp
-