Merge "When the collection is empty, both begin and end should be equal" into tizen_2.1

diff --git a/inc/FSecCryptoIHash.h b/inc/FSecCryptoIHash.h
index ebc98f5..1475b32 100644 (file)
--- a/inc/FSecCryptoIHash.h
+++ b/inc/FSecCryptoIHash.h
@@ -211,7 +211,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                               The name of the hash algorithm @n
-        *                                                                              For example, "SHA2/224", "SHA2/256", "SHA2/386", or "SHA2/512".
+        *                                                                              For example, "SHA2/224", "SHA2/256", "SHA2/384", or "SHA2/512".
         *      @exception      E_SUCCESS                               The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM The algorithm is not supported.
         */
@@ -293,4 +293,4 @@ protected:
 
 } } } //Tizen::Security::Crypto
 
-#endif //_FSEC_CRYPTO_IHASH_H_
+#endif //_FSEC_CRYPTO_IHASH_H_        

diff --git a/inc/FSecCryptoIHmac.h b/inc/FSecCryptoIHmac.h
index bf4c576..5f57983 100644 (file)
--- a/inc/FSecCryptoIHmac.h
+++ b/inc/FSecCryptoIHmac.h
@@ -304,7 +304,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                               The name of the HMAC algorithm @n
-        *                                                                              For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/386", or "HMACSHA2/512".
+        *                                                                              For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/384", or "HMACSHA2/512".
         *      @exception      E_SUCCESS                               The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM The algorithm is not supported.
         */

diff --git a/inc/FSecCryptoMd5Hash.h b/inc/FSecCryptoMd5Hash.h
index d79ad2e..18f52e6 100644 (file)
--- a/inc/FSecCryptoMd5Hash.h
+++ b/inc/FSecCryptoMd5Hash.h
@@ -75,7 +75,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                                       The name of the hash algorithm @n
-        *                                                                                      For example, "SHA2/224", "SHA2/256", "SHA2/386", or "SHA2/512".
+        *                                                                                      For example, "SHA2/224", "SHA2/256", "SHA2/384", or "SHA2/512".
         *      @exception      E_SUCCESS                                       The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM         The algorithm is not supported.
         *      @remarks        Do not call this method. It is not supported.

diff --git a/inc/FSecCryptoMd5Hmac.h b/inc/FSecCryptoMd5Hmac.h
index 81580c3..0902938 100644 (file)
--- a/inc/FSecCryptoMd5Hmac.h
+++ b/inc/FSecCryptoMd5Hmac.h
@@ -75,7 +75,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                                       The name of the HMAC algorithm @n
-        *                                                                                      For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/386", or "HMACSHA2/512".
+        *                                                                                      For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/384", or "HMACSHA2/512".
         *      @exception      E_SUCCESS                                       The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM         The algorithm is not supported.
         *  @remarks    Do not call this method. It is not supported.

diff --git a/inc/FSecCryptoSha1Hash.h b/inc/FSecCryptoSha1Hash.h
index ad5dbd4..494bd70 100644 (file)
--- a/inc/FSecCryptoSha1Hash.h
+++ b/inc/FSecCryptoSha1Hash.h
@@ -75,7 +75,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                               The name of the hash algorithm @n
-        *                                                                              For example "SHA2/224", "SHA2/256", "SHA2/386", or "SHA2/512".
+        *                                                                              For example "SHA2/224", "SHA2/256", "SHA2/384", or "SHA2/512".
         *      @exception      E_SUCCESS                               The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM The algorithm is not supported.
         *      @remarks        Do not call this method. It is not supported.

diff --git a/inc/FSecCryptoSha1Hmac.h b/inc/FSecCryptoSha1Hmac.h
index a22bcee..33febd9 100644 (file)
--- a/inc/FSecCryptoSha1Hmac.h
+++ b/inc/FSecCryptoSha1Hmac.h
@@ -75,7 +75,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                               The name of the HMAC algorithm @n
-        *                                                                              For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/386", or "HMACSHA2/512".
+        *                                                                              For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/384", or "HMACSHA2/512".
         *      @exception      E_SUCCESS                               The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM The algorithm is not supported.
         *      @remarks        Do not call this method. It is not supported.

diff --git a/inc/FSecCryptoSha2Hash.h b/inc/FSecCryptoSha2Hash.h
index 6075888..e65b856 100644 (file)
--- a/inc/FSecCryptoSha2Hash.h
+++ b/inc/FSecCryptoSha2Hash.h
@@ -73,7 +73,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                               The name of the hash algorithm @n
-        *                                                                              For example, "SHA2/224", "SHA2/256", "SHA2/386", or "SHA2/512".
+        *                                                                              For example, "SHA2/224", "SHA2/256", "SHA2/384", or "SHA2/512".
         *      @exception      E_SUCCESS                               The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM The algorithm is not supported.
         */

diff --git a/inc/FSecCryptoSha2Hmac.h b/inc/FSecCryptoSha2Hmac.h
index e9a181e..3d0f0b5 100644 (file)
--- a/inc/FSecCryptoSha2Hmac.h
+++ b/inc/FSecCryptoSha2Hmac.h
@@ -73,7 +73,7 @@ public:
         *
         *      @return         An error code
         *      @param[in]      algorithm                               The name of the HMAC algorithm @n
-        *                                                                              For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/386", or "HMACSHA2/512".
+        *                                                                              For example, "HMACSHA2/224", "HMACSHA2/256", "HMACSHA2/384", or "HMACSHA2/512".
         *      @exception      E_SUCCESS                               The method is successful.
         *      @exception      E_UNSUPPORTED_ALGORITHM The algorithm is not supported.
         */

diff --git a/inc/FSysVibrator.h b/inc/FSysVibrator.h
index 81c8c87..11a1dd3 100644 (file)
--- a/inc/FSysVibrator.h
+++ b/inc/FSysVibrator.h
@@ -87,7 +87,7 @@ namespace Tizen { namespace System
  * @struct      IntensityDurationVibrationPattern
  * @brief       This struct has the specified duration and a vibration intensity level.
  *
- * This can be used with Vibrator::Start(IntensityDurationVibrationPattern[] patterns, int length, int count) as a custom pattern.
+ * This can be used with Vibrator::Start(IntensityDurationVibrationPattern[] patterns, int length, int repeatCount) as a custom pattern.
  *
  * @since 2.1
  */