[llvm-branch-commits] [llvm-branch] r295344 - Merging r292271:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Feb 16 11:59:33 2017
New Revision: 295344

URL: http://llvm.org/viewvc/llvm-project?rev=295344&view=rev
Log:
Merging r292271:

------------------------------------------------------------------------
r292271 | aaron | 2017-01-17 21:48:31 +0000 (Tue, 17 Jan 2017) | 2 lines

Silence some Sphinx diagnostics in an attempt to get the documentation builder back to green (http://lab.llvm.org:8011/builders/llvm-sphinx-docs/builds/1895).
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/docs/Extensions.rst
    llvm/branches/release_40/docs/LangRef.rst

Modified: llvm/branches/release_40/docs/Extensions.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/docs/Extensions.rst?rev=295344&r1=295343&r2=295344&view=diff
==============================================================================
--- llvm/branches/release_40/docs/Extensions.rst (original)
+++ llvm/branches/release_40/docs/Extensions.rst Thu Feb 16 11:59:33 2017
@@ -61,7 +61,7 @@ types ``IMAGE_REL_I386_SECREL`` (32-bit)
 the target.  It corresponds to the COFF relocation types
 ``IMAGE_REL_I386_SECTION`` (32-bit) or ``IMAGE_REL_AMD64_SECTION`` (64-bit).
 
-.. code-block:: gas
+.. code-block:: none
 
   .section .debug$S,"rn"
     .long 4

Modified: llvm/branches/release_40/docs/LangRef.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/docs/LangRef.rst?rev=295344&r1=295343&r2=295344&view=diff
==============================================================================
--- llvm/branches/release_40/docs/LangRef.rst (original)
+++ llvm/branches/release_40/docs/LangRef.rst Thu Feb 16 11:59:33 2017
@@ -3997,7 +3997,7 @@ DIFile
 
 ``DIFile`` nodes represent files. The ``filename:`` can include slashes.
 
-.. code-block:: llvm
+.. code-block:: none
 
     !0 = !DIFile(filename: "path/to/file", directory: "/path/to/dir",
                  checksumkind: CSK_MD5,