Skip to content

Commit

Permalink
More doc updates from Christoph
Browse files Browse the repository at this point in the history 
git-svn-id: svn+ssh://canvas.scribus.eu/svn/branches/Version135@16909 11d20701-8431-0410-a711-e3c959e3b870
  • Loading branch information
craig committed Oct 17, 2011
1 parent 063a88a commit b6e23a8
Show file tree
Hide file tree
Showing 14 changed files with 187 additions and 79 deletions.
16 changes: 8 additions & 8 deletions Scribus/scribus/doc/en/about1.html
View file
Expand Up @@ -26,9 +26,9 @@ <h2>About the Scribus Team (in order of joining)</h2>

<p><b>Christoph Sch&auml;fer (christoph_s):</b> Bug reporter and tester for bleeding edge Scribus, Wiki editor and doc translator/proofreader, one of the main authors of the Official Manual and the Scribus Online Help.</p>

<p><b>Hermann Kraus (Herm):</b> Wrote the Render Frame plug-in for 1.4 and GraphicsMagick and UniConvertor integration in 1.5.</p>
<p><b>Hermann Kraus (Herm):</b> Wrote the Render Frame plug-in for 1.4, GraphicsMagick and UniConvertor integration in 1.5.</p>

<p><b>Jain Basil Aliyas (jainbasil)</b>: Wrote the XTG and IDML import filters, and worked on the next generation ofUntitled 1 the Scribus Scripter.</p>
<p><b>Jain Basil Aliyas (jainbasil)</b>: Wrote the XTG and IDML import filters and works on the next generation of the Scribus Scripter.</p>

<p><b>Paul Smedley (smedles):</b> Maintainer of the OS/2 port.</p>

Expand All @@ -45,9 +45,9 @@ <h2>The Supporting Cast and Former Developers (in no particular order):</h2>

<p><b>Alistair Robinson:</b> Added some important fixes for font handling in early Scribus versions. Also wrote the clever hack for GIMP to create CMYK TIFFs.</p>

<p><b>Maciej Hanski:</b> Polish translator and writer of the &ldquo;PDF Forms&rdquo; how-to. One of the primary contributors to the Scribus Wiki.</p>
<p><b>Maciej Hanski:</b> Polish translator and one of the primary contributors to the Scribus Wiki.</p>

<p><b>Yves Ceccone:</b> Original French translator, wrote many of the Python scripts included with Scribus, maintained a large number of docs for Scribus in French.</p>
<p><b>Yves Ceccone:</b> Original French translator, wrote many of the Python sample scripts included with Scribus, maintained a large number of docs for Scribus in French.</p>

<p><b>Craig Ringer:</b> Worked on the scripter, build system and tested early Windows and Mac&nbsp;OS&nbsp;X ports. Contributed fixes for Python and other enhancements; IT/DTP administrator for a newspaper. </p>

Expand All @@ -73,9 +73,9 @@ <h2>The Supporting Cast and Former Developers (in no particular order):</h2>

<p><b>Louis Desjardins:</b> LGM organizer, testing, feedback. Translator of the original documentation to French.</p>

<p><b>Frederic Dubuy:</b> Translator of the original documentation to French</p>
<p><b>Frederic Dubuy:</b> Translator of the original documentation to French.</p>

<p><b>François Lanct&ocirc;t:</b> Translator of the original documentation to French</p>
<p><b>François Lanct&ocirc;t:</b> Translator of the original documentation to French.</p>

<p><b>Eirik &Oslash;verby:</b> Continues to mainatin our servers.</p>

Expand All @@ -87,13 +87,13 @@ <h2>The Supporting Cast and Former Developers (in no particular order):</h2>

<p><b>Michael Doubez</b></p>

<p><b>Cezary Grabski:</b> Lots of fixes and improvements to the text system.</p>
<p><b>Cezary Grabski:</b> Lots of fixes and improvements to the text system, as well as other useful enhancements.</p>

<p><b>Marcus Holland-Moritz:</b> Performance improvents for documents with large images.</p>

<p><b>Christian T&ouml;pp</b></p>

