diff options
author | Scott Main <smain@google.com> | 2011-02-08 17:32:06 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-08 17:32:06 -0800 |
commit | 42f18194974f6db9ca32f5b4229fb219198dabdd (patch) | |
tree | c69227dca69da3851a374f377dc6c8192de37244 /docs | |
parent | 690d31a6a806fa3d00e568cbbfa0e60415594636 (diff) | |
parent | c442bc605c80a2900a0ed41345f53d218288de7a (diff) | |
download | frameworks_base-42f18194974f6db9ca32f5b4229fb219198dabdd.zip frameworks_base-42f18194974f6db9ca32f5b4229fb219198dabdd.tar.gz frameworks_base-42f18194974f6db9ca32f5b4229fb219198dabdd.tar.bz2 |
am c442bc60: docs: move the SIP guide into guide/network/
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
docs: move the SIP guide into guide/network/
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/guide/guide_toc.cs | 2 | ||||
-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 324062c..492b3a3 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -243,7 +243,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 |