diff options
| author | Taesoo Jun <steve.jun@samsung.com> | 2018-03-05 19:13:16 +0900 |
|---|---|---|
| committer | Taesoo Jun <steve.jun@samsung.com> | 2018-03-05 19:13:16 +0900 |
| commit | bfadaacb83d65db53b64baea919f75a3f77fa771 (patch) | |
| tree | d2b95492acc119e59b3da9db49d0171c4ca4463b | |
| parent | a0a6ce57881608f2ab70ba09d905db15fcc43563 (diff) | |
| parent | e4a576bb93cf182103a8a708b9af521f970b0f83 (diff) | |
| download | wifi-accepted/tizen_4.0_unified.tar.gz wifi-accepted/tizen_4.0_unified.tar.bz2 wifi-accepted/tizen_4.0_unified.zip | |
Fix merge conflictsubmit/tizen_4.0/20180306.081613accepted/tizen/4.0/unified/20180307.071417accepted/tizen_4.0_unified
Change-Id: I601af06589559dc22b7fd110f102e98cacd69b23
| -rwxr-xr-x | include/wifi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/wifi.h b/include/wifi.h index 51598c7..950d991 100755 --- a/include/wifi.h +++ b/include/wifi.h @@ -531,7 +531,7 @@ int wifi_deactivate(wifi_deactivated_cb callback, void *user_data) TIZEN_DEPRECA * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @privlevel public * @privilege %http://tizen.org/privilege/network.get - * @param[out] activated @c ture if Wi-Fi is activated, + * @param[out] activated @c true if Wi-Fi is activated, * otherwise @c false if Wi-Fi is not activated. * @return 0 on success, otherwise negative error value * @retval #WIFI_ERROR_NONE Successful @@ -1123,7 +1123,7 @@ int wifi_ap_is_favorite(wifi_ap_h ap, bool* favorite) TIZEN_DEPRECATED_API; * @brief Checks whether the access point is passpoint or not. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @param[in] ap The access point handle - * @param[out] passpoint @c ture if access point is passpoint, + * @param[out] passpoint @c true if access point is passpoint, * otherwise @c false if access point is not passpoint. * @return 0 on success, otherwise negative error value * @retval #WIFI_ERROR_NONE Successful @@ -1518,7 +1518,7 @@ int wifi_ap_set_passphrase(wifi_ap_h ap, const char* passphrase) TIZEN_DEPRECATE * @brief Checks whether the WPS(Wi-Fi Protected Setup) is supported or not. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @param[in] ap The access point handle - * @param[out] supported @c ture if WPS is supported, + * @param[out] supported @c true if WPS is supported, * otherwise @c false is WPS is not supported. * @return 0 on success, otherwise negative error value * @retval #WIFI_ERROR_NONE Successful |