<p><b>Andy Fitzsimon:</b> Creator of the Scribus splashscreen.</p>
<p><b>Andy Fitzsimmon:</b> Creator of the Scribus splashscreen.</p>

<p><b>Andreas Nilsson:</b> Tango Project icons.</p>

Expand Down
60 changes: 51 additions & 9 deletions Scribus/scribus/doc/en/color3.html
View file
Expand Up @@ -6,7 +6,7 @@
<body>
<h2>Color Palettes in Scribus (1): Open Source Palettes</h2>
<p>Note that all color palettes described here and in subsequent sections include three basic colors: 100% CMYK Black (C:&nbsp;100, M:&nbsp;100, Y:&nbsp;100, K:&nbsp;100), 100% CMYK White (C:&nbsp;0, M:&nbsp;0, Y:&nbsp;0, K:&nbsp;0), and the <a href="color1.html">Registration Color</a>. These will not be counted as separate colors in the tables.</p>
<p>It is also important to note that no physical reference (color fan, color chips) exists for the colors in the palettes listed on this page, so that verification of color correctness is impossible.</p><br>
<p>It is also important to note that no physical reference (color fan, color chips) exists for the colors in the palettes listed on this page, so that verification of color correctness is impossible. To ensure a maximum of color reliability, make sure that <a href="cms.html">color management</a> is set up correctly and activated, and that the right profiles have been selected.</p><br>
<table border="1">
<tbody>
<tr valign=top>
Expand All @@ -25,42 +25,84 @@ <h2>Color Palettes in Scribus (1): Open Source Palettes</h2>
</tr>
<tr valign=top>
<td><b>Scribus Basic</b></td>
<td>A set of primary CMYK and RGB colors, as well as three variants of black, namely &ldquo;Cool Black&rdquo;, &ldquo;Rich Black&rdquo; and &ldquo;Warm Black&rdquo;. The latter consist of a mix of C, M, Y and K colors instead of just 100% K (K=Black) and the values are the result of intensive discussions between the Scribus Team and commercial printers. The &ldquo;Rich Black&rdquo; variants may not meet every printer's needs, but they can serve as a basis when it comes to printing a rich black.</td>
<td>A set of primary CMYK and RGB colors, as well as three variants of black, namely &ldquo;Cool Black,&rdquo; &ldquo;Rich Black&rdquo; and &ldquo;Warm Black.&rdquo; The latter consist of a mix of C, M, Y and K colors instead of just 100% K (K=Black) and the values are the result of intensive discussions between the Scribus Team and commercial printers. The &ldquo;Rich Black&rdquo; variants may not meet every printer&rsquo;s needs, but they can serve as a basis when it comes to printing a rich black.</td>
<td>9</td>
<td>RGB and CMYK</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus Fedora</b></td>
<td>A set of named RGB colors that are mandatory for publications of the <a href="http://fedoraproject.org/wiki/Logo/UsageGuidelines">Fedora Linux distribution</a>. </td>
<td>50</td>
<td>RGB</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus Gnome</b></td>
<td>A set of named RGB colors, which are standard on recent Gnome Desktops. </td>
<td>A set of named RGB colors that are mandatory for <a href="http://developer.gnome.org/hig-book/3.0/design-color.html.en">Gnome</a> desktop applications. </td>
<td>32</td>
<td>RGB</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus LibreOffice</b></td>
<td>A set of named RGB colors used for project &ldquo;branding&rdquo; by <a href="http://wiki.documentfoundation.org/Marketing/Branding#Colors">LibreOffice</a>. </td>
<td>30</td>
<td>RGB</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus OpenOffice</b></td>
<td>A set of CMYK colors which are based on the &ldquo;CMYK&rdquo; palette found in OpenOffice.org.</td>
<td>A set of CMYK colors based on the &ldquo;CMYK&rdquo; palette found in <a href="http://en.openoffice.org">OpenOffice.org</a>.</td>
<td>94</td>
<td>CMYK</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus OpenSUSE</b></td>
<td>A set of named RGB colors that are mandatory for publications of the <a href="http://en.opensuse.org/openSUSE:Artwork_guidelines#Colors">OpenSUSE Linux distribution</a>.</td>
<td>15</td>
<td>CMYK</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus Oxygen</b></td>
<td>A set of named RGB colors used in KDE&nbsp;4&rsquo;s <a href="http://techbase.kde.org/Projects/Oxygen/Style#Color_Usage">Oxygen</a> desktop theme.</td>
<td>126</td>
<td>CMYK</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus Splash</b> </td>
<td>A set of the colours in the Scribus logo and the splashscreen. Its main purpose is to guarantee a consistent use of colors in Scribus-related publications.</td>
<td>The CMYK version of the colors used in the Scribus logo and the splashscreen. Its main purpose is to guarantee a consistent use of colors in Scribus-related publications.</td>
<td>19</td>
<td>CMYK</td>
<td>No</td>
</tr>
<tr>
<td><b>Scribus SVG</b></td>
<td>A set of RGB colors based on the named colors from the <a href="http://www.w3.org/TR/css3-color/#svg-color">SVG specification</a>.</td>
<td>A set of RGB colors based on the named colors defined in the <a href="http://www.w3.org/TR/css3-color/#svg-color">SVG specification</a>.</td>
<td>149</td>
<td>RGB</td>
<td>No</td>
</tr>
<tr>
<td><b>Scribus Ubuntu (RGB)</b></td>
<td>A set of named RGB colors that are mandatory for publications of the <a href="http://design.canonical.com/the-toolkit/ubuntu-brand-guidelines/">Ubuntu Linux distribution</a>.</td>
<td>4</td>
<td>RGB</td>
<td>No</td>
</tr>
<tr>
<td><b>Scribus Ubuntu (CMYK)</b></td>
<td>A set of named CMYK colors that are mandatory for publications of the <a href="http://design.canonical.com/the-toolkit/ubuntu-brand-guidelines/">Ubuntu Linux distribution</a>.</td>
<td>4</td>
<td>RGB</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Scribus X11</b></td>
<td>A set of RGB colors based on the named colors from X-Window.</td>
<td>A set of RGB colors based on the named colors from <a href="http://www.xfree86.org/current/X.7.html#toc10">X-Window</a>.</td>
<td>550</td>
<td>RGB</td>
<td>No</td>
Expand All @@ -74,14 +116,14 @@ <h2>Color Palettes in Scribus (1): Open Source Palettes</h2>
</tr>
<tr>
<td><b>Scribus Xfig</b></td>
<td>A set of the RGB colors used by Xfig.</td>
<td>A set of the named RGB colors used by <a href="http://www.xfig.org/">Xfig</a>.</td>
<td>32</td>
<td>RGB</td>
<td>No</td>
</tr>
<tr valign=top>
<td><b>Tango</b></td>
<td>A set of the RGB colors used in the <a href="http://tango.freedesktop.org/Tango_Desktop_Project">Tango icon project</a> for Free desktops. Since Scribus uses the Tango icon set, this color set may also be interesting for Scribus-related projects.</td>
<td>A set of the RGB colors used in the <a href="http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines">Tango icon project</a> for Free desktops. Since Scribus uses the Tango icon set, this color set may also be interesting for Scribus-related projects.</td>
<td>68</td>
<td>RGB</td>
<td>No</td>
Expand Down
12 changes: 6 additions & 6 deletions Scribus/scribus/doc/en/doccopyright.html
View file
Expand Up @@ -16,7 +16,7 @@ <h2>Copyright Notice and Publication License</h2>

