aboutsummaryrefslogtreecommitdiff
path: root/core/.iconv.luadoc
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2013-09-06 23:42:13 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2013-09-06 23:42:13 -0400
commit9bff1b29293b50e506936e93c14d7a65e8b0ea29 (patch)
tree0347f3706b6f2fc6233272f75b3f2341e24071a6 /core/.iconv.luadoc
parentc1f943631f518390869220966cfd10dfa4278165 (diff)
downloadtextadept-9bff1b29293b50e506936e93c14d7a65e8b0ea29.tar.gz
textadept-9bff1b29293b50e506936e93c14d7a65e8b0ea29.zip
Updated LuaDoc.
Diffstat (limited to 'core/.iconv.luadoc')
-rw-r--r--core/.iconv.luadoc12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/.iconv.luadoc b/core/.iconv.luadoc
index e8892c20..ee403194 100644
--- a/core/.iconv.luadoc
+++ b/core/.iconv.luadoc
@@ -6,9 +6,9 @@
module('string')
---
--- Converts string *text* from character set *from* to character set *to* using
--- iconv.
--- Valid character sets are [GNU iconv's character sets][] and include:
+-- Converts string *text* from encoding *from* to encoding *to* using iconv,
+-- returning the string result.
+-- Valid encodings are [GNU iconv's encodings][] and include:
--
-- * European: ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-R, KOI8-U,
-- KOI8-RU, CP{1250,1251,1252,1253,1254,1257}, CP{850,866,1131},
@@ -31,8 +31,8 @@ module('string')
-- * Unicode: UTF-8, UCS-2, UCS-2BE, UCS-2LE, UCS-4, UCS-4BE, UCS-4LE, UTF-16,
-- UTF-16BE, UTF-16LE, UTF-32, UTF-32BE, UTF-32LE, UTF-7, C99, JAVA.
--
--- [GNU iconv's character sets]: http://www.gnu.org/software/libiconv/
+-- [GNU iconv's encodings]: http://www.gnu.org/software/libiconv/
-- @param text The text to convert.
--- @param to The string character set to convert to.
--- @param from The string character set to convert from.
+-- @param to The string encoding to convert to.
+-- @param from The string encoding to convert from.
function iconv(text, to, from) end