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

Convert README to Markdown #1506

Merged
merged 9 commits into from
May 1, 2018
Merged

Convert README to Markdown #1506

merged 9 commits into from
May 1, 2018

Conversation

DylanC
Copy link
Collaborator

@DylanC DylanC commented Apr 14, 2018

Its about time OpenShot has a readme in the same style as the rest of GitHub. :)

README.md Outdated
#################
INSTRUCTIONS
#################
## Instructions

OpenShot Video Editor 2.0 supports Linux, Mac, and Windows. But due to
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, maybe update all of these "2.0" references? OpenShot hasn't been version 2.0 for years.

I figure they could either say "OpenShot 2" or "OpenShot 2.x" (if the intent is simply to distinguish it from OpenShot 1.x), or else it should be "OpenShot 2.4" at the moment, and we'll have to try and remember to update it each time OpenShot moves to a new minor-version series.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yeah I was thinking about saying 2.x on it previously. I will make this change.

README.md Outdated
https://sourceforge.net/projects/openshotvideo/
https://www.ohloh.net/p/openshot-video-editor/
- http://www.openshot.org/ (Official website and blog)
- http://launchpad.net/openshot/ (source code, bug tracker and translations)
Copy link
Contributor

Choose a reason for hiding this comment

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

This, um... should point to Github now, surely? (Launchpad was the project's previous home. The README file is included in the source-release tarballs, so it'll be seen by people who haven't necessarily accessed this repo — that's why self-referential links are still useful.)

...Launchpad can still be linked to in addition to Github, of course, the same way Sourceforge is.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Very true. We should be pointing to GitHub now surely.

README.md Outdated

You can add a bug here on GitHub but make sure to add plenty of detail about the issue and logs if possible.
Copy link
Contributor

@ferdnyc ferdnyc Apr 21, 2018

Choose a reason for hiding this comment

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

Perhaps we should link/reference CONTRIBUTING.md here, for more detailed bug reporting instructions?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Another great suggestion. I agree. Thanks!

Copy link
Contributor

@ferdnyc ferdnyc Apr 28, 2018

Choose a reason for hiding this comment

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

Currently I suspect .github/CONTRIBUTING.md won't be included in the source tarballs, which is something we should probably change. (Especially if the README.md makes reference to it. But even if not, I'd say.)

Maybe it's time to move it out of the .github directory, and symlink from there to CONTRIBUTING.md in the repository root? (Or maybe Github will even pick up a CONTRIBUTING file in the root dir, if there isn't one in the .github dir? Lemme see if I can find out how that works...)

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes! CONTRIBUTING.md can live in any of three places, in fact: the root dir, .github/, or docs/. All of their example projects keep it in the repository root, which I think is smarter than relegating it to .github.

Copy link
Contributor

Choose a reason for hiding this comment

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

Submitted #1544 to relocate CONTRIBUTING.md.

Copy link
Contributor

Choose a reason for hiding this comment

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

(Oh, and along the same lines as what I mentioned above about self-referential links, since this file will also — I assume — be included in the OpenShot source tarballs, I'd suggest avoiding language like "here on Github" that assumes the reader... well... is. Here. On Github. They may not be. 😇 )

Perhaps something like "You can file an Issue in the OpenShot/openshot-qt project on Github..." with a link directly to https://github.com/OpenShot/openshot-qt/issues ? (I was first thinking https://github.com/OpenShot/openshot-qt/issues/new which will drop them right at the new-issue form, but really they should be encouraged to search for their issue before filing a duplicate report.)

@DylanC
Copy link
Collaborator Author

DylanC commented Apr 30, 2018

@ferdnyc - Can you have a look at this again? Its been updated with some of the suggestions.

README.md Outdated

Here is a tutorial of the current development features:

DO YOU HAVE A HELP MANUAL?
Do you have a help manual?
Copy link
Contributor

@ferdnyc ferdnyc Apr 30, 2018

Choose a reason for hiding this comment

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

Currently, the heavy indents on the entire Tutorial section are forcing the contents into a <PRE> block (which is what Markdown does when any text is indented by 4 or more spaces, or any tabs), causing it to not wrap, force horizontal scrolling, and generally look... poor.

I'd suggest just pulling out the deep indents and moving everything left so Markdown will auto-format it as a nested list. Or, heck, you could even forget the nesting and use level-4 headers for the "questions" e.g.

#### How do I add media to my project? 
  1) Drag and drop videos or music files from gnome into the "Project Files" tree.
  2) Click the File / Import Files... menu
  3) Click the "Import Files" icon on the toolbar (at the top of the screen)