<h3>I. REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS</h3>

<p>This on-line help manual &ldquo;Scribus Online Help&rdquo; may be reproduced and distributed in whole or in part, in any medium physical or electronic, provided that the terms of this license are adhered to, and that this license or an incorporation of it by reference is displayed in the reproduction.
<p>This online help manual &ldquo;Scribus Online Help&rdquo; may be reproduced and distributed in whole or in part, in any medium physical or electronic, provided that the terms of this license are adhered to, and that this license or an incorporation of it by reference is displayed in the reproduction.

<p>Proper form for an incorporation by reference is as follows:

Expand Down Expand Up @@ -67,12 +67,12 @@ <h3>VI. ELECTED OPTIONS</h3>
<p>1) Distribution of the work or derivative of the work in any standard (paper) book form is prohibited unless prior permission is obtained from the copyright holder. Other forms of distribution including CD-ROM, electronic, and magnetic media are permitted.</p>

<ul>
<li>Adobe, Adobe Reader, Adobe Acrobat, Adobe Illustrator, Adobe InDesign, Adobe PageMaker, and PostScript are trademarks of Adobe Corporation in the United States, other countries or both.</li>
<li>Adobe, Adobe Reader, Adobe Acrobat, Adobe Illustrator, Adobe InDesign, Adobe PageMaker, and PostScript are trademarks of Adobe Corporation in the United States, other countries, or both.</li>
<li>UNIX is a registered trademark of The Open Group in the United States, other countries, or both.</li>
<li>Linux is a trademark of Linus Torvalds in the United States, other countries or both.</li>
<li>Apple, Mac, Mac OS, Mac&nbsp;OS&nbsp;X, Macintosh and TrueType are trademarks of Apple Computer, Inc., registered in the U.S. and other countries.</li>
<li>Microsoft, Windows, Windows NT, Windows 2000, Windows XP, Wndows Vista, Windows 7, Visual Studio, Microsoft Word, Microsoft PowerPoint, and OpenType are trademarks of Microsoft Corporation in the United States, other countries, or both.</li>
<li>OS/2 is registered trademark of International Business Machines corporation in the United States, other countries or both.</li>
<li>Linux is a registered trademark of Linus Torvalds in the United States, other countries, or both.</li>
<li>Apple, Mac, Mac OS, Mac&nbsp;OS&nbsp;X, Macintosh, and TrueType are trademarks of Apple corporation, registered in the United States, other countries, or both.</li>
<li>Microsoft, Windows, Windows NT, Windows 2000, Windows XP, Windows Vista, Windows 7, Visual Studio, Microsoft Word, Microsoft PowerPoint, and OpenType are trademarks of Microsoft corporation in the United States, other countries, or both.</li>
<li>OS/2 is registered trademark of International Business Machines corporation in the United States, other countries, or both.</li>
<li>CorelDraw is a registered trademark of Corel corporation in the United States, other countries, or both.</li>
<li>QuarkXPress is a registered trademark of Quark, Inc. in the United States, other countries, or both.</li>
<li>Ghostscript is a registered trademark of Artifex, Inc. in the United States, other countries, or both.</li>
Expand Down
37 changes: 34 additions & 3 deletions Scribus/scribus/doc/en/fileproblems.html
View file
@@ -1,13 +1,44 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>Problems with Document Files</title>
<title>Problems with Opening Scribus Files</title>
</head>
<body>
<h2>Problems with Document Files</h2>
<h2>Problems with Opening Scribus Files</h2>

<h3>Damaged Files</h3>
<h3>Documents created with another version of Scribus</h3>

<h4>Parsing Errors</h4>

<h4>Other File Errors</h4>


<h3>Documents Created with Another Version of Scribus</h3>

<h4>Files Created with an Earlier Version of Scribus</h4>

<h4>Files Created with a Later Version of Scribus</h4>

<h3>Safety Measures</h3>

<h4>Autosave</h4>

<h4>Backup Files</h4>

<h3>Other Potential Sources for Errors</h3>

<h4>File Substitutions</h4>

<h4>Missing Images</h4>

<h4>Render Frames</h4>

<h4>Settings/Preferences</h4>
<!--<hr>
See also:
<ul>
<li><a href="scribus-files.html">Scribus Files and File Formats</a></li>
</ul>-->
<br>
</body>
</html>
Binary file added Scribus/scribus/doc/en/images/duotone-imp.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Scribus/scribus/doc/en/images/duotone-imp2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Scribus/scribus/doc/en/images/fileimport.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Scribus/scribus/doc/en/images/import-pdfimage.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Scribus/scribus/doc/en/images/vector-advanced.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Scribus/scribus/doc/en/images/vector-clipart.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b6e23a8

Please sign in to comment.