Commit Graph

521 Commits

Author SHA1 Message Date
Uwe Stöhr
958814ca28 Math.lyx: describe new math features 2017-05-22 01:48:07 +02:00
Uwe Stöhr
1f6104fe71 EmbeddedObjects.lyx: document new template for Inkscape
Note that this template has several issues, see bug #10679
2017-05-21 18:10:46 +02:00
Uwe Stöhr
25e3c00838 EmbeddedObjects.lyx: use the new example images on all occurrences 2017-05-17 01:36:48 +02:00
Uwe Stöhr
8bf3d7bb1a EmbeddedObjects.lyx: start updating for LyX 2.3
- add new vector images (the SVG files are only the sources and are therefore purposely not added to Makefile.am)
 On the lyx-docs list it was reported that our current images look old and pixelated and I agree, so that I just draw new ones.
2017-05-15 02:48:07 +02:00
Uwe Stöhr
c32c32747e Intro.lyx: some refinements proposed by Mike
- use true small caps
- use hyperlinks for all types of links

- UserGuide.lyx: fix an image scaling
2017-05-14 19:49:52 +02:00
Scott Kostyshak
944792402c Update docs to 2.3.0alpha1 format 2017-04-24 00:03:19 -04:00
Uwe Stöhr
7c419d5666 UserGuide.lyx: fix a typo
- also 2 formatting fixes
2017-04-20 22:43:51 +02:00
Uwe Stöhr
ecddbe6fb9 doc files: port recent changes from the 2.2.x branch
- also delete a now unused screenshot (cannot be deleted in the stable 2.2.x branch)
2017-04-16 20:12:31 +02:00
Uwe Stöhr
d8185a6b8b Math.lyx: correct wrong info about \mathindent 2017-04-14 00:59:32 +02:00
Uwe Stöhr
764efb149d EmbeddedObjects.lyx: fix some typos and few improvements 2016-12-21 02:21:59 +01:00
Uwe Stöhr
cb1c228319 EmbeddedObjects.lyx: new description how to change table line colors within tables
will be backported the tomorrow
2016-12-20 02:46:47 +01:00
Uwe Stöhr
5bee5aa095 EmbeddedObjects.lyx: fix a typo spotted by a user 2016-11-29 01:29:25 +01:00
Uwe Stöhr
9651879253 Japanese EmbeddedObjects.lyx: re-add export format
- I don't know if it is a bug that LyX automatically deletes the output format if it cannot find
2016-11-05 19:19:19 +01:00
Uwe Stöhr
f5fd699847 Japanese EmbeddedObjects.lyx: re-add code
please use 2.2.x as working branch for all doc files unless you describe new features in master!
2016-11-05 19:12:40 +01:00
Uwe Stöhr
108d6763cf doc files port recent changes 2016-11-05 19:03:56 +01:00
Scott Kostyshak
2c26ff8864 Fix compilation of ja/EmbeddedObjects.lyx
sidecap does not work well for some reason with the Japanese doc, so
the sidecap bool is set to false to restore compilation.

The following test now passes:

