summaryrefslogtreecommitdiffstats
path: root/doc/src/zh_CN
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mimir' into 4.7David Boddie2011-02-231-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
| * qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-1/+1
| | | | | | | | 11 instances of raw-html remain.
* | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-135-5/+5
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| * Update copyright year to 2011.Jason McDonald2011-01-105-5/+5
| | | | | | | | Reviewed-by: Trust Me
* | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-141-1/+3
| |
* | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-131-3/+1
|/
* Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-045-25/+25
| | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* Translate bughowto.qdoc into zh_CN.Liang Qi2010-08-161-0/+53
| | | | | Merge-request: 775 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-214-100/+44
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-084-10/+7
| | | | | | | | | | The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
* Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-044-0/+1116
Also updated qdoc's configuration reader so that we can put UTF-8 content in the .qdocconf files later. Reviewed-by: Trust Me