Which formats as:

How do I add media to my project?

  1. Drag and drop videos or music files from gnome into the "Project Files" tree.
  2. Click the File / Import Files... menu
  3. Click the "Import Files" icon on the toolbar (at the top of the screen)

README.md Outdated
#################

Documentation for OpenShot 2.0 can be generated with Doxygen, a popular
Documentation for OpenShot 2.x can be generated with Doxygen, a popular
command-line application for scanning source code and generating readable
documentation. OpenShot contains a Doxygen input file (Doxyfile.in), but
you must first install the following Python filter for Doxygen: doxypy.
Then, run the following command:

$ doxygen Doxyfile.in
Copy link
Contributor

Choose a reason for hiding this comment

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

All of the example command lines need to be enclosed in code blocks, which is probably most readable (in the non-formatted source) if it's done by indenting each line four spaces.

README.md Outdated
@@ -65,18 +51,13 @@ dependencies in order to run OpenShot successfully:
4) FFmpeg or Libav (http://www.ffmpeg.org/ or http://libav.org/)
5) GCC build tools (or MinGW on Windows)



To run OpenShot from the command line, use the following syntax:
(be sure the change the path to match the install location of OpenShot)

$ cd /home/USER/openshot_qt
Copy link
Contributor

Choose a reason for hiding this comment

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

As above.

README.md Outdated
#################
HOW TO INSTALL
#################
## How to install

If you would like to install OpenShot, use this command:

Copy link
Contributor

Choose a reason for hiding this comment

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

Here too, on the next line down. (For some reason I can't add a comment there.)

README.md Outdated
#################
COPYRIGHT
#################
## Copyright
Copy link
Contributor

@ferdnyc ferdnyc Apr 30, 2018

Choose a reason for hiding this comment

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

Level-2 headings can also be created in Markdown by underlining the text with a row of hyphens. (A row of = signs will produce H1 headings.) I wonder if that might not make them "stand out" more in the source text file? The text can even be indented (up to 3 spaces). These will all produce the same H2-level "Copyright" heading:

## Copyright

Copyright
---------
 
   Copyright
---------------

Copyright

README.md Outdated

If you would like to help reporting issues or commit fixes to the project please see our guidelines:
https://github.com/OpenShot/openshot-qt/blob/master/CONTRIBUTING.md
Copy link
Contributor

Choose a reason for hiding this comment

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

Another option, rather than giving a URL here (and forcing people to the web): Markdown supports relative links, so you could write something like,

If you would like to help reporting issues or commit fixes to the project
please see our [contributor guidelines](CONTRIBUTING.md).

It'll be a link to the (local) file in the rendered Markdown, and they'll see the filename if they're reading the source.

@ferdnyc
Copy link
Contributor

ferdnyc commented Apr 30, 2018

I think that's it, mostly minor formatting tweaks. Looks good!

@DylanC
Copy link
Collaborator Author

DylanC commented May 1, 2018

@ferdnyc - Updated it again. I just had trouble setting the code tags for the command under:
The audio / video is out of sync. What can I do?
The formatting was not taking affect for some reason.

@DylanC
Copy link
Collaborator Author

DylanC commented May 1, 2018

@ferdnyc - I think you seem happy enough with this and I am too. I feel its good to merge and further updates can be submitted via a new PR.

@DylanC DylanC merged commit 6ffab07 into OpenShot:master May 1, 2018
@ferdnyc
Copy link
Contributor

ferdnyc commented May 1, 2018

I just had trouble setting the code tags for the command under:
The audio / video is out of sync. What can I do?
The formatting was not taking affect for some reason.

Yeah, you just need to insert a blank line before the indented block, and because it's a subelement of the list item, it needs to be indented seven spaces. (3 for the list + 4 for the code block)

@ferdnyc
Copy link
Contributor

ferdnyc commented May 1, 2018

I'd also rewrap it, to avoid horizontal scrolling. I'll submit a quick PR to fix that little piece.

@DylanC
Copy link
Collaborator Author

DylanC commented May 1, 2018

@ferdnyc - Thanks! That would be great! :)

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.

2 participants