about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdrien Tétar <adri-from-59@hotmail.fr>2013-10-11 19:18:43 +0200
committerAdrien Tétar <adri-from-59@hotmail.fr>2013-10-19 20:29:34 +0200
commitf69795e443b73ac875092e54774b4666ca203aa5 (patch)
tree9ef60440f0e6abeeb205f4527bd4631aa4f7a75e
parent31a209ca4251126dc03cfbb9f4bbb54f9d296d5d (diff)
downloadrust-f69795e443b73ac875092e54774b4666ca203aa5.tar.gz
rust-f69795e443b73ac875092e54774b4666ca203aa5.zip
doc: switch pandoc to html5
-rw-r--r--doc/README2
-rw-r--r--mk/docs.mk22
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/README b/doc/README
index bb6ab77a802..d7578987e2b 100644
--- a/doc/README
+++ b/doc/README
@@ -19,7 +19,7 @@ To generate HTML documentation from one source file/crate, do something like:
 To generate an HTML version of a doc from Markdown, without having Node.js
 installed, do something like:
 
-  pandoc --from=markdown --to=html --number-sections -o rust.html rust.md
+  pandoc --from=markdown --to=html5 --number-sections -o rust.html rust.md
 
 The syntax for pandoc flavored markdown can be found at:
 http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
diff --git a/mk/docs.mk b/mk/docs.mk
index 4663f9c9532..f5acfdf9118 100644
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -48,7 +48,7 @@ doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.css
          --standalone --toc \
          --section-divs \
          --number-sections \
-         --from=markdown --to=html \
+         --from=markdown --to=html5 \
          --css=rust.css \
          --css=manual.css \
 	     --include-before-body=doc/version_info.html \
@@ -73,7 +73,7 @@ doc/rustpkg.html: rustpkg.md doc/version_info.html doc/rust.css doc/manual.css
          --standalone --toc \
          --section-divs \
          --number-sections \
-         --from=markdown --to=html \
+         --from=markdown --to=html5 \
          --css=rust.css \
          --css=manual.css \
 	     --include-before-body=doc/version_info.html \
@@ -85,7 +85,7 @@ doc/tutorial.html: tutorial.md doc/version_info.html doc/rust.css
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
 	   --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -95,7 +95,7 @@ doc/l10n/ja/tutorial.html: doc/l10n/ja/tutorial.md doc/version_info.html doc/rus
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight doc/l10n/ja/tutorial.md | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=../../rust.css \
+           --from=markdown --to=html5 --css=../../rust.css \
 	   --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -106,7 +106,7 @@ doc/tutorial-macros.html: tutorial-macros.md doc/version_info.html \
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
 	   --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -116,7 +116,7 @@ doc/tutorial-container.html: tutorial-container.md doc/version_info.html doc/rus
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
 	   --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -126,7 +126,7 @@ doc/tutorial-ffi.html: tutorial-ffi.md doc/version_info.html doc/rust.css
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
 	   --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -136,7 +136,7 @@ doc/tutorial-borrowed-ptr.html: tutorial-borrowed-ptr.md doc/version_info.html d
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
 	   --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -146,7 +146,7 @@ doc/tutorial-tasks.html: tutorial-tasks.md doc/version_info.html doc/rust.css
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
 	   --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -156,7 +156,7 @@ doc/tutorial-conditions.html: tutorial-conditions.md doc/version_info.html doc/r
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
            --include-before-body=doc/version_info.html \
            --output=$@
 
@@ -166,7 +166,7 @@ doc/tutorial-rustpkg.html: tutorial-rustpkg.md doc/version_info.html doc/rust.cs
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
           $(CFG_PANDOC) --standalone --toc \
            --section-divs --number-sections \
-           --from=markdown --to=html --css=rust.css \
+           --from=markdown --to=html5 --css=rust.css \
            --include-before-body=doc/version_info.html \
            --output=$@