From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 20 Aug 2011 08:57:14 -0500 Subject: updated version number in user guide, removed some stray merge markers found in the change log --- user_guide/libraries/benchmark.html | 2 +- user_guide/libraries/caching.html | 2 +- user_guide/libraries/calendar.html | 2 +- user_guide/libraries/cart.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/file_uploading.html | 2 +- user_guide/libraries/form_validation.html | 2 +- user_guide/libraries/ftp.html | 2 +- user_guide/libraries/image_lib.html | 2 +- user_guide/libraries/input.html | 2 +- user_guide/libraries/javascript.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 2 +- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/parser.html | 2 +- user_guide/libraries/security.html | 2 +- user_guide/libraries/sessions.html | 2 +- user_guide/libraries/table.html | 2 +- user_guide/libraries/trackback.html | 2 +- user_guide/libraries/typography.html | 2 +- user_guide/libraries/unit_testing.html | 2 +- user_guide/libraries/uri.html | 2 +- user_guide/libraries/user_agent.html | 2 +- user_guide/libraries/xmlrpc.html | 2 +- user_guide/libraries/zip.html | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) (limited to 'user_guide/libraries') diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html index c29acb7b2..c7b7ec9a7 100644 --- a/user_guide/libraries/benchmark.html +++ b/user_guide/libraries/benchmark.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index f94a3d1a2..9b503f6d1 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html index e1af71cc9..724c08f8b 100644 --- a/user_guide/libraries/calendar.html +++ b/user_guide/libraries/calendar.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html index f084d5dcf..3471eeb7e 100644 --- a/user_guide/libraries/cart.html +++ b/user_guide/libraries/cart.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html index be75801e0..d522bbc5b 100644 --- a/user_guide/libraries/config.html +++ b/user_guide/libraries/config.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html index 5a8814d59..d246254ab 100644 --- a/user_guide/libraries/email.html +++ b/user_guide/libraries/email.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index 60099312c..5c64127cb 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html index e4e842e5f..a88c67220 100644 --- a/user_guide/libraries/file_uploading.html +++ b/user_guide/libraries/file_uploading.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/form_validation.html b/user_guide/libraries/form_validation.html index 8fdcd1446..7c544b69f 100644 --- a/user_guide/libraries/form_validation.html +++ b/user_guide/libraries/form_validation.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index 43b949a50..6c7ed5c65 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html index dbf07768e..475f02a56 100644 --- a/user_guide/libraries/image_lib.html +++ b/user_guide/libraries/image_lib.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html index 08b8ab0d3..311f76ee9 100644 --- a/user_guide/libraries/input.html +++ b/user_guide/libraries/input.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index 5b7ef437b..09530e246 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html index 75863c2ac..1f670ea4b 100644 --- a/user_guide/libraries/language.html +++ b/user_guide/libraries/language.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html index a472730ca..af27176ad 100644 --- a/user_guide/libraries/loader.html +++ b/user_guide/libraries/loader.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html index 4d1f8d97a..7361d7961 100644 --- a/user_guide/libraries/output.html +++ b/user_guide/libraries/output.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html index 3c366a69f..196555441 100644 --- a/user_guide/libraries/pagination.html +++ b/user_guide/libraries/pagination.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html index cb2f100a2..b8a53452e 100644 --- a/user_guide/libraries/parser.html +++ b/user_guide/libraries/parser.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/security.html b/user_guide/libraries/security.html index 735187459..dd62a4386 100644 --- a/user_guide/libraries/security.html +++ b/user_guide/libraries/security.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 75ea0e6d7..e09c31db3 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/table.html b/user_guide/libraries/table.html index eeb3b421f..1f34dd9e2 100644 --- a/user_guide/libraries/table.html +++ b/user_guide/libraries/table.html @@ -27,7 +27,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index 7f89b4f5e..a2912a594 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/typography.html b/user_guide/libraries/typography.html index 895e76f7d..cd287933c 100644 --- a/user_guide/libraries/typography.html +++ b/user_guide/libraries/typography.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html index 5e0c4c16b..5ebec0cbf 100644 --- a/user_guide/libraries/unit_testing.html +++ b/user_guide/libraries/unit_testing.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html index e4e0f9d3f..0e1c26f1e 100644 --- a/user_guide/libraries/uri.html +++ b/user_guide/libraries/uri.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html index 24e8071f3..e1d3640d3 100644 --- a/user_guide/libraries/user_agent.html +++ b/user_guide/libraries/user_agent.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 5ba851341..3635c221b 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 087b4adfb..21cf8017a 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -28,7 +28,7 @@
- +

CodeIgniter User Guide Version 2.0.2

CodeIgniter User Guide Version 2.0.3
-- cgit v1.2.3-24-g4f1b