[kde-doc-english] branches/work/doc
T.C. Hollingsworth
tchollingsworth at gmail.com
Wed Aug 17 22:01:27 UTC 2011
SVN commit 1247892 by hollingsworth:
kwrite now pulls in most of its docbooks from kate
CCMAIL: kde-doc-english at kde.org
Is this acceptable/done correctly?
M +3 -8 kate/advanced.docbook
M +3 -4 kate/highlighting.docbook
M +3 -0 kate/index.docbook
M +7 -9 kate/part.docbook
M +1 -3 kate/regular-expressions.docbook
M +3 -4 kate/vi.docbook
D kwrite/advanced.docbook
D kwrite/comma-to.png
D kwrite/highlighted.png
D kwrite/highlighting.docbook
M +7 -5 kwrite/index.docbook
D kwrite/part.docbook
D kwrite/regular-expressions.docbook
D kwrite/unhighlighted.png
D kwrite/vi.docbook
--- branches/work/doc/kate/advanced.docbook #1247891:1247892
@@ -1,5 +1,4 @@
-<!--kate/advanced.docbook and kwrite/advanced.docbook should always be identical-->
-
+<!--pulled in by kwrite too-->
<chapter id="advanced-editing-tools">
<chapterinfo>
<authorgroup>
@@ -8,7 +7,7 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
</chapterinfo>
-<title>Advanced Editing Tools <!--kwrite: (power user mode)--></title>
+<title>Advanced Editing Tools &i18n-powermode;</title>
<sect1 id="advanced-editing-tools-comment">
@@ -628,14 +627,10 @@
on a given region: a top down triangle means that the region is expanded, clicking it will
collapse the region and a right pointing triangle will be displayed instead.</para>
-<para>Eleven commands are provided to manipulate the state of folding regions,
+<para>Four commands are provided to manipulate the state of folding regions,
see the <link linkend="view-code-folding">menu documentation</link>.
</para>
-<para>The folded lines are remembered when a file is closed, so when you reopen
-the file the folded nodes will still be folded. This applies to reload operations
-as well.</para>
-
<para>If you do not want to use the code folding feature, you can disable
the <guilabel>Show folding markers (if available)</guilabel> option in the
<link linkend="appearance">Appearance</link> page of the editor
--- branches/work/doc/kate/highlighting.docbook #1247891:1247892
@@ -1,5 +1,4 @@
-<!--kate/highlighting.docbook and kwrite/highlighting.docbook should always be identical-->
-
+<!--pulled in by kwrite too-->
<appendix id="highlight">
<appendixinfo>
<authorgroup>
@@ -22,7 +21,7 @@
helps the author to be more efficient and productive.</para>
<mediaobject>
-<imageobject><imagedata format="PNG" fileref="highlighted.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="&path;highlighted.png"/></imageobject>
<textobject><phrase>A Perl function, rendered with syntax
highlighting.</phrase></textobject>
<caption><para>A Perl function, rendered with syntax highlighting.</para>
@@ -30,7 +29,7 @@
</mediaobject>
<mediaobject>
-<imageobject><imagedata format="PNG" fileref="unhighlighted.png"/></imageobject>
+<imageobject><imagedata format="PNG" fileref="&path;unhighlighted.png"/></imageobject>
<textobject><phrase>The same Perl function, without
highlighting.</phrase></textobject>
<caption><para>The same Perl function, without highlighting.</para></caption>
--- branches/work/doc/kate/index.docbook #1247891:1247892
@@ -3,6 +3,9 @@
"dtd/kdex.dtd" [
<!ENTITY kappname "&kate;">
<!ENTITY package "kdesdk">
+ <!ENTITY i18n-powermode "<!--please leave this blank-->">
+ <!--relative path to screenshots for docs pulled in by kwrite-->
+ <!ENTITY path "">
<!ENTITY configuring-chapter SYSTEM "configuring.docbook">
<!ENTITY highlighting-appendix SYSTEM "highlighting.docbook">
<!ENTITY advanced-chapter SYSTEM "advanced.docbook">
--- branches/work/doc/kate/part.docbook #1247891:1247892
@@ -1,6 +1,4 @@
-<!--kate/part.docbook and kwrite/part.docbook should always be identical, with
- the exception of the lead paragraph-->
-
+<!--pulled in by kwrite too-->
<chapter id="kate-part">
<chapterinfo>
<authorgroup>
@@ -16,8 +14,8 @@
<title>Overview</title>
<para>The &kappname; editor is the editing area of the &kappname; window. This
-editor is also used by &kwrite;, and it can be used in &konqueror; for
-displaying text files from your local computer, or from the
+editor is shared between &kate; and &kwrite;, and it can also be used in &konqueror;
+for displaying text files from your local computer, or from the
network.</para>
<para>The editor is composed of the following components:</para>
@@ -66,7 +64,7 @@
</varlistentry>
<varlistentry>
-<term>The Folding Pane <!--kwrite: (power user mode)--></term>
+<term>The Folding Pane &i18n-powermode;</term>
<listitem>
<para>The folding pane allows you to collapse or expand foldable blocks
of lines. The calculation of the foldable regions are done according to
@@ -186,7 +184,7 @@
with the &LMB; in the editor.</para>
<sect2 id="kate-part-selection-block">
-<title>Using Block Selection <!--kwrite: (power user mode)--></title>
+<title>Using Block Selection &i18n-powermode;</title>
<para>When Block Selection is enabled, you can make <quote>vertical
selections</quote> in the text, meaning selecting limited columns from
@@ -449,7 +447,7 @@
</sect1>
<sect1 id="kate-part-bookmarks">
-<title>Using Bookmarks <!--kwrite: (power user mode)--></title>
+<title>Using Bookmarks &i18n-powermode;</title>
<para>The bookmarks feature allows you to mark certain lines, to be
able to easily find them again.</para>
@@ -520,7 +518,7 @@
</sect1>
<sect1 id="kate-part-autoindent">
-<title>Using automatic indenting <!--kwrite: (power user mode)--></title>
+<title>Using automatic indenting &i18n-powermode;</title>
<para>&kappname;s editor component supports a variation of autoindenting modes,
designed for different text formats. You can pick from the available modes using
--- branches/work/doc/kate/regular-expressions.docbook #1247891:1247892
@@ -1,6 +1,4 @@
-<!--kate/regular-expressions.docbook and kwrite/regular-expressions.docbook should
- always be identical-->
-
+<!--pulled in by kwrite too-->
<appendix id="regular-expressions">
<appendixinfo>
<authorgroup>
--- branches/work/doc/kate/vi.docbook #1247891:1247892
@@ -1,5 +1,4 @@
-<!--kate/vi.docbook and kwrite/vi.docbook should always be identical-->
-
+<!--pulled in by kwrite too-->
<chapter id="vi-input-mode-chapter">
<chapterinfo>
<authorgroup>
@@ -8,7 +7,7 @@
</authorgroup>
</chapterinfo>
-<title>The VI Input Mode <!--kwrite: (power user mode)--></title>
+<title>The VI Input Mode &i18n-powermode;</title>
<sect1 id="vi-mode-sect1">
<title>VI Input Mode</title>
@@ -513,7 +512,7 @@
<screenshot id="screenshot-resources">
<screeninfo>An example of Comma Text Object</screeninfo>
<mediaobject>
-<imageobject><imagedata fileref="comma-to.png" format="PNG"/></imageobject>
+<imageobject><imagedata fileref="&path;comma-to.png" format="PNG"/></imageobject>
<textobject><phrase>An example of Comma Text Object</phrase></textobject>
<caption><para>Comma text object ranges. If the cursor is over ⪚
<replaceable>arg2</replaceable>, pressing
--- branches/work/doc/kwrite/index.docbook #1247891:1247892
@@ -4,14 +4,16 @@
<!ENTITY kappname "&kwrite;">
<!ENTITY package "kdebase">
<!ENTITY i18n-powermode "(power user mode)">
+ <!--relative path to screenshots from kate-->
+ <!ENTITY path "../kate/">
<!ENTITY fundamentals-chapter SYSTEM "fundamentals.docbook">
<!ENTITY configuring-chapter SYSTEM "configuring.docbook">
<!ENTITY menus-chapter SYSTEM "menus.docbook">
- <!ENTITY part-chapter SYSTEM "part.docbook">
- <!ENTITY advanced-chapter SYSTEM "advanced.docbook">
- <!ENTITY regex-appendix SYSTEM "regular-expressions.docbook">
- <!ENTITY vi-chapter SYSTEM "vi.docbook">
- <!ENTITY highlighting-appendix SYSTEM "highlighting.docbook">
+ <!ENTITY part-chapter SYSTEM "../kate/part.docbook">
+ <!ENTITY advanced-chapter SYSTEM "../kate/advanced.docbook">
+ <!ENTITY regex-appendix SYSTEM "../kate/regular-expressions.docbook">
+ <!ENTITY vi-chapter SYSTEM "../kate/vi.docbook">
+ <!ENTITY highlighting-appendix SYSTEM "../kate/highlighting.docbook">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
More information about the kde-doc-english
mailing list