export/doc/ja/EmbeddedObjects_pdf3
2016-09-11 10:11:05 -04:00
Uwe Stöhr
d9db72833a Customization.lyx: port recent changes to master 2016-07-31 10:43:00 +02:00
Uwe Stöhr
c8814a0a9d doc files: remove unnecessary TeX braces 2016-07-16 12:45:51 +02:00
Uwe Stöhr
0124e8ff89 Math.lyx: add shortcuts for font styles 2016-07-16 02:31:34 +02:00
Uwe Stöhr
c1e698fd86 doc/template/examples files: port recent changes
By the way: Please only edit the files in the 2.2.x branch unless you describe a new features of LyX 2.3.
2016-07-16 00:11:28 +02:00
Uwe Stöhr
19e0adb86b UserGuide.lyx: port today's changes 2016-07-15 02:56:47 +02:00
Uwe Stöhr
74888abfca doc files: port recent changes 2016-07-15 01:40:43 +02:00
Uwe Stöhr
d0eebfd044 doc files: backport recent changes 2016-07-05 02:27:36 +02:00
Georg Baum
3420910d7b Remove asciiimage and asciixfig formats
The external templates requested conversion to these formats, but there was no
converter defined, so plain text export did fail, and there are no obvious ways
to create plain text representations for the files used by these templates.
Now we output the file name as for other templates and also the graphics inset.
This fixes bug #7135.
2016-06-25 21:09:21 +02:00
Georg Baum
d66d6f7805 Remove external date inset
The external date inset was implemented as a demonstrator for external insets
in general. It was never intended for production code. Now that we have several
external insets defined we do not need the demonstrator anymore. This fixes
bugs #4398 and #9948.
2016-06-19 21:23:25 +02:00
Uwe Stöhr
b4ab194216 UserGuide.lyx: update 2 images 2016-05-30 23:20:49 +02:00
Uwe Stöhr
5254045a4d Tutorial.lyx: get rid of unnecessary preamble code
The aim of the tutorial is to explain how to use LyX and not special LaTeX issues with \frontmatter, non-TeX fonts etc. Therefore the preamble should kept clean.
2016-05-19 01:46:09 +02:00
Uwe Stöhr
3b3dccb34a Japanese Additional.lyx: fix broken filename - this is a regression bug in LyX 2.2
see bug #10136
2016-05-18 00:43:51 +02:00
Uwe Stöhr
efe72fd8e2 Additional.lyx: remove unnecessary TeX code
- also some typographic fixes
2016-05-18 00:08:20 +02:00
Uwe Stöhr
f3ee4a0a49 Japanese docs: fix some more paths
- also few beautification
2016-05-17 23:34:09 +02:00
Uwe Stöhr
7376f2f37f Tutorial.lyx: add a hint 2016-05-15 19:09:10 +02:00
Uwe Stöhr
498eb64e1f EmbeddedObjects.lyx: get rid of unnecessary ERT and fix an image size 2016-05-15 17:14:09 +02:00
Uwe Stöhr
564e72f29f Japanese docs: fix some further broken images links etc. 2016-05-15 16:50:16 +02:00
Uwe Stöhr
e2f5505d41 Japanese UserGuide.lyx: fix broken image links 2016-05-15 16:34:06 +02:00
Uwe Stöhr
72c9ff8a50 Tutorial.lyx: fixes all other languages according to previous commit
- typographic fixes, break links etc.
2016-05-15 03:29:04 +02:00
Uwe Stöhr
b289c597ae Japanese doc files: big translation update fro 2.2.0 from Koji 2016-05-04 01:12:04 +02:00
Enrico Forestieri
b856a3ad9b Update docs to latest format. 2016-04-06 05:43:44 +02:00
Jean-Marc Lasgouttes
6196645cce Update documents and layouts after fd1ee3b4. 2016-04-01 10:08:39 +02:00
Uwe Stöhr
d17a38ac24 Math.lyx: some fixes 2016-02-25 00:15:54 +01:00
Uwe Stöhr
e8eed35c5c Math.lyx: revise section about subnumbering
thanks to Andrew Aparsloe for the hint
2016-02-21 17:46:55 +01:00
Uwe Stöhr
43ea63197d Japanese UserGuide.lyx: updates by Koji 2016-02-03 21:46:32 +01:00
Uwe Stöhr
12559b33c3 Math.lyx: remove a misleading info
mathed simply does not yet support \parbox
2016-02-03 00:51:50 +01:00
Uwe Stöhr
11689bec64 UserGuide.lyx: an update 2016-01-30 01:26:27 +01:00
Uwe Stöhr
f8be82f76c Japanese doc files: translations from Koji 2016-01-27 22:43:35 +01:00
Guillaume Munch
360742c515 New LFUN tabular-feature: update docs
Simply run updatedocs.py
2016-01-27 18:35:10 +01:00
Uwe Stöhr
c1e0b24304 acmsiggraph.layout: update layout for ACM siggraph 0.92
fileformat change: update fileformat for all files
2016-01-27 01:58:13 +01:00
Uwe Stöhr
bae3bd67b7 Customization.lyx: update color list in Font description 2016-01-27 01:09:58 +01:00
Uwe Stöhr
93faf3433c UserGuide.lyx: a compile fix
It is a long standing bug that lyX does not automatically convert # to \# in the LaTeX output so that one easily gets compilation errors.
2016-01-26 00:27:28 +01:00
Uwe Stöhr
45fde8bf97 UserGuide.lyx: describe dvips options
- also some unifications and fixes
2016-01-25 02:34:34 +01:00
Uwe Stöhr
6291fefe9e EmbeddedObjects.lyx: update multi-page table description 2016-01-24 16:07:22 +01:00
Uwe Stöhr
33b757e7ab SVG-Drawing.svg: add a SVG example drawing 2016-01-24 13:48:56 +01:00
Uwe Stöhr
68b18a4ccb French and Japanese EmbeddedObjects.lyx: forgot this issue in previous commit 2016-01-24 04:55:46 +01:00
Uwe Stöhr
dcf4f024ea EmbeddedObjects.lyx: update external templates section 2016-01-24 04:50:31 +01:00
Uwe Stöhr
3ca4a10924 UserGuide.lyx: describe new LaTeX log feature 2016-01-24 04:03:22 +01:00
Uwe Stöhr
60dd0e17e5 UserGuide.lyx: describe changed paragraph separation 2016-01-24 03:30:03 +01:00
Uwe Stöhr
f5f8e9e369 UserGuide.lyx: describe a new feature 2016-01-23 20:41:52 +01:00
Uwe Stöhr
2a507512e4 Japanese doc files: some tweaks 2016-01-23 18:16:25 +01:00
Uwe Stöhr
8d00943aab EmbeddedObjects.lyx: some tweaks 2016-01-20 02:33:19 +01:00
Uwe Stöhr
877ea78877 Customization.lyx: fixes and updates from Jean-Pierre 2016-01-19 00:59:58 +01:00
Uwe Stöhr
f1a46bac7c UserGuide.lyx: describe the horizontal scrolling 2016-01-18 00:25:11 +01:00
Uwe Stöhr
82624a1302 UserGuide.lyx: typographic corrections 2016-01-17 20:30:52 +01:00
Uwe Stöhr
ffa4072980 UserGuide.lyx: review Appendix C 2016-01-17 03:33:01 +01:00
Uwe Stöhr
401bdcc2f0 UserGuide.lyx: remove an outdated note
- also some minor fixes
2016-01-17 03:05:13 +01:00
Uwe Stöhr
b18fac7508 doc files: update more screenshots
- also fix a menu issue in EmbeddedObjects.lyx
2016-01-17 02:40:46 +01:00
Uwe Stöhr
f3a5f7845e doc files: update and rename more sceenshots
- also update a menu name
- update a section French UserGuide.lyx
2016-01-16 20:52:02 +01:00
Uwe Stöhr
304d197a02 Intro.lyx: correct an image path 2016-01-16 19:49:45 +01:00
Uwe Stöhr
71b60e07c3 UserGuide.lyx: revise Appendix A
- update the toolbar screenshots, update some images and their names (more to follow)
2016-01-16 04:19:35 +01:00
Uwe Stöhr
3ac456f444 EmbeddedObjects.lyx: fix some issues and typos 2016-01-14 22:32:35 +01:00
Uwe Stöhr
8803eac043 EmbeddedObjects.lyx: fix mistakes spotted by Ignacio 2016-01-13 02:01:15 +01:00
Uwe Stöhr
6abdf2bc69 doc files: re-add the \origin tag
also save all files with latest 2.2dev
2016-01-13 01:14:48 +01:00
Guillaume Munch
4a1e158c95 Update docs 2016-01-12 21:30:37 +00:00
Kornel Benko
27a2d32e49 Remaining broken links corrected 2016-01-12 19:16:41 +01:00
Kornel Benko
e4b539914a Replace broken links. 2016-01-11 23:42:11 +01:00
Uwe Stöhr
2f8444b120 Doc files: re-add some origin paths
(while checking compilability of changed files)
thanks Georg for fixing this issue in LyX
2016-01-11 02:19:35 +01:00
Uwe Stöhr
4663e65d4a Japanese Math.lyx: fix 3 icons
(these were accidentally destroyed in changeset/6b0632ee)
2016-01-11 01:11:06 +01:00
Kornel Benko
e2a16f1c9a Broken URLs: replace with values found by Jean-Pierre. 2016-01-05 12:13:21 +01:00
Kornel Benko
7ac12294dc Correct some more broken URLs 2016-01-04 12:45:41 +01:00
Georg Baum
9e135d9749 Fix line endings
The default behaviour of git for text files is to store unix line endings in
the repository, and to convert to native line endings in the local workspace.
This plays well with the LyX behaviour of storing files in native line endings.
Unfortunately it may break if files are sent around by email and submitted on
a different OS than the one they were last saved, and this did probably happen
in 6b0632eea.
2015-12-31 13:26:46 +01:00
Richard Heck
6b0632eea2 Updates to Japanese docs and po file, from Koji. 2015-12-29 09:58:48 -05:00
Günter Milde
bf66141ac8 Revert output format setting for Japanese manuals (pdf2 does not work).
The manuals use language "Japanese" wich is tied to "platex" 
(automatically set instead of (plain) LaTeX).
For export with other engines, the language must be set to "Japanese (CJK).

