Merge branch 'master' into pragma-once

6 files changed, 62 insertions, 5 deletions

diff --git a/src/gpgme.h b/src/gpgme.h
index 00824132..1de1e197 100644
--- a/src/gpgme.h
+++ b/src/gpgme.h
@@ -29,6 +29,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * @addtogroup extra
+ */
+
+/**
+ * @file   gpgme.h
+ * @author Michael Raitza
+ *
+ * @ingroup extra
+ *
+ * @brief A utility class for reading encrypted journal data
+ */
 #pragma once
 
 #include <system.hh>
@@ -123,4 +135,5 @@ namespace ledger {
        longer match with a standard ifstream. */
     static std::istream* open_stream(const path& filename);
   };
-}
+
+} // namespace ledger
diff --git a/src/option.h b/src/option.h
index f41a1a37..35b1c893 100644
--- a/src/option.h
+++ b/src/option.h
@@ -38,6 +38,8 @@
  * @author John Wiegley
  *
  * @ingroup expr
+ *
+ * @brief Basic type and macros for handling command-line options
  */
 #pragma once
 
@@ -169,7 +171,7 @@ public:
       if (args.size() < 2)
         throw_(std::runtime_error, _f("No argument provided for %1%") % desc());
       else if (args.size() > 2)
-        throw_(std::runtime_error, _f("To many arguments provided for %1%") % desc());
+        throw_(std::runtime_error, _f("Too many arguments provided for %1%") % desc());
       else if (! args[0].is_string())
         throw_(std::runtime_error, _f("Context argument for %1% not a string") % desc());
       on(args.get<string>(0), args.get<string>(1));
diff --git a/src/ptree.h b/src/ptree.h
index c23d6057..662f9807 100644
--- a/src/ptree.h
+++ b/src/ptree.h
@@ -39,9 +39,6 @@
  *
  * @ingroup report
  *
- * @brief Brief
- *
- * Long.
  */
 #pragma once
 
diff --git a/src/pyinterp.h b/src/pyinterp.h
index 65291a0c..57fb176b 100644
--- a/src/pyinterp.h
+++ b/src/pyinterp.h
@@ -29,6 +29,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * @defgroup python Python API
+ */
+
+/**
+ * @file   pyinterp.h
+ * @author John Wiegley
+ *
+ * @ingroup python
+ *
+ * @brief Basic type for Python API.
+ */
 #pragma once
 
 #include "session.h"
diff --git a/src/pyutils.h b/src/pyutils.h
index 5148e888..aa9c4451 100644
--- a/src/pyutils.h
+++ b/src/pyutils.h
@@ -29,6 +29,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * @file   pyutils.h
+ * @author John Wiegley
+ *
+ * @ingroup python
+ *
+ * @brief Basic utilities for Python API.
+ */
 #pragma once
 
 template <typename T, typename TfromPy>
diff --git a/src/strptime.h b/src/strptime.h
index f8917809..efd6e91b 100644
--- a/src/strptime.h
+++ b/src/strptime.h
@@ -1,3 +1,28 @@
+// Copyright 2009 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @addtogroup util
+ */
+
+/**
+ * @file   strptime.h
+ *
+ * @ingroup util
+ *
+ * @brief Implements strptime under Windows
+ */
 #pragma once
 
 char* strptime(const char *buf, const char *fmt, struct tm *tm);