Merge "Fix Prevent Issue" into tizen_2.2

[platform/framework/native/appfw.git] / inc / FBaseUtilUri.h

diff --git a/inc/FBaseUtilUri.h b/inc/FBaseUtilUri.h
index d2e0bec..74593fc 100644 (file)
--- a/inc/FBaseUtilUri.h
+++ b/inc/FBaseUtilUri.h
@@ -55,9 +55,9 @@ namespace Tizen { namespace Base { namespace Utility
  * void
  * MyClass::UriSample(void)
  * {
- *             String base(L"http://www.samsung.com");
- *             String against(L"/osp/framework/index.html");
- *             String resolveString(L"http://www.samsung.com/osp/framework/index.html");
+ *             String base(L"https://developer.tizen.org");
+ *             String against(L"/downloads/tizen-sdk");
+ *             String resolveString(L"https://developer.tizen.org/downloads/tizen-sdk");
  *
  *             Uri baseUri;
  *             baseUri.SetUri(base);
@@ -73,7 +73,6 @@ namespace Tizen { namespace Base { namespace Utility
  *             {
  *                     // ...
  *             }
- *
  * }
  * @endcode
  */
@@ -414,12 +413,12 @@ public:
         * The following example demonstrates how to use the %GetEncodedString() method.
         *
         * @code
-        * String str(L"http://www.sec.com/osp?currency==\u20ac");
+        * String str(L"https://www.tizen.org/?currency==\u20ac");
         *
         *       Uri uri;
         *       uri.SetUri(str);
         *
-        *       String encode = uri.GetEncodedString();        // encode == L"http://www.sec.com/osp?currency==%E2%82%AC"
+        *       String encode = uri.GetEncodedString();        // encode == L"https://www.tizen.org/?currency==%E2%82%AC"
         *
         * @endcode
         */
@@ -566,11 +565,9 @@ public:
         * @exception   E_SUCCESS                       The method is successful.
         * @exception   E_OUT_OF_MEMORY         The memory is insufficient.
         * @remarks             Resolution is the process of resolving a URI against another, base URI. For hierarchical URI,
-        *                              the path of the original is resolved against the path of the base URI and then normalized. @n
-        *
-        *                              For example, to resolve the URI "/osp/framework/index.html" against the base URI "http://www.samsung.com" ,
-        *                              the resultant URI is "http://www.samsung.com/osp/framework/index.html".
-        *
+        *                              the path of the original is resolved against the path of the base URI and then normalized. @
+        *                              For example, to resolve the URI "/downloads/tizen-sdk" against the base URI "https://developer.tizen.org",
+        *                              the resultant URI is "https://developer.tizen.org/downloads/tizen-sdk".
         */
        result Resolve(const Uri& uri, Uri& resultUri);