Skip to content

Commit

Permalink
Item9693: Minor grammar changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gac410 committed May 1, 2015
1 parent 4430aee commit 83e49c1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions core/data/System/BeginnersStartHere.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1428396345" format="1.1" reprev="4" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1430521934" format="1.1" reprev="4" version="1"}%
%META:TOPICPARENT{name="UsersGuide"}%
---+!! %TOPIC%

Expand Down Expand Up @@ -311,7 +311,7 @@ People often say that wiki culture isn't appropriate in a corporate setting. Ign
* Foswiki can be integrated with corporate single-sign-on solutions

---++ Document<nop>Mode
* A page in Document<nop>Mode usually comprises a contribution which is written in the third person and left unsigned.
* A page in Document<nop>Mode usually consists of a contribution which is written in the third person and left unsigned.
* The piece of text is community property
* It may have multiple and changing authors as it is updated to reflect the community consensus.

Expand Down Expand Up @@ -360,13 +360,13 @@ If you get stuck, you can refer to the http://foswiki.org/Support web, which has

__Related topics:__ WelcomeGuest, WikiCulture, TwentyMinuteTutorial, TopicsAndWebs

%META:FILEATTACHMENT{name="myco.gif" attachment="myco.gif" attr="h" comment="" date="1428396345" size="1834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="whiteboard.gif" attachment="whiteboard.gif" attr="h" comment="" date="1428396345" size="13471" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="SAP_logo.gif" attachment="SAP_logo.gif" attr="h" comment="" date="1428396345" size="2711" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Motorola_logo.gif" attachment="Motorola_logo.gif" attr="h" comment="" date="1428396345" size="2394" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="lego.gif" attachment="lego.gif" attr="h" comment="" date="1428396345" size="4084" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="hula.gif" attachment="hula.gif" attr="h" comment="" date="1428396345" size="8780" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="EpicGames_logo.gif" attachment="EpicGames_logo.gif" attr="h" comment="" date="1428396345" size="2270" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Disney_logo.gif" attachment="Disney_logo.gif" attr="h" comment="" date="1428396345" size="1506" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="BT_logo.gif" attachment="BT_logo.gif" attr="h" comment="" date="1428396345" size="1687" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="camel.png" attachment="camel.png" attr="h" comment="" date="1428396345" size="1687" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="myco.gif" attachment="myco.gif" attr="h" comment="" date="1430521934" size="1834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="whiteboard.gif" attachment="whiteboard.gif" attr="h" comment="" date="1430521934" size="13471" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="SAP_logo.gif" attachment="SAP_logo.gif" attr="h" comment="" date="1430521934" size="2711" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Motorola_logo.gif" attachment="Motorola_logo.gif" attr="h" comment="" date="1430521934" size="2394" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="lego.gif" attachment="lego.gif" attr="h" comment="" date="1430521934" size="4084" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="hula.gif" attachment="hula.gif" attr="h" comment="" date="1430521934" size="8780" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="EpicGames_logo.gif" attachment="EpicGames_logo.gif" attr="h" comment="" date="1430521934" size="2270" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Disney_logo.gif" attachment="Disney_logo.gif" attr="h" comment="" date="1430521934" size="1506" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="BT_logo.gif" attachment="BT_logo.gif" attr="h" comment="" date="1430521934" size="1687" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="camel.png" attachment="camel.png" attr="h" comment="" date="1430521934" size="1687" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions core/data/System/FormattedSearch.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1426278647" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1430521934" format="1.1" version="1"}%
%META:TOPICPARENT{name="Macros"}%
---+ Formatted Search
Customize the display of search results.
Expand Down Expand Up @@ -223,7 +223,7 @@ For each hit, we want this search:
Now let's nest the two.
#NestingWithEscapes
---+++++ Method 1 (nesting with escapes)
The inner search cannot be placed directly into the format string of the outer, because of the "inside-out, left-to-right" macro expansion behaviour [[#InsideOutLeftToRight][discussed earlier]]. It must be delayed so that the outer search is evaluated first. To do this, we need to escape the inner search, i.e. let the outer search build a series of searches comprised of the inner search.
The inner search cannot be placed directly into the format string of the outer, because of the "inside-out, left-to-right" macro expansion behaviour [[#InsideOutLeftToRight][discussed earlier]]. It must be delayed so that the outer search is evaluated first. To do this, we need to escape the inner search, i.e. let the outer search build a series of inner searches, which are executed only when the outer list is complete..
* Use =$percent= to escape (delay) the inner search's [[VarSEARCH][SEARCH]] macro
* Use =\"= to escape the double quotes
* Use =$dollar= to escape the =$= of =$topic=
Expand Down

0 comments on commit 83e49c1

Please sign in to comment.