For a discussion of alternatives for Japanese with LaTeX , see also
http://www.preining.info/blog/2014/12/writing-japanese-in-latex-part-1-introduction/
2015-12-14 21:25:09 +01:00
Uwe Stöhr
f5a9ee54e6 Math.lyx: merge yesterday's changes
Please treat the doc files as frozen from now on, a an announcement how to proceed will follow later today.
2015-12-12 11:43:01 +01:00
Uwe Stöhr
ce73df3a0c EmbeddedObjects.lyx: replace images by inset info 2015-12-11 00:58:26 +01:00
Günter Milde
0529b40cc9 Set default output format for manuals to PDF (pdflatex).
Pdflatex is the recommended export tool for the manuals.
Pdflatex brings the best results for hyperlinking.
Some features (e.g. rotated text) are not available in DVI or PS (dvips).

This does not affect export from command line or autotests
(where this setting is ignored and the format must aways be given explicitely).
2015-12-10 10:40:50 +01:00
Uwe Stöhr
db05bf8fa2 UserGuide.lyx: use some info-inset icons 2015-12-10 00:37:54 +01:00
Uwe Stöhr
986821f442 Math.lyx: use some icon-info insets 2015-12-10 00:27:13 +01:00
Günter Milde
4d0356aea1 Set default output for "complex" manuals to PDF (pdflatex).
This is the "design format" for the manuals. Some features do not
work in other formats.
See http://permalink.gmane.org/gmane.editors.lyx.devel/158616
2015-12-09 08:54:38 +01:00
Uwe Stöhr
95894a9bd9 Math.lyx: image adjustments
the font size is 12 pt so the icons can have this size too; besides this readability is ore important than to fit in a text line
2015-12-09 02:30:38 +01:00
Uwe Stöhr
a9549c036e Japanese UserGuide.lyx: make document compilable without PNGs
also some small corrections and adjustments
2015-12-09 02:22:48 +01:00
Günter Milde
b50df82e7a Make Math.lyx compilable again.
After removing "unneded" PNG files from the repo, this manual failed.
Skaling is done to ensure that the icons are approximately one M high.

