Fix re-writing of rst files to handle general cases and other cases of "version" than the previous one.
Update the cached _include files.