summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorjmedley <jmedley@chromium.org>2014-09-11 15:26:44 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-11 22:31:30 +0000
commitc283eb039f9bdc55eabf3819a90a056c0f3b57af (patch)
tree305acc25a434cf68a19c242b79bbdf09541024d9 /native_client_sdk
parent7fe21ff2b11ee28af15b2ef635ccf144fae91d31 (diff)
downloadchromium_src-c283eb039f9bdc55eabf3819a90a056c0f3b57af.zip
chromium_src-c283eb039f9bdc55eabf3819a90a056c0f3b57af.tar.gz
chromium_src-c283eb039f9bdc55eabf3819a90a056c0f3b57af.tar.bz2
Revert of Remove a broken link. (patchset #2 id:20001 of https://codereview.chromium.org/546713003/)
Reason for revert: I found the link I thought didn't exist. Original issue's description: > Remove a broken link. > > BUG=none > R= > TEST=none > NOTRY=true > (documentation only change) > > Committed: https://crrev.com/3b9f3449861b9bfc196a152a2c74f6e7cdd18ef1 > Cr-Commit-Position: refs/heads/master@{#294234} TBR=mkearney@chromium.org,smain@chromium.org,jfb@chromium.org,sbc@chromium.org NOTREECHECKS=true NOTRY=true BUG=none Review URL: https://codereview.chromium.org/560423002 Cr-Commit-Position: refs/heads/master@{#294480}
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/doc_generated/nacl-and-pnacl.html12
-rw-r--r--native_client_sdk/src/doc/nacl-and-pnacl.rst12
2 files changed, 12 insertions, 12 deletions
diff --git a/native_client_sdk/doc_generated/nacl-and-pnacl.html b/native_client_sdk/doc_generated/nacl-and-pnacl.html
index 333b3fc..ec83b1a 100644
--- a/native_client_sdk/doc_generated/nacl-and-pnacl.html
+++ b/native_client_sdk/doc_generated/nacl-and-pnacl.html
@@ -14,12 +14,12 @@
</div><h2 id="native-client-nacl">Native Client (NaCl)</h2>
<p>Native Client enables the execution of native code securely inside web
-applications through the use of advanced Software Fault Isolation (SFI)
-techniques. Since its launch in 2011, Native Client has provided developers
-with the ability to harness a client machine&#8217;s computational power to a much
-fuller extent than traditional web technologies, by running compiled C and C++
-code at near-native speeds and taking advantage of multiple cores with shared
-memory.</p>
+applications through the use of advanced <a class="reference external" href="/native-client/community/talks#research">Software Fault Isolation (SFI)
+techniques</a>. Since its launch in
+2011, Native Client has provided developers with the ability to harness a
+client machine&#8217;s computational power to a much fuller extent than traditional
+web technologies, by running compiled C and C++ code at near-native speeds and
+taking advantage of multiple cores with shared memory.</p>
<p>While Native Client provides operating system independence, it requires
developers to generate architecture-specific executable
(<strong>nexe</strong>) modules for each hardware platform. This is not only inconvenient
diff --git a/native_client_sdk/src/doc/nacl-and-pnacl.rst b/native_client_sdk/src/doc/nacl-and-pnacl.rst
index 8db78c1..7e9c294 100644
--- a/native_client_sdk/src/doc/nacl-and-pnacl.rst
+++ b/native_client_sdk/src/doc/nacl-and-pnacl.rst
@@ -16,12 +16,12 @@ Native Client (NaCl)
====================
Native Client enables the execution of native code securely inside web
-applications through the use of advanced Software Fault Isolation (SFI)
-techniques. Since its launch in 2011, Native Client has provided developers
-with the ability to harness a client machine's computational power to a much
-fuller extent than traditional web technologies, by running compiled C and C++
-code at near-native speeds and taking advantage of multiple cores with shared
-memory.
+applications through the use of advanced `Software Fault Isolation (SFI)
+techniques </native-client/community/talks#research>`_. Since its launch in
+2011, Native Client has provided developers with the ability to harness a
+client machine's computational power to a much fuller extent than traditional
+web technologies, by running compiled C and C++ code at near-native speeds and
+taking advantage of multiple cores with shared memory.
While Native Client provides operating system independence, it requires
developers to generate architecture-specific executable