Merge branch 'bugfix-json-format-maps-doc'

src/gpb_compile.erl

@@ -1226,8 +1226,8 @@ file(File) ->
 %%
 %% The `{json_format,Format}' option is a convenience shorthand, and will expand
 %% as indicated below. If the json_format is not specified, it defaults to
-%% `map' if the `maps' option is specified, and otherwise to `eep18' when
-%% generating code for records.
+%% `maps' if the <a href="#option-maps">`maps'</a> option is specified,
+%% and otherwise to `eep18' when generating code for records.
 %% <dl>
 %%   <dt>jsx</dt>
 %%   <dd><code>[{json_object_format, eep18},
@@ -1247,7 +1247,7 @@ file(File) ->
 %%              {json_array_format, list},
 %%              {json_string_format, binary},
 %%              {json_null, null}]</code></dd>
-%%   <dt>map</dt>
+%%   <dt>maps</dt>
 %%   <dd><code>[{json_object_format, map},
 %%              {json_key_format, binary},
 %%              {json_array_format, list},
@@ -2913,8 +2913,8 @@ c() ->
 %%   <dt><a id="cmdline-option-json-format"/>
 %%       `-json-format jsx | mochijson2 | jiffy | maps'</dt>
 %%     <dd>Specify format for the JSON representation.
-%%       `maps' is default if the `-maps' option is specified,
-%%       otherwise the jsx format is default.<br/>
+%%       `maps' is default if the <a href="#cmdline-option-maps">`-maps'</a>
+%%       option is specified, otherwise the jsx format is default.<br/>
 %%       Corresponding Erlang-level option:
 %%       <a href="#option-json_format">json_format</a></dd>
 %%   <dt><a id="cmdline-option-json-object-format"/>