summaryrefslogtreecommitdiffstats
path: root/llvm/docs/MergeFunctions.rst
diff options
context:
space:
mode:
authorRenato Golin <renato.golin@linaro.org>2016-07-20 12:16:38 +0000
committerRenato Golin <renato.golin@linaro.org>2016-07-20 12:16:38 +0000
commit124f2593fce8b867d3c8dee17bfd3e009b06b67e (patch)
tree0960cac9f55a3f1178ddd55faa1d674306e30b21 /llvm/docs/MergeFunctions.rst
parent5b7a79f92a656cf7f9f814283de097b01f4b4a56 (diff)
downloadbcm5719-llvm-124f2593fce8b867d3c8dee17bfd3e009b06b67e.tar.gz
bcm5719-llvm-124f2593fce8b867d3c8dee17bfd3e009b06b67e.zip
[docs] Fixing Sphinx warnings to unclog the buildbot
Lots of blocks had "llvm" or "nasm" syntax types but either weren't following the syntax, or the syntax has changed (and sphinx hasn't keep up) or the type doesn't even exist (nasm?). Other documents had :options: what were invalid. I only removed those that had warnings, and left the ones that didn't, in order to follow the principle of least surprise. This is like this for ages, but the buildbot is now failing on errors. It may take a while to upgrade the buildbot's sphinx, if that's even possible, but that shouldn't stop us from getting docs updates (which seem down for quite a while). Also, we're not losing any syntax highlight, since when it doesn't parse, it doesn't colour. Ie. those blocks are not being highlighted anyway. I'm trying to get all docs in one go, so that it's easy to revert later if we do fix, or at least easy to know what's to fix. llvm-svn: 276109
Diffstat (limited to 'llvm/docs/MergeFunctions.rst')
-rw-r--r--llvm/docs/MergeFunctions.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/docs/MergeFunctions.rst b/llvm/docs/MergeFunctions.rst
index f808010f3ac..b87cea68ba5 100644
--- a/llvm/docs/MergeFunctions.rst
+++ b/llvm/docs/MergeFunctions.rst
@@ -394,7 +394,7 @@ and in right function "*FR*". And every part of *left* place is equal to the
corresponding part of *right* place, and (!) both parts use *Value* instances,
for example:
-.. code-block:: llvm
+.. code-block:: text
instr0 i32 %LV ; left side, function FL
instr0 i32 %RV ; right side, function FR
@@ -409,13 +409,13 @@ in "*FL*" and "*FR*".
Consider small example here:
-.. code-block:: llvm
+.. code-block:: text
define void %f(i32 %pf0, i32 %pf1) {
instr0 i32 %pf0 instr1 i32 %pf1 instr2 i32 123
}
-.. code-block:: llvm
+.. code-block:: text
define void %g(i32 %pg0, i32 %pg1) {
instr0 i32 %pg0 instr1 i32 %pg0 instr2 i32 123
OpenPOWER on IntegriCloud