Merge commit '788bc67faa7738cf7c6b2a192ecf3e3567d1c20e' into develop

third_party/libosmium/doc/CMakeLists.txt

@@ -21,8 +21,6 @@ if(DOXYGEN_FOUND)
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generating API documentation with Doxygen" VERBATIM
     )
-#    install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
-#            DESTINATION "share/doc/libosmium-dev")
 else()
     message(STATUS "Looking for doxygen - not found")
     message(STATUS "  Disabled making of documentation.")

third_party/libosmium/doc/Doxyfile.in

@@ -1128,7 +1128,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_TIMESTAMP         = YES
+HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the

third_party/libosmium/doc/README.md

@@ -3,6 +3,6 @@ The `header.html` is created with:
 
 `doxygen -w html header.html footer.html stylesheet.css`
 
-This might have to be rn again for newer Doxygen versions. After that add
+This might have to be run again for newer Doxygen versions. After that add
 changes back in.