Also, the default output is set to PDF (pdflatex) as this is said to be the export
format our manuals are designed for.
2015-12-08 17:46:50 +01:00
Uwe Stöhr
6e54bb2954 Customization.lyx: merge all recent changes 2015-12-06 04:44:33 +01:00
Uwe Stöhr
178c7464e2 EmbeddedObjects.lyx: merge changes 2015-12-05 19:22:34 +01:00
Uwe Stöhr
2432c8344d Customization.lyx: change fonts as discussed 2015-12-03 02:36:09 +01:00
Uwe Stöhr
8f2b1db2ee Additional.lyx: change fonts as discussed 2015-12-03 02:32:09 +01:00
Uwe Stöhr
a441e1b6b5 Math.lyx: change fonts as discussed 2015-12-03 02:27:07 +01:00
Uwe Stöhr
870b7572f2 EmbeddedObjects.lyx: change fonts as discussed 2015-12-03 02:18:20 +01:00
Uwe Stöhr
52c623a558 UserGuide.lyx: change fonts as discussed 2015-12-03 02:08:31 +01:00
Uwe Stöhr
a7659d207d Tutorial.lyx: change fonts as discussed 2015-12-03 01:29:33 +01:00
Uwe Stöhr
650ae32b1b Intro.lyx: change fonts as discussed 2015-12-03 00:52:23 +01:00
Richard Heck
be8b73f907 Revert local layouts changes in ja/Additional.lyx. 2015-12-01 21:24:55 -05:00
Uwe Stöhr
6e11711409 UserGuide.lyx: document new possible text colors
@Richard: as you can see the additional lines in Verbatim are not added by lyx2lyx
2015-12-02 01:33:25 +01:00
Scott Kostyshak
19c6a015fb Update the link to CMCDDE in our documents
Our URL checker found the broken link.
2015-11-30 18:35:47 -05:00
Kornel Benko
5b73df0f31 Make Japanese manual Additional.lyx compilable.
Added a protected space in default language after an english text.
This is needed only if the imaadiately following style is some sectioning.
2015-11-29 23:04:36 +01:00
Uwe Stöhr
8a73992a49 Customization.lyx: update version number 2015-11-29 19:42:07 +01:00
Uwe Stöhr
281131f6b2 Customization.lyx: accept all remaining changes 2015-11-29 19:25:46 +01:00
Uwe Stöhr
9464112840 Customization: accept and merge some changes 2015-11-29 18:24:05 +01:00
Uwe Stöhr
6273c6bdc1 Japanese manuals: run lyx2lyx 2015-11-29 17:21:27 +01:00
Uwe Stöhr
7499b14b50 Customization.lyx: update localLayout format
- Japanese version: also run lyx2lyx
2015-11-29 17:15:15 +01:00
Uwe Stöhr
72ce471c81 Additional.lyx: remove sloppypar
- sloppypar and sloppy should not be used, see the discussion in bug #9874
- also update the local layout to the current format
2015-11-29 02:53:58 +01:00
Uwe Stöhr
695399b062 UserGuide.lyx and Math.lyx: update version number 2015-11-28 03:23:38 +01:00
Uwe Stöhr
ab1f3213e8 LaTeXConfig.lyx: accept changes
- also add hpstatement module and remove the deprecated rsphrase module (this module is only kept for compatibility reasons)
2015-11-28 03:15:45 +01:00
Uwe Stöhr
b264176041 Additional.lyx: merge changes 2015-11-28 02:50:06 +01:00
Scott Kostyshak
2f4233721d Update docs to latest format for 2.2.0alpha2 2015-11-27 03:23:22 -05:00
Scott Kostyshak
63788d5f0b Update the docbook links
Docbook is no longer being developed, but the new link at least
exists and SGML-tools Lite can still be downloaded.
2015-11-26 23:51:12 -05:00
Scott Kostyshak
5e73a9f9a8 Update a couple formats 2015-11-26 23:51:12 -05:00
Uwe Stöhr
b933848110 UserGuide.lyx: add link to makeindex manpages 2015-11-27 02:23:55 +01:00
Uwe Stöhr
ad615c67f7 UserGuide.lyx: updates
- merge changes
- some general changes, fixes and descriptions of new features
2015-11-27 01:59:56 +01:00
Scott Kostyshak
fedb6e8555 Fix a broken URL for man page of 'date' command
The new URL is now:
http://man7.org/linux/man-pages/man1/date.1.html

