On Thu, Oct 30, 2014 at 5:00 PM, Rainer Gerhards <[email protected]>
wrote:

> 014-10-30 12:28 GMT+01:00 singh.janmejay <[email protected]>:
>
> > Patch for rsyslog-doc.
> >
> >
> Thanks!
>
>
> > I coudn't find the repo on git.adiscon.com, so this patch is done over
> the
> > github mirror.
> >
> >
> This repo only exists on github. In any case, github is more or less the
> primary these days, because it's easier to work with their pull requests.
>
> Will merge within the next couple of minutes (so no extra confirmation for
> that ;)).
>
> Rainer
>
> > On Wed, Oct 29, 2014 at 8:33 PM, singh.janmejay <
> [email protected]>
> > wrote:
> >
> > > Sure.
> > >
> > > --
> > > Regards,
> > > Janmejay
> > >
> > > PS: Please blame the typos in this mail on my phone's uncivilized soft
> > > keyboard sporting it's not-so-smart-assist technology.
> > >
> > > On Oct 29, 2014 8:31 PM, "Rainer Gerhards" <[email protected]>
> > > wrote:
> > >
> > >> excellent, thx! If you need help, let me know.
> > >>
> > >> Rainer
> > >>
> > >> 2014-10-29 16:00 GMT+01:00 singh.janmejay <[email protected]>:
> > >>
> > >> > No, I'll add docs, I want to learn how to do it. Let me handle it.
> > >> >
> > >> > --
> > >> > Regards,
> > >> > Janmejay
> > >> >
> > >> > PS: Please blame the typos in this mail on my phone's uncivilized
> soft
> > >> > keyboard sporting it's not-so-smart-assist technology.
> > >> >
> > >> > On Oct 29, 2014 7:30 PM, "Rainer Gerhards" <
> [email protected]>
> > >> > wrote:
> > >> >
> > >> > > Looks fine to me, except for a minor code formatting nit (we use
> tab
> > >> and
> > >> > > not fixed spaces - bad choice at that time ;)).
> > >> > >
> > >> > > I have now also merged these two.
> > >> > >
> > >> > > It would be great if you could add some doc to the rsyslog-doc
> > >> project.
> > >> > If
> > >> > > there is no time, let me know and I'll at least mention the new
> > >> functions
> > >> > > in it.
> > >> > >
> > >> > > Thanks again!
> > >> > > Rainer
> > >> > >
> > >> > > 2014-10-21 9:38 GMT+02:00 singh.janmejay <
> [email protected]
> > >:
> > >> > >
> > >> > > > Hi Rainer, David,
> > >> > > >
> > >> > > > Do the patches look ok?
> > >> > > >
> > >> > > > On Fri, Oct 17, 2014 at 3:56 PM, singh.janmejay <
> > >> > > [email protected]>
> > >> > > > wrote:
> > >> > > >
> > >> > > > >
> > >> > > > >
> > >> > > > > On Tue, Oct 14, 2014 at 12:18 PM, singh.janmejay <
> > >> > > > [email protected]
> > >> > > > > > wrote:
> > >> > > > >
> > >> > > > >> Yes, I'll make necessary changes and send the patch again.
> > >> > > > >>
> > >> > > > >> --
> > >> > > > >> Regards,
> > >> > > > >> Janmejay
> > >> > > > >>
> > >> > > > >> PS: Please blame the typos in this mail on my phone's
> > uncivilized
> > >> > soft
> > >> > > > >> keyboard sporting it's not-so-smart-assist technology.
> > >> > > > >>  On Oct 14, 2014 12:02 PM, "Rainer Gerhards" <
> > >> > > [email protected]>
> > >> > > > >> wrote:
> > >> > > > >>
> > >> > > > >>> 2014-10-14 8:30 GMT+02:00 singh.janmejay <
> > >> [email protected]
> > >> > >:
> > >> > > > >>>
> > >> > > > >>> > > > - replace(operand, substring_to_be_replaced,
> > >> its_replacement)
> > >> > > > >>> > > > - wrap(operand, string_to_wrap_around_it)
> > >> > > > >>> > > >
> > >> > > > >>> > >
> > >> > > > >>> > > - concat(operand_1, operand_2)
> > >> > > > >>> > > >
> > >> > > > >>> > >
> > >> > > > >>> > >
> > >> > > > >>> > > I think you overlooked the concatenation operation. you
> > can
> > >> > > simply
> > >> > > > do
> > >> > > > >>> > >
> > >> > > > >>> > > operand1 & operand2
> > >> > > > >>> > >
> > >> > > > >>> > > eg: "foo" & "bar" ==> "foobar"
> > >> > > > >>> > >
> > >> > > > >>> > > I think concat() is equivalent to this. Am I right?
> > >> > > > >>> > >
> > >> > > > >>> >
> > >> > > > >>> > It is the same. I didn't know it was available as an
> > >> operator, my
> > >> > > > bad.
> > >> > > > >>> Will
> > >> > > > >>> > remove the concat implementation in the reworked patch.
> > >> > > > >>> >
> > >> > > > >>>
> > >> > > > >>> yeah the doc is pretty sparse.
> > >> > > > >>>
> > >> > > > >>> If I understand you correctly, I will wait for a new patch
> set
> > >> > before
> > >> > > > >>> merging the existing one. Right?
> > >> > > > >>>
> > >> > > > >>> Rainer
> > >> > > > >>> _______________________________________________
> > >> > > > >>> rsyslog mailing list
> > >> > > > >>> http://lists.adiscon.net/mailman/listinfo/rsyslog
> > >> > > > >>> http://www.rsyslog.com/professional-services/
> > >> > > > >>> What's up with rsyslog? Follow
> https://twitter.com/rgerhards
> > >> > > > >>> NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED
> > by
> > >> a
> > >> > > > myriad
> > >> > > > >>> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT
> > POST
> > >> if
> > >> > > you
> > >> > > > >>> DON'T LIKE THAT.
> > >> > > > >>>
> > >> > > > >>
> > >> > > > >
> > >> > > > > Hi,
> > >> > > > >
> > >> > > > > Sorry for breaking the continuation here, I finally managed to
> > get
> > >> > some
> > >> > > > > time to work on this today.
> > >> > > > >
> > >> > > > > Patches are attached. Just for clarity, I am attaching
> > >> all(actually
> > >> > 2)
> > >> > > > > relevant patches(even though one of them is not changed).
> > >> > > > >
> > >> > > > > Changes made:
> > >> > > > > - removed the patch that implemented concat
> > >> > > > > - enhanced the wrap method to have 2 variants wrap(str,
> wrapper)
> > >> and
> > >> > > > > wrap(str, wrapper, wrapper_escape)
> > >> > > > > - kept the replace (and wrap first cut) patch untouched.
> > >> > > > >
> > >> > > > >
> > >> > > > > --
> > >> > > > > Regards,
> > >> > > > > Janmejay
> > >> > > > > http://codehunk.wordpress.com
> > >> > > > >
> > >> > > >
> > >> > > >
> > >> > > >
> > >> > > > --
> > >> > > > Regards,
> > >> > > > Janmejay
> > >> > > > http://codehunk.wordpress.com
> > >> > > > _______________________________________________
> > >> > > > rsyslog mailing list
> > >> > > > http://lists.adiscon.net/mailman/listinfo/rsyslog
> > >> > > > http://www.rsyslog.com/professional-services/
> > >> > > > What's up with rsyslog? Follow https://twitter.com/rgerhards
> > >> > > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by
> a
> > >> > myriad
> > >> > > > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST
> if
> > >> you
> > >> > > > DON'T LIKE THAT.
> > >> > > >
> > >> > > _______________________________________________
> > >> > > rsyslog mailing list
> > >> > > http://lists.adiscon.net/mailman/listinfo/rsyslog
> > >> > > http://www.rsyslog.com/professional-services/
> > >> > > What's up with rsyslog? Follow https://twitter.com/rgerhards
> > >> > > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a
> > >> myriad
> > >> > > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if
> > you
> > >> > > DON'T LIKE THAT.
> > >> > >
> > >> > _______________________________________________
> > >> > rsyslog mailing list
> > >> > http://lists.adiscon.net/mailman/listinfo/rsyslog
> > >> > http://www.rsyslog.com/professional-services/
> > >> > What's up with rsyslog? Follow https://twitter.com/rgerhards
> > >> > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a
> > myriad
> > >> > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if
> you
> > >> > DON'T LIKE THAT.
> > >> >
> > >> _______________________________________________
> > >> rsyslog mailing list
> > >> http://lists.adiscon.net/mailman/listinfo/rsyslog
> > >> http://www.rsyslog.com/professional-services/
> > >> What's up with rsyslog? Follow https://twitter.com/rgerhards
> > >> NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a
> myriad
> > >> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you
> > >> DON'T LIKE THAT.
> > >>
> > >
> >
> >
> > --
> > Regards,
> > Janmejay
> > http://codehunk.wordpress.com
> >
> > _______________________________________________
> > rsyslog mailing list
> > http://lists.adiscon.net/mailman/listinfo/rsyslog
> > http://www.rsyslog.com/professional-services/
> > What's up with rsyslog? Follow https://twitter.com/rgerhards
> > NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad
> > of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you
> > DON'T LIKE THAT.
> >
> _______________________________________________
> rsyslog mailing list
> http://lists.adiscon.net/mailman/listinfo/rsyslog
> http://www.rsyslog.com/professional-services/
> What's up with rsyslog? Follow https://twitter.com/rgerhards
> NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad
> of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you
> DON'T LIKE THAT.
>

