Conflicts:
	doc/mkdocs/docs/api/basic_json/index.md
	doc/mkdocs/docs/features/binary_formats/bson.md
	doc/mkdocs/docs/features/binary_formats/index.md
	doc/mkdocs/mkdocs.yml
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp

*  add step for NVCC build #2676
*  fix warning (code taken from #2736)
*  use version 2.2.0 of the CI image

*  consolidate documentation
*  overwork std specializations
*  move images files to mkdocs
*  fix URLs
*  tweak MkDocs configuration
*  add namespaces
*  document deprecations
*  document documentation generation
*  improve search
*  add examples
*  start adding documentation for macros
*  add note for https://github.com/nlohmann/json/issues/874#issuecomment-1001699139
*  overwork example handling
*  fix Markdown tables

*  add C++17 copies of the test binaries
*  use proper header for filesystem
*  fix warnings
*  do not use too old compilers with C++17
*  add test
*  add more constraints #3097
*  use fix from https://github.com/nlohmann/json/pull/3101#issuecomment-998788786
*  use fix from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90050
*  use published CI image

* Rename variable count to resolve shadowing (#3188)

* Amalgamate: Rename variable count to resolve shadowing (#3188)
Co-authored-by: Maarten Becker <maarten.becker@nuc-eng.com>

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>

In the docs, the `ignore_comments` parameter to `nlohmann::json::parse()` is described as `skip_comments`, which does not match the actual implementation. While the demo code compiles and works, the parameter name is wrong.

* fix typos in documentation

* revert changes to ChangeLog.md

*  add recursive update function

*  prepare GitHub actions for new Docker image

*  use experimental docker image

*  use Clang-Analyzer 14

*  suppress readability-identifier-length

*  suppress more Clang-Tidy warnings

*  simplify code

*  suppress more Clang-Tidy warnings

*  suppress more Clang-Tidy warnings

*  fix warning

*  fix warning

*  fix warning

*  use new Docker image

* Fix typos in operator[] documentation
* Fix additional typo

*  revert invalid fix

*  remove "fix" that caused #3077

* meta: rework is_compatible/is_constructible_string_type

These type traits performed an incorrect and insufficient check.

Converting to a std::filesystem::path used to work by accident thanks to
these brittle constraints, but the clean-up performed in #3020 broke them.

* support std::filesystem::path

Fixes #3070

The previous version relied on the existence of an 'iterator' type.

As mentioned in comments, this is not the proper way to do it and
causes issues with certain types (e.g. views from range-v3).

Add a 'is_range' trait that properly detects the return type of
'begin'/'end', and use it in instead.

* Fix assertion failure #3032

*  allow allocators for vectors

*  add regression tests

* Set parent pointers for values inserted via update() (fixes #3007).

* Moved test for #3007 to proper file.

* Enable access to private members in diagnostics unit tests.

* Make style consistent with rest of code.

* Forced amalgamate rerun.

* Refactor test for #3007 so it doesn't use private members. Also extend to test both update() functions.

* Added fix for #3007 to update(const_iterator, const_iterator) as well.

* Added failing example code from #3007 as extra test.