The broken URL was found by the URL tests.
2015-11-25 18:49:19 -05:00
Scott Kostyshak
94b5825f60 Update formats of UserGuide.lyx for upcoming edit 2015-11-25 18:49:18 -05:00
Georg Baum
385aed9721 Fix \origin lines
These were fixed manually. I tried to add an option to updatedocs.py to
open and save a file with LyX, but that did not work, since
lyx -x 'command-sequence buffer-write ; lyx-quit' does not write and does
not quit.
2015-11-11 22:25:18 +01:00
Georg Baum
83672113d3 Update documentation to current format
This was done by running development/tools/updatedocs.py and reverting
lib/doc/LFUNs.lyx in order to preserve the special header line.
2015-11-11 21:56:27 +01:00
Uwe Stöhr
4db6045a32 EmbeddedObjects.lyx: describe Reflectbox and friends 2015-11-05 00:53:35 +01:00
Uwe Stöhr
cb51493f94 EmbeddedObjects.lyx: describe rotate boxes properly
- We have now a module for them
(the description of scaled boxes etc will follow soon)
2015-11-04 00:13:45 +01:00
Uwe Stöhr
279d084946 Math.lyx: replace tables by formal ones - final part 7/7 2015-11-03 00:23:41 +01:00
Uwe Stöhr
f3c3e1bccd Math.lyx: replace tables by formal ones - part 6 2015-11-02 23:43:42 +01:00
Uwe Stöhr
9cae1ffdc9 Math.lyx: replace tables by formal ones - part 5 2015-10-25 23:36:46 +01:00
Uwe Stöhr
295a19dd73 EmbeddedObjects.lyx: remove an outdated info
the mentioned varioref bug was fixed 5 years ago
2015-10-25 23:02:03 +01:00
Uwe Stöhr
4e221e283d Math.lyx: replace tables by formal ones - part 4
- also add changelog file for the translators
2015-10-25 18:34:47 +01:00
Uwe Stöhr
a0b3eaf67e Math.lyx: replace tables by formal ones - part 3 2015-10-25 16:26:02 +01:00
Uwe Stöhr
b275b30391 Math.lyx: replace tables by formal ones - part 2 2015-10-25 15:48:45 +01:00
Uwe Stöhr
fb51b2cb57 Math.lyx: correct images paths now correctly 2015-10-25 14:32:27 +01:00
Uwe Stöhr
711ece2750 Math.lyx: repair broken paths
this is caused by bug #9815
2015-10-25 04:37:00 +01:00
Uwe Stöhr
bac5e106d1 Math.lyx: replace tables by formal ones - part 1 2015-10-25 04:08:46 +01:00
Uwe Stöhr
85bc4faf66 Math.lyx: fix bug #9803
\mathscr cannot contain small letters
thanks Günther
2015-10-19 23:57:34 +02:00
Uwe Stöhr
e245a18da0 Math.lyx: update because bug #8566 was fixed long time ago
- also adjust the scaling of 2 images
2015-10-19 18:51:29 +02:00
Uwe Stöhr
6186608a3c UserGuide.lyx: port changes from branch 2015-10-18 19:22:39 +02:00
Uwe Stöhr
741e526713 EmbeddedObjects.lyx: revert unintended part of previous commit are commit correct stuff
- sorry, after some moths without LyXing I forgot most of the complicated git branch handling stuff
2015-10-18 19:05:41 +02:00
Uwe Stöhr
4745969b45 EmbeddedObjects.lyx: update appendix A
Since a while now we can translate the unit descriptions. For some special applications it is also necessary that the users know the LaTeX command of the relative units.

