Merge lp:~hdima/bzr-alldocs/russian into lp:bzr-alldocs

Proposed by Dmitry Vasiliev
Status: Merged
Merged at revision: not available
Proposed branch: lp:~hdima/bzr-alldocs/russian
Merge into: lp:bzr-alldocs
Diff against target: None lines
To merge this branch: bzr merge lp:~hdima/bzr-alldocs/russian
To post a comment you must log in.
Revision history for this message
Dmitry Vasiliev (hdima) wrote :

Russian documentation site

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-08-06 13:36:29 +0000
3+++ .bzrignore 2009-08-07 21:36:54 +0000
4@@ -1,3 +1,1 @@
5-./en/_build
6-./fr/_build
7-./ja/_build
8+./*/_build
9
10=== modified file 'en/_templates/index.html'
11--- en/_templates/index.html 2009-08-06 13:49:26 +0000
12+++ en/_templates/index.html 2009-08-07 21:49:14 +0000
13@@ -73,7 +73,8 @@
14 <p class="languages">This website is available in
15 <a href="../en/">English</a>,
16 <a href="../fr/">French</a>,
17- <a href="../ja/">Japanese</a>.
18+ <a href="../ja/">Japanese</a>,
19+ <a href="../ru/">Russian</a>.
20 </p>
21
22 {% endblock %}
23
24=== modified file 'fr/_templates/index.html'
25--- fr/_templates/index.html 2009-08-06 13:36:29 +0000
26+++ fr/_templates/index.html 2009-08-07 21:49:14 +0000
27@@ -73,7 +73,8 @@
28 <p class="languages">This website is available in
29 <a href="../en/">English</a>,
30 <a href="../fr/">French</a>,
31- <a href="../ja/">Japanese</a>.
32+ <a href="../ja/">Japanese</a>,
33+ <a href="../ru/">Russian</a>.
34 </p>
35
36 {% endblock %}
37
38=== modified file 'ja/_templates/index.html'
39--- ja/_templates/index.html 2009-08-06 13:49:26 +0000
40+++ ja/_templates/index.html 2009-08-07 21:49:14 +0000
41@@ -73,7 +73,8 @@
42 <p class="languages">This website is available in
43 <a href="../en/">English</a>,
44 <a href="../fr/">French</a>,
45- <a href="../ja/">Japanese</a>.
46+ <a href="../ja/">Japanese</a>,
47+ <a href="../ru/">Russian</a>.
48 </p>
49
50 {% endblock %}
51
52=== added directory 'ru'
53=== added file 'ru/Makefile'
54--- ru/Makefile 1970-01-01 00:00:00 +0000
55+++ ru/Makefile 2009-08-07 21:49:14 +0000
56@@ -0,0 +1,88 @@
57+# Makefile for Sphinx documentation
58+#
59+
60+# You can set these variables from the command line.
61+SPHINXOPTS =
62+SPHINXBUILD = sphinx-build
63+PAPER =
64+
65+# Internal variables.
66+PAPEROPT_a4 = -D latex_paper_size=a4
67+PAPEROPT_letter = -D latex_paper_size=letter
68+ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
69+
70+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
71+
72+help:
73+ @echo "Please use \`make <target>' where <target> is one of"
74+ @echo " html to make standalone HTML files"
75+ @echo " dirhtml to make HTML files named index.html in directories"
76+ @echo " pickle to make pickle files"
77+ @echo " json to make JSON files"
78+ @echo " htmlhelp to make HTML files and a HTML help project"
79+ @echo " qthelp to make HTML files and a qthelp project"
80+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
81+ @echo " changes to make an overview of all changed/added/deprecated items"
82+ @echo " linkcheck to check all external links for integrity"
83+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
84+
85+clean:
86+ -rm -rf _build/*
87+
88+html:
89+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
90+ @echo
91+ @echo "Build finished. The HTML pages are in _build/html."
92+
93+dirhtml:
94+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
95+ @echo
96+ @echo "Build finished. The HTML pages are in _build/dirhtml."
97+
98+pickle:
99+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
100+ @echo
101+ @echo "Build finished; now you can process the pickle files."
102+
103+json:
104+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json
105+ @echo
106+ @echo "Build finished; now you can process the JSON files."
107+
108+htmlhelp:
109+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
110+ @echo
111+ @echo "Build finished; now you can run HTML Help Workshop with the" \
112+ ".hhp project file in _build/htmlhelp."
113+
114+qthelp:
115+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp
116+ @echo
117+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
118+ ".qhcp project file in _build/qthelp, like this:"
119+ @echo "# qcollectiongenerator _build/qthelp/Bazaar.qhcp"
120+ @echo "To view the help file:"
121+ @echo "# assistant -collectionFile _build/qthelp/Bazaar.qhc"
122+
123+latex:
124+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
125+ @echo
126+ @echo "Build finished; the LaTeX files are in _build/latex."
127+ @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
128+ "run these through (pdf)latex."
129+
130+changes:
131+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes
132+ @echo
133+ @echo "The overview file is in _build/changes."
134+
135+linkcheck:
136+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
137+ @echo
138+ @echo "Link check complete; look for any errors in the above output " \
139+ "or in _build/linkcheck/output.txt."
140+
141+doctest:
142+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest
143+ @echo "Testing of doctests in the sources finished, look at the " \
144+ "results in _build/doctest/output.txt."
145
146=== added directory 'ru/_static'
147=== added file 'ru/_static/bzr-48.png'
148Binary files ru/_static/bzr-48.png 1970-01-01 00:00:00 +0000 and ru/_static/bzr-48.png 2009-08-07 21:49:14 +0000 differ
149=== added file 'ru/_static/bzr.ico'
150Binary files ru/_static/bzr.ico 1970-01-01 00:00:00 +0000 and ru/_static/bzr.ico 2009-08-07 21:49:14 +0000 differ
151=== added directory 'ru/_templates'
152=== added file 'ru/_templates/index.html'
153--- ru/_templates/index.html 1970-01-01 00:00:00 +0000
154+++ ru/_templates/index.html 2009-08-07 21:49:14 +0000
155@@ -0,0 +1,80 @@
156+{% extends "layout.html" %}
157+
158+{% set title = 'Overview' %}
159+{% block body %}
160+
161+ <h2>Текущие версии</h2>
162+
163+ <table class="contentstable" align="center" style="margin-left: 30px"><tr>
164+ <td width="50%">
165+ <p><b>1.17 - Последний</b><br/>
166+ <a href="../latest/">Просмотр HTML</a><br/>
167+ <a href="../bzr.1.17-docs.tar.gz">Скачать HTML</a><br/>
168+ </p>
169+ </td><td width="50%">
170+ <p><b>1.18dev - В разработке</b><br/>
171+ <a href="../bzr.dev-html/contents.html">Просмотр HTML</a><br/>
172+ <a href="../bzr.dev-html.tar.gz">Скачать HTML</a><br/>
173+ </p>
174+ </td></tr>
175+ </table>
176+
177+ <h2>Старые версии</h2>
178+
179+ <table class="contentstable" align="center" style="margin-left: 30px"><tr>
180+ <td width="25%" valign="top">
181+ <p><b>2009</b><br/>
182+ <a href="../bzr.1.16/">1.16</a><br/>
183+ <a href="../bzr.1.15/">1.15</a><br/>
184+ <a href="../bzr.1.14/">1.14</a><br/>
185+ <a href="../bzr.1.13/">1.13</a> [j]<br/>
186+ <a href="../bzr.1.12/">1.12</a><br/>
187+ <a href="../bzr.1.11/">1.11</a><br/>
188+ </p>
189+ </td><td width="25%" valign="top">
190+ <p><b>2008</b><br/>
191+ <a href="../bzr.1.10/">1.10</a><br/>
192+ <a href="../bzr.1.9/">1.9</a><br/>
193+ <a href="../bzr.1.8/">1.8</a><br/>
194+ <a href="../bzr.1.7/">1.7</a><br/>
195+ <a href="../bzr.1.6/">1.6</a><br/>
196+ <a href="../bzr.1.5/">1.5</a><br/>
197+ <a href="../bzr.1.4/">1.4</a><br/>
198+ <a href="../bzr.1.3/">1.3</a> [h]<br/>
199+ <a href="../bzr.1.2/">1.2</a><br/>
200+ <a href="../bzr.1.1/">1.1</a><br/>
201+ </p>
202+ </td><td width="25%" valign="top">
203+ <p><b>2007</b><br/>
204+ <a href="../bzr.1.0/">1.0</a><br/>
205+ <a href="../bzr.0.92/">0.92</a><br/>
206+ <a href="../bzr.0.91/">0.91</a><br/>
207+ <a href="../bzr.0.90/">0.90</a><br/>
208+ <a href="../bzr.0.18/">0.18</a><br/>
209+ <a href="../bzr.0.17/">0.17</a><br/>
210+ <a href="../bzr.0.16/">0.16</a><br/>
211+ <a href="../bzr-0.15/">0.15</a><br/>
212+ <a href="../bzr-0.14/">0.14</a><br/>
213+ </p>
214+ </td><td width="25%" valign="top">
215+ <p><b>Старые</b><br/>
216+ <a href="../bzr-0.13/">0.13</a><br/>
217+ <a href="../bzr-0.12/">0.12</a><br/>
218+ <a href="../bzr-0.11/">0.11</a><br/>
219+ <a href="../bzr-0.10/">0.10</a><br/>
220+ <a href="../bzr-0.9/">0.9</a><br/>
221+ <a href="../bzr-0.8/">0.8</a><br/>
222+ </p>
223+ </td></tr>
224+ <tr><td colspan="4">j=jaunty (9.04), h=hardy (8.04 LTS)</td></tr>
225+ </table>
226+
227+ <hr>
228+ <p class="languages">This website is available in
229+ <a href="../en/">English</a>,
230+ <a href="../fr/">French</a>,
231+ <a href="../ja/">Japanese</a>,
232+ <a href="../ru/">Russian</a>.
233+ </p>
234+
235+{% endblock %}
236
237=== added file 'ru/_templates/layout.html'
238--- ru/_templates/layout.html 1970-01-01 00:00:00 +0000
239+++ ru/_templates/layout.html 2009-08-07 22:01:06 +0000
240@@ -0,0 +1,58 @@
241+{% extends "!layout.html" %}
242+
243+{% block header %}
244+<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
245+ <img src="{{ pathto("_static/bzr-48.png", 1) }}" alt="Bazaar logo" align="middle" />
246+ <b>Документация для Bazaar</b> - адаптивной системы контроля версий
247+</div>
248+{% endblock %}
249+
250+{% block rootrellink %}
251+<li><a href="http://bazaar-vcs.org/">Главная</a>&nbsp;|&nbsp;</li>
252+{{ super() }}
253+{% endblock %}
254+
255+{% block sidebarrel %}
256+<h3>Также интересно</h3>
257+
258+<p>Основная документация описывает утилиту командной строки bzr.
259+Для получения большей информации смотрите ...
260+</p>
261+
262+<p>
263+<b>Web</b><br/>
264+<a href="https://help.launchpad.net/">Launchpad</a><br/>
265+<a href="http://launchpad.net/loggerhead">Loggerhead</a><br/>
266+<a href="http://bazaar-vcs.org/WebInterfaces">еще ...</a><br/>
267+</p>
268+
269+<p>
270+<b>Десктоп</b><br/>
271+<a href="http://doc.bazaar-vcs.org/explorer/en/">Bazaar Explorer</a><br/>
272+<a href="http://bazaar-vcs.org/TortoiseBzr">TortoiseBzr</a><br/>
273+<a href="http://bazaar-vcs.org/3rdPartyTools#GUI%20Front-ends">еще ...</a><br/>
274+</p>
275+
276+<p>
277+<b>Среды разработки и редакторы</b><br/>
278+<a href="http://bazaar-vcs.org/BzrEclipse">Eclipse</a><br/>
279+<a href="http://bazaar-vcs.org/VisualStudioIntegration">Visual Studio</a><br/>
280+<a href="http://bazaar-vcs.org/DVC">Emacs</a><br/>
281+<a href="http://bazaar-vcs.org/3rdPartyTools">еще ...</a><br/>
282+</p>
283+
284+<p>
285+<b>Связь с другими системами</b><br/>
286+<a href="http://bazaar-vcs.org/BzrForeignBranches/Subversion">Subversion</a><br/>
287+<a href="http://bazaar-vcs.org/BzrForeignBranches">еще ...</a><br/>
288+</p>
289+
290+<h3>Ссылки по теме</h3>
291+<p>
292+<a href="https://launchpad.net/bzr/">Страница на Launchpad</a><br/>
293+<a href="http://bazaar-vcs.org/Documentation/">Документация на Wiki</a><br/>
294+</p>
295+{% endblock %}
296+
297+{% block sidebarsearch %}
298+{% endblock %}
299
300=== added file 'ru/conf.py'
301--- ru/conf.py 1970-01-01 00:00:00 +0000
302+++ ru/conf.py 2009-08-07 21:49:14 +0000
303@@ -0,0 +1,213 @@
304+# -*- coding: utf-8 -*-
305+#
306+# Bazaar documentation build configuration file, created by
307+# sphinx-quickstart on Tue Jul 21 17:04:52 2009.
308+#
309+# This file is execfile()d with the current directory set to its containing dir.
310+#
311+# Note that not all possible configuration values are present in this
312+# autogenerated file.
313+#
314+# All configuration values have a default; values that are commented out
315+# serve to show the default.
316+
317+import sys, os
318+
319+# If extensions (or modules to document with autodoc) are in another directory,
320+# add these directories to sys.path here. If the directory is relative to the
321+# documentation root, use os.path.abspath to make it absolute, like shown here.
322+#sys.path.append(os.path.abspath('.'))
323+
324+# -- General configuration -----------------------------------------------------
325+
326+# Add any Sphinx extension module names here, as strings. They can be extensions
327+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
328+extensions = ['sphinx.ext.ifconfig']
329+
330+# Add any paths that contain templates here, relative to this directory.
331+templates_path = ['_templates']
332+
333+# The suffix of source filenames.
334+source_suffix = '.txt'
335+
336+# The encoding of source files.
337+#source_encoding = 'utf-8'
338+
339+# The master toctree document.
340+master_doc = 'index'
341+
342+# General information about the project.
343+project = u'Bazaar'
344+copyright = u'2009, Canonical Ltd'
345+
346+# The version info for the project you're documenting, acts as replacement for
347+# |version| and |release|, also used in various other places throughout the
348+# built documents.
349+#
350+# The short X.Y version.
351+version = '1.18'
352+# The full version, including alpha/beta/rc tags.
353+release = '1.18dev'
354+
355+# The language for content autogenerated by Sphinx. Refer to documentation
356+# for a list of supported languages.
357+#language = None
358+
359+# There are two options for replacing |today|: either, you set today to some
360+# non-false value, then it is used:
361+#today = ''
362+# Else, today_fmt is used as the format for a strftime call.
363+#today_fmt = '%B %d, %Y'
364+
365+# List of documents that shouldn't be included in the build.
366+#unused_docs = []
367+
368+# List of directories, relative to source directory, that shouldn't be searched
369+# for source files.
370+exclude_trees = ['_build']
371+
372+# The reST default role (used for this markup: `text`) to use for all documents.
373+#default_role = None
374+
375+# If true, '()' will be appended to :func: etc. cross-reference text.
376+#add_function_parentheses = True
377+
378+# If true, the current module name will be prepended to all description
379+# unit titles (such as .. function::).
380+#add_module_names = True
381+
382+# If true, sectionauthor and moduleauthor directives will be shown in the
383+# output. They are ignored by default.
384+#show_authors = False
385+
386+# The name of the Pygments (syntax highlighting) style to use.
387+pygments_style = 'sphinx'
388+
389+# A list of ignored prefixes for module index sorting.
390+#modindex_common_prefix = []
391+
392+
393+# -- Options for HTML output ---------------------------------------------------
394+
395+# The theme to use for HTML and HTML Help pages. Major themes that come with
396+# Sphinx are currently 'default' and 'sphinxdoc'.
397+html_theme = 'default'
398+
399+# Theme options are theme-specific and customize the look and feel of a theme
400+# further. For a list of options available for each theme, see the
401+# documentation.
402+html_theme_options = {
403+ 'rightsidebar': True,
404+
405+ # Non-document areas: header (relbar), footer, sidebar, etc.
406+ # Some useful colours here:
407+ # * blue: darkblue, mediumblue, darkslateblue, cornflowerblue, royalblue,
408+ # midnightblue
409+ # * gray: dimgray, slategray, lightslategray
410+ 'sidebarbgcolor': "cornflowerblue",
411+ 'sidebarlinkcolor': "midnightblue",
412+ 'relbarbgcolor': "darkblue",
413+ 'footerbgcolor': "lightslategray",
414+
415+ # Text, heading and code colouring
416+ 'codebgcolor': "lightyellow",
417+ 'codetextcolor': "firebrick",
418+ 'linkcolor': "mediumblue",
419+ }
420+
421+# Add any paths that contain custom themes here, relative to this directory.
422+#html_theme_path = []
423+
424+# The name for this set of Sphinx documents. If None, it defaults to
425+# "<project> v<release> documentation".
426+html_title = "Документация Bazaar"
427+
428+# A shorter title for the navigation bar. Default is the same as html_title.
429+html_short_title = "Документация"
430+
431+# The name of an image file (relative to this directory) to place at the top
432+# of the sidebar.
433+#html_logo = None
434+
435+# The name of an image file (within the static path) to use as favicon of the
436+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
437+# pixels large.
438+html_favicon = "bzr.ico"
439+
440+# Add any paths that contain custom static files (such as style sheets) here,
441+# relative to this directory. They are copied after the builtin static files,
442+# so a file named "default.css" will overwrite the builtin "default.css".
443+html_static_path = ['_static']
444+
445+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
446+# using the given strftime format.
447+#html_last_updated_fmt = '%b %d, %Y'
448+
449+# If true, SmartyPants will be used to convert quotes and dashes to
450+# typographically correct entities.
451+#html_use_smartypants = True
452+
453+# Custom sidebar templates, maps document names to template names.
454+html_sidebars = {
455+ #'index': 'indexsidebar.html',
456+ }
457+
458+# Additional templates that should be rendered to pages, maps page names to
459+# template names.
460+html_additional_pages = {'index': 'index.html'}
461+
462+# If false, no module index is generated.
463+#html_use_modindex = True
464+
465+# If false, no index is generated.
466+html_use_index = False
467+
468+# If true, the index is split into individual pages for each letter.
469+#html_split_index = False
470+
471+# If true, links to the reST sources are added to the pages.
472+html_show_sourcelink = False
473+
474+# If true, an OpenSearch description file will be output, and all pages will
475+# contain a <link> tag referring to it. The value of this option must be the
476+# base URL from which the finished HTML is served.
477+#html_use_opensearch = ''
478+
479+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
480+#html_file_suffix = ''
481+
482+# Output file base name for HTML help builder.
483+htmlhelp_basename = 'BazaarDocs'
484+
485+
486+# -- Options for LaTeX output --------------------------------------------------
487+
488+# The paper size ('letter' or 'a4').
489+#latex_paper_size = 'letter'
490+
491+# The font size ('10pt', '11pt' or '12pt').
492+#latex_font_size = '10pt'
493+
494+# Grouping the document tree into LaTeX files. List of tuples
495+# (source start file, target name, title, author, documentclass [howto/manual]).
496+#latex_documents = [
497+# ('index', 'Bazaar.tex', u'Bazaar Documentation',
498+# u'Bazaar Developers', 'manual'),
499+#]
500+
501+# The name of an image file (relative to this directory) to place at the top of
502+# the title page.
503+#latex_logo = None
504+
505+# For "manual" documents, if this is true, then toplevel headings are parts,
506+# not chapters.
507+#latex_use_parts = False
508+
509+# Additional stuff for the LaTeX preamble.
510+#latex_preamble = ''
511+
512+# Documents to append as an appendix to all manuals.
513+#latex_appendices = []
514+
515+# If false, no module index is generated.
516+#latex_use_modindex = True
517
518=== added file 'ru/index.txt'
519--- ru/index.txt 1970-01-01 00:00:00 +0000
520+++ ru/index.txt 2009-08-07 21:49:14 +0000
521@@ -0,0 +1,3 @@
522+.. Bazaar Documentation website master file.
523+ We use a custom index.html for presentation & navigation.
524+ This just defines the topics and their ordering.

Subscribers

People subscribed via source and target branches