Skip to content

Commit 5a784b2

Browse files
author
sven
committed
Merge pull request #344 from plone/polyester-fixvarious
Polyester fixvarious
2 parents abd5017 + 20d14ef commit 5a784b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+401
-1781
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ external
44
broken*
55
*.mo
66
.DS_Store
7+
_locales

_templates/version_warning.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div class="row">
33
<div class="col-sm-12 admonition warning version_warning" >
44
<p class="first admonition-title">Warning</p>
5-
<p class="last">The version is a draft for Plone 5, this is WIP !!
6-
!!DO NOT!! use this docs, please use the docs of the our current stable version
5+
<p class="last">The version is a draft for Plone 5, this is a Work In Progress! Pull requests welcome... <br />
6+
!!DO NOT!! use these docs in production, please use the docs of the our current stable version
77
[Plone 4] <a href="http://docs.plone.org">Plone 4.3 Documentation</a></p>
88
</div>
99
</div>

about/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This is the recommended way for smaller changes, and for people who are not fami
7575
- Fill in the **Commit changes**-textbox at the end of the page telling why you did the changes. Press the **Commit changes**-button next to it when done.
7676
- Then head to the green *New pull request*-button (e.g. by navigating to your fork's root and clicking "Pull requests" on the right menu-bar, or directly via https://github.com/yourGitHubUserName/documentation/pulls), you won't need to fill in any additional text. Just press **New pull request** button, finally click "Send pull request".
7777
- Your changes are now queued for review under project's `Pull requests <https://github.com/plone/documentation/pulls>`_ tab on Github.
78-
- For more information about writing documentation please read the :doc:`styleguide </about/styleguide>` and also :doc:`this </about/helper_tools>`.
78+
- For more information about writing documentation please read the :doc:`styleguide </about/documentation_styleguide>` and also :doc:`this </about/helper_tools>`.
7979
- You will receive a message when your request has been integrated into the documentation. At that moment, feel free to delete the copy of the documentation you created under your account on github. Next time you contribute, just fork again. That way you'll always have a fresh copy of the documentation to work on.
8080

8181

@@ -106,7 +106,7 @@ advanced users.
106106

107107
* Commit your changes and `create <https://help.github.com/articles/creating-a-pull-request>`_ and open `pull <https://help.github.com/articles/using-pull-requests>`_ request.
108108

109-
For more information about writing documentation please read the :doc:`styleguide </about/styleguide>` and also :doc:`this </about/helper_tools>`.
109+
For more information about writing documentation please read the :doc:`styleguide </about/documentation_styleguide>` and also :doc:`this </about/helper_tools>`.
110110

111111
Translation
112112
===========

about/documentation_styleguide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ For including documentation into docs.plone.org, **please** follow these guideli
6969

7070
* Please do not use 'autodoc' to include comments of your code.
7171

72-
* Please follow this :doc:`ReST styleguide <styleguide>` and use **semantic linefeeds**.
72+
* Please follow this :doc:`ReST styleguide <rst-styleguide>` and use **semantic linefeeds**.
7373
Do **not** break your sentences into half with newlines because you somehow think you should follow PEP8.
7474
PEP8 is for Python files, not for ReStructuredText.
7575

about/history/20150518.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
Changelog
2-
=========
3-
41
1.0.0-pre-alpha
52
----------------
63

about/history/next_release.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,11 @@ Changelog
1515
- **Provided one more example for the Title**
1616

1717
*@fulv* provided more examples about titles in content items.
18+
19+
- **Fix outdated links**
20+
21+
*@polyester* fixed many outdated and broken links
22+
23+
- **rst syntax fixes**
24+
25+
*@polyester* fixed various rst syntax errors

about/index.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,12 @@ About this documentation
1010
documentation_styleguide
1111
rst-styleguide
1212
helper_tools
13-
history/20150518
13+
searching
14+
15+
Changelog
16+
---------
17+
18+
.. toctree::
19+
:maxdepth: 2
20+
21+
history/20150518

about/searching.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Firefox
1313

1414
`http://docs.plone.org <http://docs.plone.org>`_ is supporting `OpenSearch <http://www.opensearch.org/Home>`_.
1515

16-
With this it is possible to search http://docs.plone.org <http://docs.plone.org>`_ with put the Firefox search bar.
16+
With this it is possible to search `http://docs.plone.org <http://docs.plone.org>`_ with put the Firefox search bar.
1717

1818
Watch the `video <https://www.youtube.com/watch?v=J9gkjO_Xvxs>`_ .
1919

adapt-and-extend/custom-ct/index.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
Custom Content-Types
22
====================
33

4-
The current recommended way to develop new custom content-types is by using :term:`Dexterity`. You'll find the full manual here.
4+
The recommended way to develop new custom content-types is by using :term:`Dexterity`. You'll find the full manual here.
55

66
.. toctree::
77
:maxdepth: 1
88

99
/external/plone.app.dexterity/docs/index
1010

11-
Up until Plone 4.1, the standard way was to use :term:`Archetypes`. You can still develop using Archetypes, if you prefer, and they will remain available.
11+
Up until Plone 4.1, the standard way was to use :term:`Archetypes`.
12+
You can still develop using Archetypes, and they will remain functional.
13+
For any **new** development, Dexterity is strongly recommended.
1214

13-
.. toctree::
14-
:maxdepth: 1
15-
16-
/old-reference-manuals/archetypes/index
15+
The Archetypes reference manual will remain available at the `Plone 4 documentention <http://docs.plone.org/4/en/old-reference-manuals/archetypes/index.html>`_

adapt-and-extend/theming/index.rst

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,29 @@ Theming Plone
1414
:maxdepth: 2
1515

1616
theme_product
17+
18+
19+
.. toctree::
20+
:maxdepth: 2
21+
22+
1723
/external/plone.app.theming/docs/index
1824
/external/diazo/docs/index
19-
quick_test
25+
26+
.. toctree::
27+
:maxdepth: 2
28+
2029
resources
2130
barceloneta
2231

32+
An older (Plone 4.2) quick guide which may help to understand Diazo better:
33+
34+
.. toctree::
35+
:maxdepth: 2
36+
37+
quick_test
38+
39+
2340
Using Diazo is also possible as a standalone service. That makes it possible to include several back-end applications under one 'look'
2441

2542
.. toctree::
@@ -34,12 +51,7 @@ General information on the stylesheets and other resources in Plone
3451

3552
templates_css/index
3653

37-
Information on 'old-style' theming for Plone 3, but still valid in Plone 4.
38-
So upgrading from Plone3 to Plone4 is possible without switching to the new style of theming.
39-
40-
Do note that for all **new** theme development, Diazo is strongly recommended.
41-
42-
.. toctree::
43-
:maxdepth: 2
54+
.. note ::
4455
45-
old_style_theming.rst
56+
Up to version 4.1, Plone was using an older style of theming. Using that is not considered *best practice* anymore.
57+
See `older versions of these docs <http://docs.plone.org/4/en/adapt-and-extend/theming/old_style_theming.html>`_ if you need the information.

adapt-and-extend/theming/old_style_theming.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

adapt-and-extend/theming/resources.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The main unit of the resource system is a JavaScript file and/or a set of CSS/LE
3535

3636
Since this can be a single JavaScript file, there are additional requirejs
3737
options are available to be able to customize. Possible options we have are
38-
is shim (export, init and depends) so it can be configured to be exported
38+
is shim (export, init and depends) so it can be configured to be exported
3939
o the global namespace, init on load and depend on some other resource.
4040

4141
An example of a resource definition on registry.xml::
@@ -69,8 +69,8 @@ The options are :
6969
The export/init/depends are the shim option to load the js files in the correct order on the global namespace, for more information : http://requirejs.org/docs/api.html#config-shim
7070

7171
The URL option will you to define the base url in case you want to load txt resources on require js::
72-
73-
registry.xml
72+
73+
registry.xml
7474

7575
<records prefix="plone.resources/mockup-patterns-structure"
7676
interface='Products.CMFPlone.interfaces.IResourceRegistry'>
@@ -106,12 +106,12 @@ The URL option will you to define the base url in case you want to load txt reso
106106
Default resources on Plone
107107
^^^^^^^^^^^^^^^^^^^^^^^^^^
108108

109-
Plone loads a group of mockup components and bower components as resources on the registry.
109+
Plone loads a group of mockup components and bower components as resources on the registry.
110110
In order to avoid running bower install on each installation of Plone it ships by default a minimal
111111
bower components folder on the CMFPlone static folder with the correct versions of the resources
112112
that are need to run the default plone js/css.
113113

114-
The default bower components shipped are on :
114+
The default bower components shipped are on :
115115

116116
https://github.com/plone/Products.CMFPlone/blob/master/Products/CMFPlone/static/bower.json
117117

@@ -142,7 +142,7 @@ Bundle
142142

143143
Mainly bundles are groups of resources that are going to be loaded on your plone site. Instead of loading single resources we can group them by our possible needs. In case you
144144
develop an specific add-on you will need to create your own bundle, if you want to load a single page you will create a bundle, if you want to define some group of js/css that
145-
will be rendered on some page you need a bundle.
145+
will be rendered on some page you need a bundle.
146146

147147
Each bundle will be delivered on a production site as a standalone resource: two http calls (js/css) for each bundle
148148

@@ -186,7 +186,7 @@ The options are :
186186

187187
- jscompilation: URL where the minimized/compiled JavaScript version will be
188188

189-
- csscompilation: URL where the minimized/compiled CSS version will be
189+
- csscompilation: URL where the minimized/compiled CSS version will be
190190

191191
- last_compilation: date of the compilation that is shipped on the compiled URL
192192

@@ -275,7 +275,7 @@ Non compiled bundles
275275
^^^^^^^^^^^^^^^^^^^^
276276

277277
In case your resources are not using requirejs/less and you just want to group them on bundles to minimize and deliver them in groups you can use
278-
the non compiled bundles.
278+
the non compiled bundles.
279279

280280
They are minimized and stored on the csscompiled/jscompiled URL defined on the bundle for the first request each time:
281281

@@ -333,10 +333,10 @@ In order to allow to have a complete theme its possible to define a bundle in di
333333
production-css = /++theme++barceloneta/less/barceloneta-compiled.css
334334
tinymce-content-css = /++theme++barceloneta/less/barceloneta-compiled.css
335335

336-
development-js =
337-
production-js =
336+
development-js =
337+
production-js =
338338

339-
This options allow us to define to plone that the js/css renderer will add the diazo one so we will be able to overwrite the
339+
This options allow us to define to plone that the js/css renderer will add the diazo one so we will be able to overwrite the
340340
<link> <script> tags from the theme with the plone ones loading the diazo resources.
341341

342342
As on the native plone bundles its possible to define a development/production set (less/requirejs) so it integrates with the
@@ -364,7 +364,7 @@ TODO
364364
Browser Page bundle
365365
^^^^^^^^^^^^^^^^^^^
366366

367-
If you want that your browser page loads or unloads an specific bundle when its rendered you can use::
367+
If you want that your browser page loads or unloads an specific bundle when its rendered you can use:
368368

369369
TODO
370370

@@ -444,7 +444,7 @@ Example::
444444
requirejs require/define and resource/bundle
445445
--------------------------------------------
446446

447-
In working with requirejs, you'll likely be aware of the
447+
In working with requirejs, you'll likely be aware of the
448448
`mismatched anonymous define() <http://requirejs.org/docs/errors.html#mismatch>`_
449449
potential misuse of require and define.
450450

appendices/glossary.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
Glossary
33
==========
44

5-
This is a glossary for some definitions used in this documentation and
6-
still heavily under construction.
5+
This is a glossary for some definitions used in this documentation and still heavily under construction.
76

8-
It incorporates the original `glossary on plone.org
9-
<https://plone.org/documentation/glossary>`_.
7+
It incorporates the original `glossary on plone.org <https://plone.org/documentation/glossary>`_.
108

119
.. glossary:: :sorted:
1210

@@ -484,7 +482,7 @@ It incorporates the original `glossary on plone.org
484482
and loaded. This is not the case in Zope 3. If you don't enable it
485483
explicitly, it will not be found.
486484

487-
485+
488486

489487
.po
490488
The file format used by the :term:`gettext` translation system.
@@ -549,3 +547,5 @@ It incorporates the original `glossary on plone.org
549547
Buildout
550548
Buildout is a Python-based build system for creating, assembling and deploying applications from multiple parts, some of which may be non-Python-based. It lets you create a buildout configuration and reproduce the same software later. See `buildout.org <http://www.buildout.org/en/latest/>`_
551549

550+
browserview
551+
Plone uses a view pattern to output dynamically generated HTML pages. Views are the basic elements of modern Python web frameworks. A view runs code to setup Python variables for a rendering template. Output is not limited to HTML pages and snippets, but may contain JSON, file download payloads, or other data formats. See :doc:`views </develop/plone/views/browserviews>`

appendices/older-manuals.rst

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
older manuals
22
=============
33

4-
Some of these are still valid, and give a deeper understanding of the Plone/Zope ecosystem
4+
Some of these are still valid, and can give a deeper understanding of the Plone/Zope ecosystem.
55

6-
.. toctree::
7-
:maxdepth: 1
6+
.. note::
7+
8+
These manuals are not updated anymore
9+
10+
11+
- `Buildout <http://docs.plone.org/4/en/old-reference-manuals/archgenxml/index.html>`_
12+
- `using zope.formlib <http://docs.plone.org/4/en/old-reference-manuals/formlib/index.html>`_
13+
- `using zope.formlib <http://docs.plone.org/4/en/old-reference-manuals/formlib/index.html>`_
14+
- `zope.formlib <http://docs.plone.org/4/en/old-reference-manuals/forms/index.html>`_
15+
- `Zope 2 vs. Zope 3 practices <http://docs.plone.org/4/en/old-reference-manuals/old-style-vs-new-style/index.html>`_
16+
- `Pluggable Authentication Service <http://docs.plone.org/4/en/old-reference-manuals/pluggable_authentication_service/index.html>`_
17+
- `Portlets <http://docs.plone.org/4/en/old-reference-manuals/portlets/index.html>`_
18+
- `PloneTestCase tests <http://docs.plone.org/4/en/old-reference-manuals/testing/index.html>`_
19+
- `Zope 2 internals <http://docs.plone.org/4/en/old-reference-manuals/zope_secrets/index.html>`_
820

9-
/old-reference-manuals/archgenxml/index
10-
/old-reference-manuals/buildout/index
11-
/old-reference-manuals/formlib/index
12-
/old-reference-manuals/forms/index
13-
/old-reference-manuals/old-style-vs-new-style/index
14-
/old-reference-manuals/pluggable_authentication_service/index
15-
/old-reference-manuals/portlets/index
16-
/old-reference-manuals/testing/index
17-
/old-reference-manuals/zope_secrets/index

0 commit comments

Comments
 (0)