Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 31 insertions, 0 deletions

diff --git a/mod/lightpics/FAQ.txt b/mod/lightpics/FAQ.txt
new file mode 100644
index 000000000..2f0de8165
--- /dev/null
+++ b/mod/lightpics/FAQ.txt
@@ -0,0 +1,31 @@
+White screen when uploading images
+==================================
+Tidypics tries to calculate the maximum size of an image that your server will support. If it
+guesses incorrectly and someone uploads a photo that is too large, the script may crash when
+resizing the image if you are using GD. The easiest way to test this is to set display_errors
+to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error
+should display on the screen. You can increased your php memory limit. A better option is to use
+imagick if your server supports it (again see the docs directory).
+
+If it is not a memory issue, you should see some other error appear. Once you have fixed the error,
+change display_error back to 0.
+
+
+Question mark images appear
+===========================
+If you see question mark images when you look at your albums, this means the resizing of the images
+failed. This could be due to the memory limits as described above. There are other causes. Tidypics
+tries to detect these problems and write the cause to the error log. You should check your server
+error log right after an upload that results in a question mark for these error messages. The messages
+will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will
+not see these warnings.
+
+Another possible cause is using command line ImageMagick when your server does not
+support it or specifying the wrong path to the ImageMagick executables.
+
+
+Unable to save settings
+=======================
+If you are unable to settings, Apache may be configured to block pages that use
+file paths as Tidypics does when setting the location of the ImageMagick executable.
+In this case, leave that field blank.