diff --git a/Makefile b/Makefile index 4980138e..1a0fdd62 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ CHECKOUTPUT= \ %.rng: %.rnc trang $< $@ -%.tests: %.txt.test %.html.test %.exp.xml.test %.v2v3.xml.test %.v3add-xinclude.xml.test %.text.test %.pages.text.test %.v3.html.test %.prepped.xml.test %.plain.text +%.tests: %.txt.test %.html.test %.exp.xml.test %.v2v3.xml.test %.v3add-xinclude.xml.test %.v3add-xinclude-w-revision.xml.test %.text.test %.pages.text.test %.v3.html.test %.prepped.xml.test %.plain.text @echo " Checking v3 validity" @doc=$(basename $@); printf ' '; xmllint --noout --relaxng xml2rfc/data/v3.rng $$doc.prepped.xml @echo " Diffing .plain.text against regular .text" @@ -120,6 +120,9 @@ tests/out/%.v2v3.xml: tests/input/%.xml install tests/out/%.v3add-xinclude.xml: tests/input/draft-miek-test.v3.xml install @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --v2v3 --add-xinclude $< --out $@" +tests/out/%.v3add-xinclude-w-revision.xml: tests/input/draft-template.xml install + @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --v2v3 --add-xinclude --draft-revisions $< --out $@" + tests/out/%.prepped.xml: tests/input/%.xml tests/out/%.v3.html tests/out/%.text install @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --out $@ --prep $<" @echo " Checking generation of .html from prepped .xml" diff --git a/tests/valid/docfile.html b/tests/valid/docfile.html index 3ccf9d71..aaab0289 100644 --- a/tests/valid/docfile.html +++ b/tests/valid/docfile.html @@ -4,15 +4,15 @@ -Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.23.0 +Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.23.1 - - + + @@ -39,7 +39,7 @@
xml2rfc(1)
Published:
- +
Author:
@@ -49,7 +49,7 @@
-

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.23.0

+

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.23.1

Abstract

@@ -371,7 +371,7 @@

The latest version of this documentation is available in HTML form at https://ietf-tools.github.io/xml2rfc/.

- This documentation applies to xml2rfc version 3.23.0.

+ This documentation applies to xml2rfc version 3.23.1.

@@ -6387,7 +6387,7 @@

The following variables are available for use in an xml2rfc - manpage Jinja2 template, as of xml2rfc version 3.23.0:

+ manpage Jinja2 template, as of xml2rfc version 3.23.1:

{{ bare_latin_tags }}:
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html index e8bebf54..004a2a2b 100644 --- a/tests/valid/draft-miek-test.html +++ b/tests/valid/draft-miek-test.html @@ -16,7 +16,7 @@ This version is adapted to work with "xml2rfc" version 2.x. ' name="description"> - + @@ -26,19 +26,19 @@ diff --git a/tests/valid/draft-miek-test.v3add-xinclude-w-revision.xml b/tests/valid/draft-miek-test.v3add-xinclude-w-revision.xml new file mode 100644 index 00000000..4cf962f7 --- /dev/null +++ b/tests/valid/draft-miek-test.v3add-xinclude-w-revision.xml @@ -0,0 +1,750 @@ + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Put Your Internet Draft Title + Here + + + + + + Folly Consulting +
+ + + + + Soham + + + UK + + +44 7889 488 335 + elwynd@dial.pipex.com + +
+
+ + + Huawei Technology +
+ + 125 Nagog Technology Park + Acton + MA + 01719 + US + + quintin.zhao@huawei.com +
+
+ + + + + + General + Internet Engineering Task Force + + + template + + + + Insert an abstract: MANDATORY. This template is for creating an + Internet Draft. + +
+ +
+ Introduction + The original specification of xml2rfc format is in RFC 2629. +
+ Requirements Language + The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", + "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this + document are to be interpreted as described in RFC 2119. +
+
+
+ Simple List + List styles: 'empty', 'symbols', 'letters', 'numbers', 'hanging', + 'format'. +
    +
  • + First bullet +
  • +
  • + Second bullet +
  • +
