[commits] Horde branch master updated. f54facea8cb61201de8c478437666441ca256f39

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: a0b3907ef47a760294cee997dc8bb9906c9840a7

0d17b58 No need to verify format, it's set by the admin.
e220bad Move standard page contents into a sub-directory for the Default Text_Wiki processor.
373f2f5 Use Syntaxhighlighter directly, and don't default to bash highlighting.
345149a Add missing comma.
f54face Update package.xml

-----------------------------------------------------------------------

commit 0d17b58c1b2e9bf5624949d01dabe6db55e26ed0
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 8 17:47:14 2011 +0200

    No need to verify format, it's set by the admin.

 wicked/lib/Page.php |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/0d17b58c1b2e9bf5624949d01dabe6db55e26ed0

-----------------------------------------------------------------------

commit e220bad24d5ec0da8102d5cba688aa231e3c0455
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 8 17:53:51 2011 +0200

    Move standard page contents into a sub-directory for the Default Text_Wiki processor.

 wicked/data/AddingPages                 |    4 -
 wicked/data/Default/AddingPages         |    4 +
 wicked/data/Default/HowToUseWiki        |    5 +
 wicked/data/Default/MethodSetRenderConf |   29 +++
 wicked/data/Default/RuleInterwiki       |   54 +++++
 wicked/data/Default/RuleWikilink        |   86 +++++++
 wicked/data/Default/SandBox             |    5 +
 wicked/data/Default/SmashWordsTogether  |    1 +
 wicked/data/Default/WickedTextFormat    |  373 +++++++++++++++++++++++++++++++
 wicked/data/Default/WikiHome            |   11 +
 wicked/data/Default/WikiPage            |    1 +
 wicked/data/HowToUseWiki                |    5 -
 wicked/data/MethodSetRenderConf         |   29 ---
 wicked/data/RuleInterwiki               |   54 -----
 wicked/data/RuleWikilink                |   86 -------
 wicked/data/SandBox                     |    5 -
 wicked/data/SmashWordsTogether          |    1 -
 wicked/data/WickedTextFormat            |  373 -------------------------------
 wicked/data/WikiHome                    |   11 -
 wicked/data/WikiPage                    |    1 -
 wicked/lib/Page/StandardPage.php        |    4 +-
 21 files changed, 572 insertions(+), 570 deletions(-)
 delete mode 100644 wicked/data/AddingPages
 create mode 100644 wicked/data/Default/AddingPages
 create mode 100644 wicked/data/Default/HowToUseWiki
 create mode 100644 wicked/data/Default/MethodSetRenderConf
 create mode 100644 wicked/data/Default/RuleInterwiki
 create mode 100644 wicked/data/Default/RuleWikilink
 create mode 100644 wicked/data/Default/SandBox
 create mode 100644 wicked/data/Default/SmashWordsTogether
 create mode 100644 wicked/data/Default/WickedTextFormat
 create mode 100644 wicked/data/Default/WikiHome
 create mode 100644 wicked/data/Default/WikiPage
 delete mode 100644 wicked/data/HowToUseWiki
 delete mode 100644 wicked/data/MethodSetRenderConf
 delete mode 100644 wicked/data/RuleInterwiki
 delete mode 100644 wicked/data/RuleWikilink
 delete mode 100644 wicked/data/SandBox
 delete mode 100644 wicked/data/SmashWordsTogether
 delete mode 100644 wicked/data/WickedTextFormat
 delete mode 100644 wicked/data/WikiHome
 delete mode 100644 wicked/data/WikiPage

http://git.horde.org/horde-git/-/commit/e220bad24d5ec0da8102d5cba688aa231e3c0455

-----------------------------------------------------------------------

commit 373f2f56844ac26c97ebfbadd5bdc98e1fe51033
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 8 19:05:00 2011 +0200

    Use Syntaxhighlighter directly, and don't default to bash highlighting.

 wicked/lib/Text_Wiki/Render/Xhtml/Code2.php |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/373f2f56844ac26c97ebfbadd5bdc98e1fe51033

-----------------------------------------------------------------------

commit 345149ad908496ca94273132cdd6515d04e30fe0
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 8 22:20:39 2011 +0200

    Add missing comma.

 wicked/templates/display/standard.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/345149ad908496ca94273132cdd6515d04e30fe0

-----------------------------------------------------------------------

commit f54facea8cb61201de8c478437666441ca256f39
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 8 22:56:55 2011 +0200

    Update package.xml

 framework/Itip/package.xml         |   18 ++++++++++++------
 framework/Kolab_Format/package.xml |   10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/f54facea8cb61201de8c478437666441ca256f39