UPDATE: Related to pull #441, #323 and some additional tweaks.

behave · May 1, 2016 · 8fb7d68 · 8fb7d68
1 parent 7ae73e2
commit 8fb7d68
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ python:
   - "3.5.1"
   - "pypy"
   - "3.5"
-  
+
 # DISABLED: - "nightly"
 # -- AVOID:  python: "3.5" => python 3.5.0
 # Seems to have a problem with unit tests in exception traceback.

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,7 @@ GOALS:
 DOCUMENTATION:
 
   * pull  #443: Fixing grammar in philosophy.rst (provided by: jamesroutley)
+  * pull  #441: Integrate hint on testing more nicely (provided by: bittner)
   * pull  #429: Replace "Manual Integration" by "Automation Libraries" section (provided by: bittner)
   * pull  #379: Correct wording in README.rst (provided by: franklinchou)
   * pull  #362: docs/tutorial.rst: fixed non-monospace font (provided by: spacediver)
@@ -20,6 +21,7 @@ DOCUMENTATION:
   * pull  #335: docs/api.rst: execute_steps() example (provided by: miabbott)
   * pull  #339: Adapt wording in install.rst (provided by: charleswhchan)
   * pull  #338: docs/philosophy.rst: Correct to uppercase in example (provided by: charleswhchan)
+  * issue #323: Update Django Example to work with version >=1.7 (submitted by: mpetyx, provided by: bittner)
   * pull  #327: Fix typo in Django doc (provided by: nikolas)
   * pull  #321: Update Django integration (provided by: bittner, contains: #315, #316)
   * FIX: cmdline/config-param doc-generator, avoid duplicated param entries (related to: #318)
@@ -29,6 +31,10 @@ DOCUMENTATION:
   * pull  #292: Use title-cased keywords in tutorial scenario (provided by: neoblackcap)
   * pull  #291: Tiny tweaks in tutorial docs (provided by: bernardpaulus)
 
+SITE:
+
+  * pull #343: Update/fix badges in README (provided by: mixxorx)
+
 ENHANCEMENTS:
 
   * Tagged Examples: Examples in a ScenarioOutline can now have tags.

diff --git a/docs/api.rst b/docs/api.rst
@@ -30,13 +30,13 @@ directory will be imported to find step implementations. They are all
 loaded before *behave* starts executing your feature tests.
 
 Step functions are identified using step decorators. All step
-implementations **must** start with the import line:
+implementations **should normally** start with the import line:
 
 .. code-block:: python
 
    from behave import *
 
-This imports several decorators defined by *behave* to allow you to
+This line imports several decorators defined by *behave* to allow you to
 identify your step functions. These are available in both PEP-8 (all
 lowercase) and traditional (title case) versions: "given", "when", "then"
 and the generic "step". See the `full list of variables imported`_ in the