Skip to content

Update from upstream repo machinekit/machinekit-docs#2

Merged
machinekoder merged 711 commits intomachinekoder:masterfrom
machinekit:master
Jul 13, 2016
Merged

Update from upstream repo machinekit/machinekit-docs#2
machinekoder merged 711 commits intomachinekoder:masterfrom
machinekit:master

Conversation

@backstroke-bot
Copy link
Copy Markdown

Hello!
The remote machinekit/machinekit-docs has some new changes that aren't in this fork.

So, here they are, ready to be merged! 🎉

If this pull request can be merged without conflict, you can publish your software
with these new changes. Otherwise, if you have merge conflicts, this
is the place to fix them.

Have fun!


Created by Backstroke. Oh yea, I'm a bot.

mhaberler and others added 30 commits May 18, 2016 06:32
Signed-off-by: Michael Haberler <git@mah.priv.at>
duh

Signed-off-by: Michael Haberler <git@mah.priv.at>
let's let them live in the mk/mk repo
index-gen.sh added to generate index docs on the fly at each build
from a Makefile

docs/index.asciidoc amended to promote reading of docs not asking help

_config.yml edit to switch on incremental builds

Entire docs/components dir deleted as these now are generated in docs/man/man9

Signed-off-by: Mick <arceye@mgware.co.uk>
index-gen.sh amended to output the paths relative to the top level index-HAL.asciidoc

This is now the sole portal to the HAL Man Pages and the complexity of getting paths
right under jekyll, means this is how they have to be output, even if that means the
generated index.html not being stand alone.

Makefile added to automate the scripting of the indexes

All 3 man types now generated and accessible from index-HAL.asciidoc

Signed-off-by: Mick <arceye@mgware.co.uk>
Links generated in index docs are failing to be shown

Substitute abs links to see if it is these links, or the link to the index doc itself that is not being found
Second part of test to find why generated man page indexes which display perfectly locally do not display on
remote site, despite all files being present
Redirect links to the man page index for components

Signed-off-by: Mick <arceye@mgware.co.uk>
luminize and others added 28 commits June 21, 2016 19:27
Add QtQuickVcp documentation to site docs
python-interface: touch up
maybe this does the trick
(top of page)

Remove side bar and front page implementations

Signed-off-by: Mick <arceye@mgware.co.uk>
Move Search-Bar to primary navigation items for all pages
import hal_pru_generic.9 from Charles' repo
a start at the infrastructure section
Used as menu link in docs sidebar and needed to be shorter
Now that searches are fully seeded, there are a lot of hits coming
from crawlers finding 'boiler plate' sidebar links and including
those

eg. Search `HAL` and the `Hal Utilities and GUIs` link keeps appearing.

First stage is to wrapper in a 'nocontent' div

Once in place I can change the cse.xml to activate it and eventually
the crawlers will exclude it on new crawls.

Signed-off-by: Mick <arceye@mgware.co.uk>
Capitalise and shorten top level header title
Amend docs_contents to exclude from google searches
google charts example, clarify repos involved in infrastructure section
onto same line as `Search`

The increase in RH sidebar items has pushed these items further down
the page

Moving them makes the layout more coherent, sidebar is for quick access
links to major topics

The navigation list keeps 'Edit this page' in particular, immediately
available and obvious from any page in the site

Signed-off-by: Mick <arceye@mgware.co.uk>
Move `Edit This Page` and `Sandbox` links to navigation area
Added links to example files
@machinekoder machinekoder merged commit 37cae44 into machinekoder:master Jul 13, 2016
machinekoder pushed a commit that referenced this pull request Jun 27, 2017
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.

8 participants