Permalink
Browse files

Standardize all text files on ''native'' eol-style. Fixes #5576

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@6324 af82e41b-90c4-0310-8c96-b1721e28e2e2
  • Loading branch information...
cboos
cboos committed Dec 13, 2007
1 parent aac6fac commit b8e0907ec53b8d395c4bb112ad4347ded062a4b6
Showing with 65 additions and 65 deletions.
  1. +32 −32 trac/ticket/templates/ticket_notify_email.txt
  2. +33 −33 wiki-macros/README
@@ -1,32 +1,32 @@
-$ticket_body_hdr
-$ticket_props
-#choose ticket.new
- #when True
-$ticket.description
- #end
- #otherwise
- #if changes_body
-Changes (by $change.author):
-
-$changes_body
- #end
- #if changes_descr
- #if not changes_body and not change.comment and change.author
-Description changed by $change.author:
- #end
-$changes_descr
---
- #end
- #if change.comment
-
-Comment${not changes_body and '(by %s)' % change.author or ''}:
-
-$change.comment
- #end
- #end
-#end
-
---
-Ticket URL: <$ticket.link>
-$project.name <${abs_href()}>
-$project.descr
+$ticket_body_hdr
+$ticket_props
+#choose ticket.new
+ #when True
+$ticket.description
+ #end
+ #otherwise
+ #if changes_body
+Changes (by $change.author):
+
+$changes_body
+ #end
+ #if changes_descr
+ #if not changes_body and not change.comment and change.author
+Description changed by $change.author:
+ #end
+$changes_descr
+--
+ #end
+ #if change.comment
+
+Comment${not changes_body and '(by %s)' % change.author or ''}:
+
+$change.comment
+ #end
+ #end
+#end
+
+--
+Ticket URL: <$ticket.link>
+$project.name <${abs_href()}>
+$project.descr
View
@@ -1,34 +1,34 @@
-Support for HDF-based macros has been dropped starting with Trac 0.11
-as with the switch to the Genshi templating engine, the `hdf` data
-prepared for the Clearsilver engine used upto Trac 0.10 has simply
-disappeared.
-
-This means that the old-style macros installed in the `wiki-macros` folder,
-i.e. the Python source files containing the simple function:
-
- def execute(hdf, txt, env):
- ...
-
-must be rewritten into new-style macros,
-i.e. plugins implementing the IWikiMacroProvider interface.
-
-This is not necessarily a complex task, given that:
- - the plugin can be a "single file plugin" which doesn't need to be
- configured to use setuptools. Creating a single .py source file
- and dropping it at the right place (the `plugins` folder next to
- the old `wiki-macros` folder) also works;
- - instead of implementing the IWikiMacroProvider directly,
- inheriting from the WikiMacroBase class also works well and is
- a bit more convenient.
-
-Note that not only is this not more complex, but it's also much more
-powerful, as the macro can now access the Wiki `formatter` object,
-and through it, all the other objects that are meaningful in the
-context of the Wiki text containing the macro call.
-
-You can see how the examples for the old-style macros have been
-converted to the new-style macros (single file plugins), in the
-`sample-plugins/HelloWorld.py` and `sample-plugins/Timestamp.py` files.
-
-Note that the TracGuideToc macro has been integrated in the main
+Support for HDF-based macros has been dropped starting with Trac 0.11
+as with the switch to the Genshi templating engine, the `hdf` data
+prepared for the Clearsilver engine used upto Trac 0.10 has simply
+disappeared.
+
+This means that the old-style macros installed in the `wiki-macros` folder,
+i.e. the Python source files containing the simple function:
+
+ def execute(hdf, txt, env):
+ ...
+
+must be rewritten into new-style macros,
+i.e. plugins implementing the IWikiMacroProvider interface.
+
+This is not necessarily a complex task, given that:
+ - the plugin can be a "single file plugin" which doesn't need to be
+ configured to use setuptools. Creating a single .py source file
+ and dropping it at the right place (the `plugins` folder next to
+ the old `wiki-macros` folder) also works;
+ - instead of implementing the IWikiMacroProvider directly,
+ inheriting from the WikiMacroBase class also works well and is
+ a bit more convenient.
+
+Note that not only is this not more complex, but it's also much more
+powerful, as the macro can now access the Wiki `formatter` object,
+and through it, all the other objects that are meaningful in the
+context of the Wiki text containing the macro call.
+
+You can see how the examples for the old-style macros have been
+converted to the new-style macros (single file plugins), in the
+`sample-plugins/HelloWorld.py` and `sample-plugins/Timestamp.py` files.
+
+Note that the TracGuideToc macro has been integrated in the main
source code base (in `trac/wiki/macros.py`).

0 comments on commit b8e0907

Please sign in to comment.