The last doc-patch had a typo, this fixes it, and applies after it.

-- 
Regards,
Janmejay
http://codehunk.wordpress.com
From 2f78aa680b2c7057eda088c8d3de51cfc25e70ef Mon Sep 17 00:00:00 2001
From: Janmejay Singh <[email protected]>
Date: Fri, 31 Oct 2014 07:18:10 +0530
Subject: [PATCH] fixed a typo in documentation for wrap

---
 source/rainerscript/functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/rainerscript/functions.rst b/source/rainerscript/functions.rst
index 06a2f0e..e25295a 100644
--- a/source/rainerscript/functions.rst
+++ b/source/rainerscript/functions.rst
@@ -14,7 +14,7 @@ RainerScript supports a currently quite limited set of functions:
 -  wrap(str, wrapper_str, escaper_str) - returns the str wrapped with wrapper_str.
    But additionally, any instances of wrapper_str appearing in str would be replaced
    by the escaper_str. 
-   Eg. wrap("foo.bar", "'", "_") would produce "'foo_bar'"
+   Eg. wrap("foo'bar", "'", "_") would produce "'foo_bar'"
 -  replace(str, substr_to_replace, replace_with) - returns new string with
    all instances of substr_to_replace replaced by replace_with. Eg. 
    replace("foo bar baz", " b", ", B") would return "foo, Bar, Baz".
-- 
2.0.4

_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of 
sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE 
THAT.

Reply via email to