+ You can write text here as well. +
+
+ Figures + Figures should not exceed 69 characters wide to allow for the indent + of sections. + Preamble text - can be omitted or empty. +
+ + + + +
+ Cross-references allowed in pre- and postamble. . + The CDATA means you don't need to escape meta-characters (especially + < (&lt;) and & (&amp;)) but is not essential. + Figures may also have a title attribute but it won't be displayed unless + there is also an anchor. White space, both horizontal and vertical, is + significant in figures even if you don't use CDATA. +
+ + +
+ Subsections and Tables +
+ A Subsection + By default 3 levels of nesting show in table of contents but that + can be adjusted with the value of the "tocdepth" processing + instruction. +
+
+ Tables + .. are very similar to figures: + Tables use ttcol to define column headers and widths. + Every cell then has a "c" element for its content. + + A Very Simple Table + + + + + + + + + + + + + + + + + + + + +
ttcol #1ttcol #2
c #1c #2
c #3c #4
c #5c #6
+ which is a very simple example. +
+
+
+ More about Lists + Lists with 'hanging labels': the list item is indented the amount of + the hangIndent: +
+
short
+
With a label shorter than the hangIndent.
+
fantastically long label
+
With a label longer than the + hangIndent.
+
vspace_trick
+
Forces the new + item to start on a new line.
+
+ + + Simulating more than one paragraph in a list item using + <vspace>: +
  1. + First, a short item. +
  2. +
  3. + Second, a longer list item. + And + something that looks like a separate pararaph.. +
  4. +
+ Simple indented paragraph using the "empty" style: +
    +
  • + The quick, brown fox jumped over the lazy dog and lived to fool + many another hunter in the great wood in the west. +
  • +
+
+ Numbering Lists across Lists and Sections + Numbering items continuously although they are in separate + <list> elements, maybe in separate sections using the "format" + style and a "counter" variable. + First list: +
  1. + #1 +
  2. +
  3. + #2 +
  4. +
  5. + #3 +
  6. +
+ Specify the indent explicitly so that all the items line up + nicely. + Second list: +
  1. + #4 +
  2. +
  3. + #5 +
  4. +
  5. + #6 +
  6. +
+
+
+ Where the List Numbering Continues + List continues here. + Third list: +
  1. + #7 +
  2. +
  3. + #8 +
  4. +
  5. + #9 +
  6. +
  7. + #10 +
  8. +
+ The end of the list. +
+
+ nested lists + Simulating more than one paragraph in a list item using + <vspace>: + +
  1. + First, a short item. +
  2. +
  3. + Second, a longer list item. + And + something that looks like a separate paragraph. +
  4. +
  5. + and a sublist, also with letters + +
    1. + first subitem +
    2. +
    3. + second subitem +
    4. +
    5. + and a sub-sublist, also with letters + +
      1. + first sub-subitem +
      2. +
      3. + second sub-subitem +
      4. +
      +
    6. +
    +
  6. +
+
+
+ List Formats + many formats + +
  1. + first %c-item +
  2. +
  3. + more %c-items +
  4. +
+
  1. + first %C-item +
  2. +
  3. + more %C-items +
  4. +
+
  1. + first %d-item. +
  2. +
  3. + more %d-items. +
  4. +
+
  1. + first %i-item +
  2. +
  3. + more %i-items +
  4. +
  5. + more %i-items +
  6. +
  7. + more %i-items +
  8. +
  9. + more %i-items +
  10. +
  11. + more %i-items +
  12. +
  13. + more %i-items +
  14. +
  15. + more %i-items +
  16. +
  17. + more %i-items +
  18. +
+
  1. + first %I-item +
  2. +
  3. + more %I-items +
  4. +
  5. + more %I-items +
  6. +
  7. + more %I-items +
  8. +
  9. + more %I-items +
  10. +
  11. + more %I-items +
  12. +
  13. + more %I-items +
  14. +
  15. + more %I-items +
  16. +
  17. + more %I-items +
  18. +
+
  1. + first %o-item +
  2. +
  3. + more %o-items +
  4. +
  5. + more %o-items +
  6. +
  7. + more %o-items +
  8. +
  9. + more %o-items +
  10. +
  11. + more %o-items +
  12. +
  13. + more %o-items +
  14. +
  15. + more %o-items +
  16. +
  17. + more %o-items +
  18. +
+
  1. + first %x-item +
  2. +
  3. + more %x-items +
  4. +
  5. + more %x-items +
  6. +
  7. + more %x-items +
  8. +
  9. + more %x-items +
  10. +
  11. + more %x-items +
  12. +
  13. + more %x-items +
  14. +
  15. + more %x-items +
  16. +
  17. + more %x-items +
  18. +
  19. + more %x-items +
  20. +
  21. + more %x-items +
  22. +
  23. + more %x-items +
  24. +
  25. + more %x-items +
  26. +
  27. + more %x-items +
  28. +
  29. + more %x-items +
  30. +
  31. + more %x-items +
  32. +
  33. + more %x-items +
  34. +
