Hello Carlo. My apologies, I'm sorry to have overwritten your work. That does explain the strange conflicts I found when I tried to merge.
I'm not excellent at figuring out diffs manually, but looking at that commit, I see that the primary difference is the "About" section. Did I miss something else? Please let me know, and I'll copy the section(s) back in. Thanks, Mike Pumphrey OpenGeo - http://opengeo.org On 1/24/2013 6:49 AM, carlo cancellieri wrote: > Hi Mike, > I think we have missed (cutted off) some pieces of documentation during > this "Improved / corrected REST documentation (see GEOS-5595)" refactoring > (regarding the about/version about/manifest improvements): > please take a look to: > on branch 2.2.x - the commit "619156c0e2a0946b58ea0e3877dfda806417300d" > "adding documentation" > on branch master - the commit '54eebfb03058538e34c47e05f08f2450d76a347e' > "adding documentation" > > To marge missing part of the documentation. > Cheers, > Carlo > > > > 2013/1/23 Justin Deoliveira <[email protected]> > >> I think you should be fine here Mike. I think jody is going to be trying a >> 2.3 release again tonight but this shouldn't conflict. >> >> >> On Tue, Jan 22, 2013 at 11:44 AM, Mike Pumphrey <[email protected]> wrote: >> >>> This pull request updates /corrects the REST API documentation. I know >>> that we are in the middle of a release process, so I just wanted to ask >>> (specifically Andrea) if it's okay if I go ahead and merge it in, or >>> whether I should wait. >>> >>> https://github.com/geoserver/**geoserver/pull/111<https://github.com/geoserver/geoserver/pull/111> >>> >>> Thanks, >>> Mike Pumphrey >>> OpenGeo - http://opengeo.org >>> >>> >> >> >> -- >> Justin Deoliveira >> OpenGeo - http://opengeo.org >> Enterprise support for open source geospatial. >> >> >> ------------------------------------------------------------------------------ >> Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, >> MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current >> with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft >> MVPs and experts. ON SALE this month only -- learn more at: >> http://p.sf.net/sfu/learnnow-d2d >> _______________________________________________ >> Geoserver-devel mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/geoserver-devel >> >> > > ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d _______________________________________________ Geoserver-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geoserver-devel
