Auto merge of #6459 - ehuss:fix-man-checks, r=alexcrichton

Fix new man page links.

The rustc link checker found some problems:
- The raw generated HTML files were being included when they shouldn't.
  Fixed by moving them out of the mdbook directory.
- The `print.html` file concatenates all the pages together, causing duplicate
  `id`'s.  Fix by giving each page a unique set of IDs.

Author: bors

src/doc/Makefile

@@ -4,14 +4,14 @@
 # format. See https://asciidoctor.org/ for more information.
 #
 # Just run `make` and it will generate the man pages in src/etc/man and the
-# HTML pages in src/doc/src/commands/generated.
+# HTML pages in src/doc/man/generated.
 #
 # There are some Asciidoctor extensions, see the file `asciidoc-extensions.rb`
 # for the documentation.
 
 MAN_SOURCE = $(sort $(wildcard man/cargo*.adoc))
 COMMANDS = $(notdir $(MAN_SOURCE))
-HTML = $(patsubst %.adoc,src/commands/generated/%.html,$(COMMANDS))
+HTML = $(patsubst %.adoc,man/generated/%.html,$(COMMANDS))
 MAN_LOCATION = ../etc/man
 MAN = $(patsubst %.adoc,$(MAN_LOCATION)/%.1,$(COMMANDS))
 ASCIIDOCOPTS = -r ./asciidoc-extension.rb
@@ -21,7 +21,7 @@ all: commands-html man
 commands-html: $(HTML)
 man: $(MAN)
 
-$(HTML): src/commands/generated/%.html : man/%.adoc asciidoc-extension.rb $(OTHER_DEPS)
+$(HTML): man/generated/%.html : man/%.adoc asciidoc-extension.rb $(OTHER_DEPS)
 	asciidoctor $(ASCIIDOCOPTS) -s $< -o $@
 
 $(MAN): $(MAN_LOCATION)/%.1 : man/%.adoc $(OTHER_DEPS)

src/doc/man/cargo-bench.adoc

@@ -1,4 +1,5 @@
 = cargo-bench(1)
+:idprefix: cargo_bench_
 :doctype: manpage
 :actionverb: Benchmark
 :nouns: benchmarks

src/doc/man/cargo-build.adoc

@@ -1,4 +1,5 @@
 = cargo-build(1)
+:idprefix: cargo_build_
 :doctype: manpage
 :actionverb: Build
 

src/doc/man/cargo-check.adoc

@@ -1,4 +1,5 @@
 = cargo-check(1)
+:idprefix: cargo_check_
 :doctype: manpage
 :actionverb: Check
 

src/doc/man/cargo-clean.adoc

@@ -1,4 +1,5 @@
 = cargo-clean(1)
+:idprefix: cargo_clean_
 :doctype: manpage
 :actionverb: Clean
 

src/doc/man/cargo-doc.adoc

@@ -1,4 +1,5 @@
 = cargo-doc(1)
+:idprefix: cargo_doc_
 :doctype: manpage
 :actionverb: Document
 

src/doc/man/cargo-fetch.adoc

@@ -1,4 +1,5 @@
 = cargo-fetch(1)
+:idprefix: cargo_fetch_
 :doctype: manpage
 :actionverb: Fetch
 

src/doc/man/cargo-fix.adoc

@@ -1,4 +1,5 @@
 = cargo-fix(1)
+:idprefix: cargo_fix_
 :doctype: manpage
 :actionverb: Fix
 

src/doc/man/cargo-generate-lockfile.adoc

@@ -1,4 +1,5 @@
 = cargo-generate-lockfile(1)
+:idprefix: cargo_generate-lockfile_
 :doctype: manpage
 
 == NAME

src/doc/man/cargo-help.adoc

@@ -1,4 +1,5 @@
 = cargo-help(1)
+:idprefix: cargo_help_
 :doctype: manpage
 
 == NAME