+
  1. + first %X-item +
  2. +
  3. + more %X-items +
  4. +
  5. + more %X-items +
  6. +
  7. + more %X-items +
  8. +
  9. + more %X-items +
  10. +
  11. + more %X-items +
  12. +
  13. + more %X-items +
  14. +
  15. + more %X-items +
  16. +
  17. + more %X-items +
  18. +
  19. + more %X-items +
  20. +
  21. + more %X-items +
  22. +
  23. + more %X-items +
  24. +
  25. + more %X-items +
  26. +
  27. + more %X-items +
  28. +
  29. + more %X-items +
  30. +
  31. + more %X-items +
  32. +
  33. + more %X-items +
  34. +
+
+
+
+ Example of Code or MIB Module To Be Extracted + The <artwork> element has a number of extra attributes + that can be used to substitute a more aesthetically pleasing rendition + into HTML output while continuing to use the ASCII art version in the + text and nroff outputs (see the xml2rfc README for details). It also + has a "type" attribute. This is currently ignored except in the case + 'type="abnf"'. In this case the "artwork" is expected to contain a + piece of valid Augmented Backus-Naur Format (ABNF) grammar. This will + be syntax checked by xml2rfc and any errors will cause a fatal error + if the "strict" processing instruction is set to "yes". The ABNF will + also be colorized in HTML output to highlight the syntactic + components. Checking of additional "types" may be provided in future + versions of xml2rfc. + + +void +main(int argc, char *argv[]) +{ + int i; + + printf("program arguments are:\n"); + for (i = 0; i < argc; i++) { + printf("%d: \"%s\"\n", i, argv[i]); + } + + exit(0); +} /* main */ + +/* end of file */ + +]]> +
+
+ Acknowledgements + This template was derived from an initial version written by Pekka + Savola and contributed by him to the xml2rfc project. + + This document is part of a plan to make xml2rfc indispensable . + This document may be shared as needed . If necessary, appeal to . + +
+ + +
+ IANA Considerations + This memo includes no request to IANA. + All drafts are required to have an IANA considerations section (see + the update of + RFC 2434 for a guide). If the draft does not require IANA to do + anything, the section contains an explicit statement that this is the + case (as above). If there are no requirements for IANA, the section will + be removed during conversion into an RFC by the RFC Editor. +
+
+ Security Considerations + All drafts are required to have a security considerations section. + See RFC 3552 for a guide. +
+
+ + + + + + + + + References + + Normative References + + + + + + + Minimal Reference + + + + + + + + + Informative References + + + + + + + + + Jupiter rising + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Association for Computing Machinery (ACM) + + + + We present our approach for overcoming the cost, operational complexity, and limited scale endemic to datacenter networks a decade ago. Three themes unify the five generations of datacenter networks detailed in this paper. First, multi-stage Clos topologies built from commodity switch silicon can support cost-effective deployment of building-scale networks. Second, much of the general, but complex, decentralized network routing and management protocols supporting arbitrary deployment scenarios were overkill for single-operator, pre-planned datacenter networks. We built a centralized control mechanism based on a global configuration pushed to all datacenter switches. Third, modular hardware design coupled with simple, robust software allowed our design to also support inter-cluster and wide-area networks. Our datacenter networks run at dozens of sites across the planet, scaling in capacity by 100x over 10 years to more than 1 Pbps of bisection bandwidth. A more detailed version of this paper is available at Ref. + + + Communications of the ACM, vol. 59, no. 9, pp. 88-97 + + + + + + + Ultimate Plan for Taking Over the World + + Mad Dominators, Inc. + + + + + + + + I Learned to Share in Kindergarten + + + + Sesame Street + + + + + + + + + +
+ Additional Stuff + This becomes an Appendix. +
+
+ Contributors + This becomes an unnumbered section +
+
+
diff --git a/tests/valid/draft-miek-test.v3add-xinclude.xml b/tests/valid/draft-miek-test.v3add-xinclude.xml index 0643f305..b9354f60 100644 --- a/tests/valid/draft-miek-test.v3add-xinclude.xml +++ b/tests/valid/draft-miek-test.v3add-xinclude.xml @@ -886,7 +886,7 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt - + Accelerometer diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html index 091edd37..9f899186 100644 --- a/tests/valid/draft-template.html +++ b/tests/valid/draft-template.html @@ -11,23 +11,23 @@ Insert an abstract: MANDATORY. This template is for creating an Internet Draft. " name="description"> - + diff --git a/tests/valid/draft-template.v2v3.xml b/tests/valid/draft-template.v2v3.xml index 43256edc..252c5800 100644 --- a/tests/valid/draft-template.v2v3.xml +++ b/tests/valid/draft-template.v2v3.xml @@ -30,7 +30,7 @@ - + @@ -637,7 +637,7 @@ main(int argc, char *argv[]) - + @@ -734,8 +734,8 @@ main(int argc, char *argv[]) - - + +
diff --git a/tests/valid/draft-template.v3add-xinclude-w-revision.xml b/tests/valid/draft-template.v3add-xinclude-w-revision.xml new file mode 100644 index 00000000..4cf962f7 --- /dev/null +++ b/tests/valid/draft-template.v3add-xinclude-w-revision.xml @@ -0,0 +1,750 @@ + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Put Your Internet Draft Title + Here + + + + + + Folly Consulting +
+ + + + + Soham + + + UK + + +44 7889 488 335 + elwynd@dial.pipex.com + +
+
+ + + Huawei Technology +
+ + 125 Nagog Technology Park + Acton + MA + 01719 + US + + quintin.zhao@huawei.com +
+
+ + + + + + General + Internet Engineering Task Force + + + template + + + + Insert an abstract: MANDATORY. This template is for creating an + Internet Draft. + +
+ +
+ Introduction + The original specification of xml2rfc format is in RFC 2629. +
+ Requirements Language + The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", + "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this + document are to be interpreted as described in RFC 2119. +
+
+
+ Simple List + List styles: 'empty', 'symbols', 'letters', 'numbers', 'hanging', + 'format'. +
    +
  • + First bullet +
  • +
  • + Second bullet +
  • +
+ You can write text here as well. +
+
+ Figures + Figures should not exceed 69 characters wide to allow for the indent + of sections. + Preamble text - can be omitted or empty. +
+ + + + +
+ Cross-references allowed in pre- and postamble. . + The CDATA means you don't need to escape meta-characters (especially + < (&lt;) and & (&amp;)) but is not essential. + Figures may also have a title attribute but it won't be displayed unless + there is also an anchor. White space, both horizontal and vertical, is + significant in figures even if you don't use CDATA. +
+ + +
+ Subsections and Tables +
+ A Subsection + By default 3 levels of nesting show in table of contents but that + can be adjusted with the value of the "tocdepth" processing + instruction. +
+
+ Tables + .. are very similar to figures: + Tables use ttcol to define column headers and widths. + Every cell then has a "c" element for its content. + + A Very Simple Table + + + + + + + + + + + + + + + + + + + + +
ttcol #1ttcol #2
c #1c #2
c #3c #4
c #5c #6
+ which is a very simple example. +
+
+
+ More about Lists + Lists with 'hanging labels': the list item is indented the amount of + the hangIndent: +
+
short
+
With a label shorter than the hangIndent.
+
fantastically long label
+
With a label longer than the + hangIndent.
+
vspace_trick
+
Forces the new + item to start on a new line.
+
+ + + Simulating more than one paragraph in a list item using + <vspace>: +
  1. + First, a short item. +
  2. +
  3. + Second, a longer list item. + And + something that looks like a separate pararaph.. +
  4. +
+ Simple indented paragraph using the "empty" style: +
    +
  • + The quick, brown fox jumped over the lazy dog and lived to fool + many another hunter in the great wood in the west. +
  • +
+
+ Numbering Lists across Lists and Sections + Numbering items continuously although they are in separate + <list> elements, maybe in separate sections using the "format" + style and a "counter" variable. + First list: +
  1. + #1 +
  2. +
  3. + #2 +
  4. +
  5. + #3 +
  6. +
+ Specify the indent explicitly so that all the items line up + nicely. + Second list: +
  1. + #4 +
  2. +
  3. + #5 +
  4. +
  5. + #6 +
  6. +
+
+
+ Where the List Numbering Continues + List continues here. + Third list: +
  1. + #7 +
  2. +
  3. + #8 +
  4. +
  5. + #9 +
  6. +
  7. + #10 +
  8. +
+ The end of the list. +
+
+ nested lists + Simulating more than one paragraph in a list item using + <vspace>: + +
  1. + First, a short item. +
  2. +
  3. + Second, a longer list item. + And + something that looks like a separate paragraph. +
  4. +
  5. + and a sublist, also with letters + +
    1. + first subitem +
    2. +
    3. + second subitem +
    4. +
    5. + and a sub-sublist, also with letters + +
      1. + first sub-subitem +
      2. +
      3. + second sub-subitem +
      4. +
      +
    6. +
    +
  6. +
+
+
+ List Formats + many formats + +
  1. + first %c-item +
  2. +
  3. + more %c-items +
  4. +
+
  1. + first %C-item +
  2. +
  3. + more %C-items +
  4. +
+
  1. + first %d-item. +
  2. +
  3. + more %d-items. +
  4. +
+
  1. + first %i-item +
  2. +
  3. + more %i-items +
  4. +
  5. + more %i-items +
  6. +
  7. + more %i-items +
  8. +
  9. + more %i-items +
  10. +
  11. + more %i-items +
  12. +
  13. + more %i-items +
  14. +
  15. + more %i-items +
  16. +
  17. + more %i-items +
  18. +
+
  1. + first %I-item +
  2. +
  3. + more %I-items +
  4. +
  5. + more %I-items +
  6. +
  7. + more %I-items +
  8. +
  9. + more %I-items +
  10. +
  11. + more %I-items +
  12. +
  13. + more %I-items +
  14. +
  15. + more %I-items +
  16. +
  17. + more %I-items +
  18. +
+
  1. + first %o-item +
  2. +
  3. + more %o-items +
  4. +
  5. + more %o-items +
  6. +
  7. + more %o-items +
  8. +
  9. + more %o-items +
  10. +
  11. + more %o-items +
  12. +
  13. + more %o-items +
  14. +
  15. + more %o-items +
  16. +
  17. + more %o-items +
  18. +
+
  1. + first %x-item +
  2. +
  3. + more %x-items +
  4. +
  5. + more %x-items +
  6. +
  7. + more %x-items +
  8. +
  9. + more %x-items +
  10. +
  11. + more %x-items +
  12. +
  13. + more %x-items +
  14. +
  15. + more %x-items +
  16. +
  17. + more %x-items +
  18. +
  19. + more %x-items +
  20. +
  21. + more %x-items +
  22. +
  23. + more %x-items +
  24. +
  25. + more %x-items +
  26. +
  27. + more %x-items +
  28. +
  29. + more %x-items +
  30. +
  31. + more %x-items +
  32. +
  33. + more %x-items +
  34. +
+
  1. + first %X-item +
  2. +
  3. + more %X-items +
  4. +
  5. + more %X-items +
  6. +
  7. + more %X-items +
  8. +
  9. + more %X-items +
  10. +
  11. + more %X-items +
  12. +
  13. + more %X-items +
  14. +
  15. + more %X-items +
  16. +
  17. + more %X-items +
  18. +
  19. + more %X-items +
  20. +
  21. + more %X-items +
  22. +
  23. + more %X-items +
  24. +
  25. + more %X-items +
  26. +
  27. + more %X-items +
  28. +
  29. + more %X-items +
  30. +
  31. + more %X-items +
  32. +
  33. + more %X-items +
  34. +
+
+
+
+ Example of Code or MIB Module To Be Extracted + The <artwork> element has a number of extra attributes + that can be used to substitute a more aesthetically pleasing rendition + into HTML output while continuing to use the ASCII art version in the + text and nroff outputs (see the xml2rfc README for details). It also + has a "type" attribute. This is currently ignored except in the case + 'type="abnf"'. In this case the "artwork" is expected to contain a + piece of valid Augmented Backus-Naur Format (ABNF) grammar. This will + be syntax checked by xml2rfc and any errors will cause a fatal error + if the "strict" processing instruction is set to "yes". The ABNF will + also be colorized in HTML output to highlight the syntactic + components. Checking of additional "types" may be provided in future + versions of xml2rfc. + + +void +main(int argc, char *argv[]) +{ + int i; + + printf("program arguments are:\n"); + for (i = 0; i < argc; i++) { + printf("%d: \"%s\"\n", i, argv[i]); + } + + exit(0); +} /* main */ + +/* end of file */ + +]]> +
+
+ Acknowledgements + This template was derived from an initial version written by Pekka + Savola and contributed by him to the xml2rfc project. + + This document is part of a plan to make xml2rfc indispensable . + This document may be shared as needed . If necessary, appeal to . + +
+ + +
+ IANA Considerations + This memo includes no request to IANA. + All drafts are required to have an IANA considerations section (see + the update of + RFC 2434 for a guide). If the draft does not require IANA to do + anything, the section contains an explicit statement that this is the + case (as above). If there are no requirements for IANA, the section will + be removed during conversion into an RFC by the RFC Editor. +
+
+ Security Considerations + All drafts are required to have a security considerations section. + See RFC 3552 for a guide. +
+
+ + + + + + + + + References + + Normative References + + + + + + + Minimal Reference + + + + + + + + + Informative References + + + + + + + + + Jupiter rising + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Google, Inc. + + + Association for Computing Machinery (ACM) + + + + We present our approach for overcoming the cost, operational complexity, and limited scale endemic to datacenter networks a decade ago. Three themes unify the five generations of datacenter networks detailed in this paper. First, multi-stage Clos topologies built from commodity switch silicon can support cost-effective deployment of building-scale networks. Second, much of the general, but complex, decentralized network routing and management protocols supporting arbitrary deployment scenarios were overkill for single-operator, pre-planned datacenter networks. We built a centralized control mechanism based on a global configuration pushed to all datacenter switches. Third, modular hardware design coupled with simple, robust software allowed our design to also support inter-cluster and wide-area networks. Our datacenter networks run at dozens of sites across the planet, scaling in capacity by 100x over 10 years to more than 1 Pbps of bisection bandwidth. A more detailed version of this paper is available at Ref. + + + Communications of the ACM, vol. 59, no. 9, pp. 88-97 + + + + + + + Ultimate Plan for Taking Over the World + + Mad Dominators, Inc. + + + + + + + + I Learned to Share in Kindergarten + + + + Sesame Street + + + + + + + + + +
+ Additional Stuff + This becomes an Appendix. +
+
+ Contributors + This becomes an unnumbered section +
+
+
diff --git a/tests/valid/draft-template.v3add-xinclude.xml b/tests/valid/draft-template.v3add-xinclude.xml index 0643f305..b9354f60 100644 --- a/tests/valid/draft-template.v3add-xinclude.xml +++ b/tests/valid/draft-template.v3add-xinclude.xml @@ -886,7 +886,7 @@ draft-gieben-writing-rfcs-pandoc-00.txt -> draft.txt - + Accelerometer diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text index 149caa5f..989b67bb 100644 --- a/tests/valid/indexes.pages.text +++ b/tests/valid/indexes.pages.text @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft September 16, 2024 +Internet-Draft September 20, 2024 Intended status: Experimental -Expires: March 20, 2025 +Expires: March 24, 2025 xml2rfc index tests @@ -26,7 +26,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on March 20, 2025. + This Internet-Draft will expire on March 24, 2025. Copyright Notice @@ -53,7 +53,7 @@ Table of Contents -Person Expires March 20, 2025 [Page 1] +Person Expires March 24, 2025 [Page 1] Internet-Draft xml2rfc index tests September 2024 @@ -109,7 +109,7 @@ Index -Person Expires March 20, 2025 [Page 2] +Person Expires March 24, 2025 [Page 2] Internet-Draft xml2rfc index tests September 2024 @@ -165,4 +165,4 @@ Author's Address -Person Expires March 20, 2025 [Page 3] +Person Expires March 24, 2025 [Page 3] diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml index 4de3e443..e617b237 100644 --- a/tests/valid/indexes.prepped.xml +++ b/tests/valid/indexes.prepped.xml @@ -1,6 +1,6 @@ - - + + @@ -20,7 +20,7 @@ - +
Status of This Memo @@ -41,7 +41,7 @@ material or to cite them other than as "work in progress." - This Internet-Draft will expire on 20 March 2025. + This Internet-Draft will expire on 24 March 2025.
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text index 6c27adde..1c63e764 100644 --- a/tests/valid/indexes.text +++ b/tests/valid/indexes.text @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft September 16, 2024 +Internet-Draft September 20, 2024 Intended status: Experimental -Expires: March 20, 2025 +Expires: March 24, 2025 xml2rfc index tests @@ -26,7 +26,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on March 20, 2025. + This Internet-Draft will expire on March 24, 2025. Copyright Notice diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html index 887310fa..b004e0a8 100644 --- a/tests/valid/indexes.v3.html +++ b/tests/valid/indexes.v3.html @@ -6,7 +6,7 @@ xml2rfc index tests - + @@ -23,7 +23,7 @@ Person -Expires March 20, 2025 +Expires March 24, 2025 [Page] @@ -36,12 +36,12 @@
indexes-00
Published:
- +
Intended Status:
Experimental
Expires:
-
+
Author:
@@ -71,7 +71,7 @@

time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."

- This Internet-Draft will expire on March 20, 2025.

+ This Internet-Draft will expire on March 24, 2025.