--- swift/docs/CMakeLists.txt.orig	2017-04-21 21:18:29.000000000 +0000

+++ swift/docs/CMakeLists.txt	2018-01-22 08:47:29.543188000 +0000

@@ -11,7 +11,7 @@

 SET(SPHINX_ARGS

   -W

-  -D latex_paper_size=${SWIFT_SPHINX_PAPER_SIZE}

+  -D latex_elements.papersize=${SWIFT_SPHINX_PAPER_SIZE}

   -d ${CMAKE_BINARY_DIR}/doctrees)

 if(SPHINX_EXECUTABLE)

--- swift/docs/conf.py.orig	2017-04-21 21:18:29.000000000 +0000

+++ swift/docs/conf.py	2018-01-22 12:34:17.478075000 +0000

@@ -29,7 +29,7 @@

 extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo']

 # Add any paths that contain templates here, relative to this directory.

-templates_path = ['_templates']

+templates_path = ['_templates', 'archive']

 # The suffix of source filenames.

 source_suffix = '.rst'

@@ -146,7 +146,7 @@

 # Additional templates that should be rendered to pages, maps page names to

 # template names.

-html_additional_pages = {'LangRef': 'archive/LangRef.html'}

+html_additional_pages = {'archive/LangRef': 'LangRef.html'}

 # If false, no module index is generated.

 # html_domain_indices = True

--- swift/docs/proposals/InitializerInheritance.rst.orig	2017-04-21 21:18:29.000000000 +0000

+++ swift/docs/proposals/InitializerInheritance.rst	2018-01-22 11:07:00.559384000 +0000

@@ -135,7 +135,7 @@

 Complete object initializers

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Introduce the notion of a complete object initializer, which is

-written as an initializer with ``Self`` as its return type [#], e.g.::

+written as an initializer with ``Self`` as its return type [#]_, e.g.::

   init() -> Self {

     // ...