From f738546c8fd9fdfbc7e57edab2e4dd08c271f32d Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Thu, 7 Jul 2011 18:21:15 +0200
Subject: [PATCH] MDL-NOBUG tinymce - updated instructions to cover local
 modifications and other minor changes

---
 lib/editor/tinymce/readme_moodle.txt | 31 +++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/lib/editor/tinymce/readme_moodle.txt b/lib/editor/tinymce/readme_moodle.txt
index 54b4e9a1f37..b2e85090137 100644
--- a/lib/editor/tinymce/readme_moodle.txt
+++ b/lib/editor/tinymce/readme_moodle.txt
@@ -4,20 +4,40 @@ Description of TinyMCE v3.3.9.1 library integration in Moodle
 Copyright: (c) 2004-2010, Moxiecode Systems AB, All rights reserved.
 License: GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
 
-Moodle maintainer: Petr Skoda (skodak) 
+Moodle maintainer: Petr Skoda (skodak)
 
 =========================================================================================
-Upgrade procedure:
- 1/ clone http://github.com/moodle/tinymce
- 2/ clone http://github.com/moodle/tinymce_spellchecker_php
+Upgrade procedure (by maintainer):
+
+ 1/ clone https://github.com/moodle/custom-tinymce
+ 2/ clone https://github.com/moodle/custom-tinymce_spellchecker_php
  3/ merge new changes in latest STABLE branches into these two repos
  4/ tweak paths in build script in moodle_build.sh and execute
- 5/ fix line endings 
+ 5/ fix line endings
  6/ download all TinyMCE lang files (extra/tools/download_langs.sh)
  7/ make sure your moodle installation has all language packs installed.
  7/ update moodle lang string files (extra/tools/update_lang_files.php)
  8/ ensure lang packs are updated into AMOS (lang.moodle.net)
 
+=========================================================================================
+Prepare local modification procedure (by developer):
+
+ 1/ clone https://github.com/moodle/custom-tinymce
+ 2/ clone https://github.com/moodle/custom-tinymce_spellchecker_php
+ 3/ apply local modifications to the STABLE branches in those two repos
+ 4/ tweak paths in build script in moodle_build.sh and execute
+ 5/ fix line endings
+ 6/ provide 2 patches into the corresponding MDL issue:
+    a) one patch with the version to be applied to custom-tinymce (one for each target branch)
+    b) another patch with the resulting changes to be applied to moodle.git (one for each target branch)
+ 7/ then integrator will:
+    a) apply patches in 6a/ to custom-tinymce repo
+    b/ standard integration of patches in 6b/ to moodle.git (review, test, upstream)
+ 8/ Done!
+
+Note1: if the local modification includes lang changes, then steps 6-8 (from upgrade) may be necessary. Contact
+AMOS maintainer / custom-tinymce maintainer / integrators about that.
+
 =========================================================================================
 Added:
  * plugins/gragmath/*
@@ -28,6 +48,7 @@ Modified:
  * image integration - file picker integration
  * string processing - uses our lang framework
  * form hacks
+ * MDL-27890 - allow editor to be smaller
 
  TODO:
  * update strings to integrate with AMOS