Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple fixes #13

Merged
merged 4 commits into from
Feb 20, 2016
Merged

Multiple fixes #13

merged 4 commits into from
Feb 20, 2016

Conversation

tudorbarascu
Copy link
Contributor

Fixes multiple problems (see #12 ) and warnings that the build outputted.
The structure wasn't cohesive anymore and now it's fixed.
I tried splitting into multiple commits but this is all that I could manage.

@sjib I tried to keep the structure you implemented but there were some duplicates that I had to remove.

The documentation builds now but there are 5 images ( see #12) that are linked in the docs but not pushed.

Also, there were some duplicated labels. E.g. the .. _Admin Guide: and _QGEP User Guide labels were pointing at multiple chapters which breaks the conventions as one link cannot go to multiple chapters.

@@ -1,109 +0,0 @@
Setup workstation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this chapter was a duplicate?

@tudorbarascu
Copy link
Contributor Author

They were almost duplicates, one of them didn't had the lines that came with the 0aac35a commit as seen by:

web@thinkpad:~/qgep_docs$ diff ./en/installation-guide/system/workstation.rst ./en/admin-guide/installation-guide/system/workstation.rst
26,32d25
< .. attention::
< 
<  On Windows, you need to save ``pg_service.conf`` in Unix format in order to work.
<  One way to do it is to open it with `Notepad++ <https://notepad-plus-plus.org/>`_
<  and ``Edit --> EOL Conversion --> UNIX Format --> File save`` .

I kept the newest version, of course.

@tudorbarascu
Copy link
Contributor Author

I also added numbering to chapters and sub-chapters as I think it's an improvement.
Please say if you don't want them numbered now.

m-kuhn added a commit that referenced this pull request Feb 20, 2016
@m-kuhn m-kuhn merged commit 0d1b5cf into QGEP:master Feb 20, 2016
@m-kuhn
Copy link
Contributor

m-kuhn commented Feb 20, 2016

It will be an improvement in general. And in case we find any regressions we can fix them up later.

Thanks a lot!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants