From: Benjamin R. <ben...@ou...> - 2011-09-24 04:54:30
|
On Fri, Sep 23, 2011 at 6:35 PM, Benjamin Root <ben...@ou...> wrote: > > On Fri, Sep 23, 2011 at 4:46 PM, Benjamin Root <ben...@ou...> wrote: > >> >> >> On Friday, September 23, 2011, John Hunter <jd...@gm...> wrote: >> > On Fri, Sep 23, 2011 at 4:19 PM, Benjamin Root <ben...@ou...> wrote: >> > >> >> I wanted to do some changes to doc/users/installing.rst, but it is >> ignored >> >> by the .gitignore file. Is this information autogenerated somewhere >> else? >> > >> > This looks like an error in .gitignore. i wrote that file, and can >> > assure you it was not auto-generated :-) >> > >> >> Ok, give me an hour to get home, and I should be able to fix them and >> finish my polishing work for this release. >> >> Ben > > > Ok, looks like I was wrong. I was trying to figure out what was going on, > and found a commit that stated that the information in > doc/users/installing.rst was to be moved over to INSTALL. > > So, don't merge in my branch yet... I need to lop off a couple of > commits... > > Ben Root > > Ok, I did some reverts, and that should handle most issues. The vast bulk of the documentation work has been merged into master. If anybody encounters a problem where their rebase fails because it would modify an untracked "doc/users/installing.rst", it is ok to skip that commit. This should only happen if you happen to have a build of the documentation. I will see about cutting the release, but I won't be able to upload any files to SF, unless somebody can give me that permission for my account. Thanks, Ben Root |