summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-02-07 18:35:49 -0800
committerScott Main <smain@google.com>2011-02-08 09:35:02 -0800
commit967648121d3857b808941848203dfa44229781d7 (patch)
tree27d8e2966a85eb5f0225dd6ce8fbbc90684160b9 /docs
parent6b31119612a1b357c3675fce0111a1c69a15c2d2 (diff)
downloadframeworks_base-967648121d3857b808941848203dfa44229781d7.zip
frameworks_base-967648121d3857b808941848203dfa44229781d7.tar.gz
frameworks_base-967648121d3857b808941848203dfa44229781d7.tar.bz2
cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
docs: move the SIP guide into guide/network/ Change-Id: I3aaf9e9ae6c63bfd5d65518dd45c86bda31965ca
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/guide_toc.cs2
-rw-r--r--docs/html/guide/topics/network/sip.jd (renamed from docs/html/guide/topics/sip/SIP.jd)0
2 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 012c3e3..441bdf5 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -276,7 +276,7 @@
<li><a href="<?cs var:toroot?>guide/topics/wireless/bluetooth.html">
<span class="en">Bluetooth</span>
</a></li>
- <li><a href="<?cs var:toroot?>guide/topics/sip/SIP.html">
+ <li><a href="<?cs var:toroot?>guide/topics/network/sip.html">
<span class="en">Session Initiation Protocol</span></a>
<span class="new">new!</span>
</li>
diff --git a/docs/html/guide/topics/sip/SIP.jd b/docs/html/guide/topics/network/sip.jd
index 8cd2314..8cd2314 100644
--- a/docs/html/guide/topics/sip/SIP.jd
+++ b/docs/html/guide/topics/network/sip.jd