- also fix a typo in Customization.lyx
2015-10-18 18:57:15 +02:00
Uwe Stöhr
6fc093355c UserGuide.lyx: accept Stephan's changes
- port one change to the other language versions
2015-09-23 22:54:41 +02:00
Uwe Stöhr
c0a55f3458 EmbeddedObjects.lyx: update all language versions after [d16a95af/lyxgit]
Please use change tracking when modifying the docs
2015-07-17 00:19:27 +02:00
Uwe Stöhr
1c71f1eaab UserGuide.lyx: merge changes to all language variants
(The UserGuide is currently not compilable because of bug #9632)
2015-06-17 01:23:57 +02:00
Uwe Stöhr
945a348684 EmbeddedObjects.lyx: more updates for the box description 2015-06-01 23:03:55 +02:00
Uwe Stöhr
af4cb6db1c EmbeddedObjects.lyx: describe the new box features 2015-06-01 02:46:59 +02:00
Uwe Stöhr
a4a8fa5939 UserGuide: remove another print residue
Japanese and Spanish UserGuide: fix some references/labels
2015-05-31 04:08:54 +02:00
Uwe Stöhr
c13b044d86 UserGuide: remove description of LyX's former printing feature 2015-05-31 03:34:01 +02:00
Uwe Stöhr
f69d5abffb EmbeddedObjects.lyx: port recent changes from branch 2015-05-24 23:25:21 +02:00
Uwe Stöhr
f6029f7f93 EmbeddedObjects.lyx: improve description of \cmidrule 2015-04-30 01:22:50 +02:00
Uwe Stöhr
844998c20a UserGuide.lyx: fix a LaTeX warning
\bf is deprecated
2015-04-17 01:03:18 +02:00
Kornel Benko
7b72010408 Update doc-files due to icon rename, this time correct 2015-03-29 17:20:35 +02:00
Kornel Benko
ecf2b9f091 Update doc-files due to icon rename
promote -> outline-up
demote -> outline-down
2015-03-29 16:49:27 +02:00
Uwe Stöhr
9ced7384eb UserGuide.lyx: port recent changes from branch 2015-02-24 01:56:27 +01:00