3 new revisions:
Revision: e908df986014
Author: Jussi Malinen
Date: Wed Jun 29 03:35:39 2011
Log: some minor tweaks
http://code.google.com/p/robotframework/source/detail?r=e908df986014
Revision: ddefa5df5b42
Author: Jussi Malinen
Date: Wed Jun 29 03:35:46 2011
Log: regen
http://code.google.com/p/robotframework/source/detail?r=ddefa5df5b42
Revision: ad0f09559e33
Author: Jussi Malinen
Date: Wed Jun 29 03:37:30 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=ad0f09559e33
==============================================================================
Revision: e908df986014
Author: Jussi Malinen
Date: Wed Jun 29 03:35:39 2011
Log: some minor tweaks
http://code.google.com/p/robotframework/source/detail?r=e908df986014
Modified:
/doc/userguide/src/CreatingTestData/CreatingUserKeywords.txt
=======================================
--- /doc/userguide/src/CreatingTestData/CreatingUserKeywords.txt Mon Jun 27
11:43:40 2011
+++ /doc/userguide/src/CreatingTestData/CreatingUserKeywords.txt Wed Jun 29
03:35:39 2011
@@ -331,9 +331,8 @@
Using custom regular expressions
''''''''''''''''''''''''''''''''
-
-Matching keyword with embedded arguments into the keywords that are
-used in the test data is done internally using `regular expressions`__
+When keywords with embedded arguments are called, the values are
+matched internally using `regular expressions`__
(regexps for short). The default logic goes so that every argument in
the name is replaced with a pattern :code:`.*?` that basically matches
any string. This logic works fairly well normally, but as just
@@ -441,7 +440,7 @@
character, also two backslashes may be enough.
Notice also that keyword names and possible embedded arguments in them
-do *not* need to be escaped according to the normal `test data escaping
+should *not* be escaped using the normal `test data escaping
rules`__. This means that, for example, backslashes in expressions
like :var:`${name:\\w+}` do not need to be escaped.
==============================================================================
Revision: ddefa5df5b42
Author: Jussi Malinen
Date: Wed Jun 29 03:35:46 2011
Log: regen
http://code.google.com/p/robotframework/source/detail?r=ddefa5df5b42
Modified:
/doc/userguide/RobotFrameworkUserGuide.html
=======================================
--- /doc/userguide/RobotFrameworkUserGuide.html Mon Jun 27 11:44:10 2011
+++ /doc/userguide/RobotFrameworkUserGuide.html Wed Jun 29 03:35:46 2011
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.7:
http://docutils.sourceforge.net/"; />
+<meta name="generator" content="Docutils 0.6:
http://docutils.sourceforge.net/"; />
<title>Robot Framework User Guide</title>
<style type="text/css">
@@ -6608,8 +6608,8 @@
</div>
<div class="section" id="using-custom-regular-expressions">
<h4><a class="toc-backref" href="#id407">Using custom regular
expressions</a></h4>
-<p>Matching keyword with embedded arguments into the keywords that are
-used in the test data is done internally using <a class="reference
external" href="http://en.wikipedia.org/wiki/Regular_expression";>regular
expressions</a>
+<p>When keywords with embedded arguments are called, the values are
+matched internally using <a class="reference external"
href="http://en.wikipedia.org/wiki/Regular_expression";>regular
expressions</a>
(regexps for short). The default logic goes so that every argument in
the name is replaced with a pattern <span class="code">.*?</span> that
basically matches
any string. This logic works fairly well normally, but as just
@@ -6785,7 +6785,7 @@
is four backslashes (<span class="code">\\\\</span>) but, depending on the
next
character, also two backslashes may be enough.</p>
<p>Notice also that keyword names and possible embedded arguments in them
-do <em>not</em> need to be escaped according to the normal <a
class="reference internal" href="#escaping">test data escaping
+should <em>not</em> be escaped using the normal <a class="reference
internal" href="#escaping">test data escaping
rules</a>. This means that, for example, backslashes in expressions
like <span class="var">${name:\w+}</span> do not need to be escaped.</p>
</div>
@@ -14230,7 +14230,7 @@
<div class="footer">
<hr class="footer" />
<p>Generated by <a class="reference external"
href="http://docutils.sourceforge.net/rst.html";>reStructuredText</a>.
Syntax highlighting by <a class="reference external"
href="http://pygments.org/";>Pygments</a>.</p>
-<p>Generated on: 2011-06-27 18:43 UTC.
+<p>Generated on: 2011-06-29 10:34 UTC.
</p>
</div>
==============================================================================
Revision: ad0f09559e33
Author: Jussi Malinen
Date: Wed Jun 29 03:37:30 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=ad0f09559e33
